Merge branch 'master' into snapping

4 files changed, 51 insertions, 0 deletions

diff --git a/src/colours.rs b/src/colours.rs
index 4a3b799..d381266 100644
--- a/src/colours.rs
+++ b/src/colours.rs
@@ -32,6 +32,10 @@ pub struct Colours {
     pub dimension_indicators: Color,
     /// Colour of the text used to display the size of the dimension indicators dimensions.
     pub dimension_text: Color,
+    /// Colour the point to show where something is will be drawn in.
+    pub position_indicator: Color,
+    /// Colour that is used for the text stating the position of the position indicator in meters.
+    pub position_text: Color,
     /// The colour used for drawing the lines of the grid which divides the map into chunks of evenly
     /// spaced cells.
     pub grid_lines: Color,
@@ -115,6 +119,18 @@ impl Colours {
                 b: 200,
                 a: 255,
             },
+            position_indicator: Color {
+                r: 200,
+                g: 200,
+                b: 200,
+                a: 255,
+            },
+            position_text: Color {
+                r: 200,
+                g: 200,
+                b: 200,
+                a: 255,
+            },
             grid_lines: Color {
                 r: 255,
                 g: 255,
diff --git a/src/gui/mod.rs b/src/gui/mod.rs
index c73d243..62173ec 100644
--- a/src/gui/mod.rs
+++ b/src/gui/mod.rs
@@ -9,8 +9,10 @@
 
 pub mod decimal_num_box;
 pub mod dimension_indicator;
+pub mod position_indicator;
 pub mod tool_sidebar;
 
 pub use self::decimal_num_box::*;
 pub use self::dimension_indicator::*;
+pub use self::position_indicator::*;
 pub use self::tool_sidebar::*;
diff --git a/src/gui/position_indicator.rs b/src/gui/position_indicator.rs
new file mode 100644
index 0000000..b6d0dac
--- /dev/null
+++ b/src/gui/position_indicator.rs
@@ -0,0 +1,31 @@
+//! The position indicator shows the mouse position on the map
+//!
+//! The exact position the mouse is currently on is shown unless hidden by the user (TODO). This
+//! helps to place things exactly where they should be on the map and let the user know where they
+//! are looking and where relative to them other things should be easily at all times. Currently, this
+//! is a simple HUD so it doesn't interact with anything in the world, but that may change in the
+//! future.
+
+use crate::colours::DEFAULT_COLOURS;
+use crate::math::Vec2;
+use crate::transform::Transform;
+use raylib::drawing::{RaylibDraw, RaylibDrawHandle};
+
+/// Function to draw a dot at the mouse position and the coordinates associated with it.
+// TODO: Snap this, when the user wants to snap, don't if they don't want to.
+pub fn position_indicator_draw(
+    rld: &mut RaylibDrawHandle,
+    mouse_pos_px: Vec2<f64>,
+    transform: &Transform,
+) {
+    let mouse_pos_m = transform.point_px_to_m(&mouse_pos_px);
+
+    rld.draw_circle_v(mouse_pos_px, 2., DEFAULT_COLOURS.position_indicator);
+    rld.draw_text(
+        &format!("({:.3}m, {:.3}m)", mouse_pos_m.x, mouse_pos_m.y),
+        mouse_pos_px.x as i32 - 30,
+        mouse_pos_px.y as i32 - 30,
+        20,
+        DEFAULT_COLOURS.position_text,
+    );
+}
diff --git a/src/main.rs b/src/main.rs
index 38f3912..c9ebe48 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -134,7 +134,9 @@ fn main() {
             tool_sidebar.draw(screen_height as u16, &mut d, &mut editor);
             snapper.draw(&mut d);
 
+            gui::position_indicator_draw(&mut d, last_mouse_pos.into(), &transform);
             dimension_indicator.draw(&mut d, &transform);
+            tool_sidebar.draw(screen_height as u16, &mut d, &mut editor);
         }
     }
 }