From 0145c42a51a5aea1c0ce2052edc1d76ae35f6b45 Mon Sep 17 00:00:00 2001
From: Evan Pratten <ewpratten@gmail.com>
Date: Sun, 3 Apr 2022 14:31:03 -0400
Subject: [PATCH] idk anymore. I think I fixed something?

---
 game/dist/map_gameMap.objects.json                    |  4 ++--
 game/game_logic/src/model/world_object.rs             |  5 ++++-
 game/game_logic/src/rendering/utilities/map_render.rs | 10 +++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/game/dist/map_gameMap.objects.json b/game/dist/map_gameMap.objects.json
index 96c593be..c288159d 100644
--- a/game/dist/map_gameMap.objects.json
+++ b/game/dist/map_gameMap.objects.json
@@ -1,11 +1,11 @@
 [
-    
     {
         "type": "env",
         "name": "env_umbrella",
         "variant": "Blue",
         "position": [
-            1,0
+            5,
+            7
         ],
         "rotation_degrees": 90
     }
diff --git a/game/game_logic/src/model/world_object.rs b/game/game_logic/src/model/world_object.rs
index d9134018..27fc88e5 100644
--- a/game/game_logic/src/model/world_object.rs
+++ b/game/game_logic/src/model/world_object.rs
@@ -76,6 +76,9 @@ impl WorldObjectRef {
         )
     }
     pub fn get_world_space_position(&self)-> na::Vector2<f32> {
-        self.position * 2.0
+        self.position * 128.0
+    }
+    pub fn get_tile_space_position(&self)-> na::Vector2<f32> {
+        self.position
     }
 }
diff --git a/game/game_logic/src/rendering/utilities/map_render.rs b/game/game_logic/src/rendering/utilities/map_render.rs
index c1f3e248..6452595e 100644
--- a/game/game_logic/src/rendering/utilities/map_render.rs
+++ b/game/game_logic/src/rendering/utilities/map_render.rs
@@ -264,6 +264,10 @@ impl MapRenderer {
             Vector2::new(screen_width as f32, screen_height as f32),
             camera,
         );
+        let player_position = na::Vector2::new(
+            player_position.x,
+            player_position.y * -1.0,
+        );
 
         // Handle each layer from the bottom up
         for layer in self.map.layers() {
@@ -319,12 +323,12 @@ impl MapRenderer {
 
                                     // Check if there is an object at this tile
                                     for obj_ref in &self.world_objects.object_references {
-                                        if obj_ref.get_world_space_position().x == sampler_x as f32
-                                            && obj_ref.get_world_space_position().y == sampler_y as f32
+                                        if obj_ref.get_tile_space_position().x == sampler_x as f32
+                                            && obj_ref.get_tile_space_position().y == sampler_y as f32
                                         {
                                             // Get access to the actual object definition
                                             let object_key = obj_ref.into_key();
-                                            debug!("Found object: {}", object_key);
+                                            // debug!("Found object: {}", object_key);
                                             let obj_def = self
                                                 .world_objects
                                                 .object_definitions