added tile cursor [PLAT-2]

src/assetmanager.rs

@@ -18,6 +18,11 @@ impl AssetManager {
             tileset_image.set_filter(graphics::FilterMode::Nearest);
             images.insert(String::from("tileset"), tileset_image);
         }
+        {
+            let mut cursor = graphics::Image::new(ctx, "/cursor.png")?;
+            cursor.set_filter(graphics::FilterMode::Nearest);
+            images.insert(String::from("cursor"), cursor);
+        }
         
         let mut fonts = HashMap::new();
         fonts.insert(String::from("DejaVuSerif"), graphics::Font::new(ctx, "/DejaVuSerif.ttf")?);

src/engine.rs

@@ -54,10 +54,16 @@ impl Engine {
     }
 }
 
+pub fn world_to_screen_coords(point: Point2, camera_pos: Point2) -> Point2 {
+    let x = (point.x - camera_pos.x) * 32.0;
+    let y = WINDOW_HEIGHT - ((point.y - camera_pos.y) * 32.0);
+    Point2::new(x, y)
+}
+
 
-fn world_to_screen_coords(point: Point2, camera_pos: Point2) -> Point2 {
-    let x = point.x * 32.0 - camera_pos.x * 32.0;
-    let y = WINDOW_HEIGHT - point.y * 32.0 - camera_pos.y * 32.0;
+pub fn screen_to_world_coords(point: Point2, camera_pos: Point2) -> Point2 {
+    let x = point.x / 32.0 + camera_pos.x;
+    let y = (WINDOW_HEIGHT / 32.0) - (point.y / 32.0) + camera_pos.y;
     Point2::new(x, y)
 }
 
@@ -87,7 +93,7 @@ impl EventHandler for Engine {
             let seconds = 1.0 / (DESIRED_FPS as f32);
             // y axis is flipped since camera transform happens in pixel space with y+ = down
             let camera_movement = Vector2::new(self.input.get_axis_value("MoveX").unwrap(),
-                                               self.input.get_axis_value("MoveY").unwrap() * -1.0)
+                                               self.input.get_axis_value("MoveY").unwrap())
                                            * seconds * CAMERA_SPEED;
             self.camera_pos += camera_movement;
         }
@@ -101,6 +107,17 @@ impl EventHandler for Engine {
 
         self.tilemap.draw(world_to_screen_coords(Point2::new(10.0, 10.0), self.camera_pos), &self.tileset, ctx)?;
 
+        {
+            let cursor_pos = screen_to_world_coords(self.input.mouse_pos, self.camera_pos);
+            let cursor_pos = Point2::new(cursor_pos.x.floor(), cursor_pos.y.floor());
+
+            let drawparams = graphics::DrawParam::new()
+                .dest(world_to_screen_coords(cursor_pos, self.camera_pos))
+                .scale(Vector2::new(2.0, 2.0))
+                .offset(Point2::new(0.0, 1.0));
+            graphics::draw(ctx, self.assets.image("cursor").as_ref().unwrap(), drawparams)?;
+        }
+
         let test_text = graphics::Text::new((String::from("Test text"), self.assets.font("DejaVuSerif").unwrap(), 32.0));
         graphics::draw(ctx, &test_text, (Point2::new(800.0, 10.0), 0.0, graphics::WHITE))?;
 
@@ -111,6 +128,11 @@ impl EventHandler for Engine {
     }
 
 
+    fn mouse_motion_event(&mut self, ctx: &mut Context, x: f32, y: f32, xrel: f32, yrel: f32) {
+        self.input.mouse_motion_event(ctx, x, y, xrel, yrel);
+    }
+
+
     fn key_down_event(&mut self, ctx: &mut Context, keycode: KeyCode, keymods: KeyMods, repeat: bool) {
         self.input.key_down_event(ctx, keycode, keymods, repeat);
     }

src/input.rs

@@ -3,6 +3,8 @@ use std::collections::HashMap;
 use ggez::event::{KeyCode, KeyMods};
 use ggez::Context;
 
+use crate::types::Point2;
+
 
 #[derive(Debug, PartialEq)]
 struct ActionBinding {
@@ -23,6 +25,7 @@ struct AxisBinding {
 pub struct InputState {
     actions: HashMap<String, Vec<ActionBinding>>,
     axes: HashMap<String, Vec<AxisBinding>>,
+    pub mouse_pos: Point2,
 }
 
 
@@ -74,6 +77,11 @@ impl InputState {
     }
 
 
+    pub fn mouse_motion_event(&mut self, _ctx: &mut Context, x: f32, y: f32, _xrel: f32, _yrel: f32 ) {
+        self.mouse_pos = Point2::new(x, y);
+    }
+
+
     pub fn bind_action(&mut self, name: &str, key_code: KeyCode, key_mods: KeyMods) {
         if !self.actions.contains_key(name) {
             self.actions.insert(String::from(name), Vec::new());
@@ -136,6 +144,7 @@ impl Default for InputState {
         InputState {
             actions: HashMap::new(),
             axes: HashMap::new(),
+            mouse_pos: Point2::new(0.0, 0.0)
         }
     }
 }