From 5dd1ade46d1c21b840cfdd4acfaf3012a2955f7c Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Mon, 17 Oct 2022 17:28:10 +0200
Subject: a

---
 main/app.cpp    | 13 -------------
 main/app.hpp    |  1 -
 main/camera.cpp | 31 ++++++++++++++++++++++++++-----
 main/update.cpp |  8 --------
 4 files changed, 26 insertions(+), 27 deletions(-)

(limited to 'main')

diff --git a/main/app.cpp b/main/app.cpp
index d432c716..9fd9664d 100644
--- a/main/app.cpp
+++ b/main/app.cpp
@@ -88,19 +88,6 @@ void app::mouseMoveEvent(Platform::Sdl2Application::MouseMoveEvent& event)
     recalc_cursor_tile();
 }
 
-void app::recalc_cursor_tile()
-{
-    if (_cursor_pos)
-    {
-        constexpr Vector2 base_offset =
-            tile_shader::project({(float)TILE_MAX_DIM*BASE_X*TILE_SIZE[0],
-                                  (float)TILE_MAX_DIM*BASE_Y*TILE_SIZE[1], 0});
-        _cursor_tile = pixel_to_tile(Vector2(*_cursor_pos) - base_offset);
-    }
-    else
-        _cursor_tile = std::nullopt;
-}
-
 void app::mouseScrollEvent(Platform::Sdl2Application::MouseScrollEvent& event)
 {
     if (_imgui.handleMouseScrollEvent(event))
diff --git a/main/app.hpp b/main/app.hpp
index 395fa811..2a2a97f9 100644
--- a/main/app.hpp
+++ b/main/app.hpp
@@ -97,7 +97,6 @@ struct app final : Platform::Application
     std::optional<Vector2i> _cursor_pos;
     std::optional<global_coords> _cursor_tile;
 
-
     static constexpr std::int16_t BASE_X = 0, BASE_Y = 0;
 };
 
diff --git a/main/camera.cpp b/main/camera.cpp
index 70a58405..3a0238b7 100644
--- a/main/camera.cpp
+++ b/main/camera.cpp
@@ -6,15 +6,15 @@ namespace floormat {
 void app::do_camera(float dt)
 {
     auto camera_offset = _shader.camera_offset();
-        constexpr float pixels_per_second = 384;
+    constexpr float pixels_per_second = 768;
     if (keys[key::camera_up])
-        camera_offset += Vector2(0, 1) * dt * pixels_per_second;
+        camera_offset += Vector2{0,  1} * dt * pixels_per_second;
     else if (keys[key::camera_down])
-        camera_offset += Vector2(0, -1)  * dt * pixels_per_second;
+        camera_offset += Vector2{0, -1} * dt * pixels_per_second;
     if (keys[key::camera_left])
-        camera_offset += Vector2(1, 0) * dt * pixels_per_second;
+        camera_offset += Vector2{1,  0} * dt * pixels_per_second;
     else if (keys[key::camera_right])
-        camera_offset += Vector2(-1, 0)  * dt * pixels_per_second;
+        camera_offset += Vector2{-1, 0} * dt * pixels_per_second;
 
     {
         const auto max_camera_offset = Vector2(windowSize() * 10);
@@ -41,4 +41,25 @@ void app::update_window_scale(Vector2i sz)
     _shader.set_scale(Vector2{sz});
 }
 
+void app::recalc_cursor_tile()
+{
+    if (_cursor_pos)
+    {
+        constexpr Vector2 base_offset =
+            tile_shader::project({(float)TILE_MAX_DIM*BASE_X*TILE_SIZE[0],
+                                  (float)TILE_MAX_DIM*BASE_Y*TILE_SIZE[1], 0});
+        _cursor_tile = pixel_to_tile(Vector2(*_cursor_pos) - base_offset);
+    }
+    else
+        _cursor_tile = std::nullopt;
+}
+
+global_coords app::pixel_to_tile(Vector2 position) const
+{
+    const Vector2 px = position - Vector2{windowSize()}*.5f - _shader.camera_offset();
+    const Vector2 vec = tile_shader::unproject(px) / Vector2{TILE_SIZE[0]*.5f, TILE_SIZE[1]*.5f} + Vector2{.5f, .5f};
+    const auto x = (std::int32_t)std::floor(vec[0]), y = (std::int32_t)std::floor(vec[1]);
+    return { x, y };
+}
+
 } // namespace floormat
diff --git a/main/update.cpp b/main/update.cpp
index facabc37..1dbdb0ba 100644
--- a/main/update.cpp
+++ b/main/update.cpp
@@ -29,12 +29,4 @@ void app::update(float dt)
         Platform::Sdl2Application::exit(0);
 }
 
-global_coords app::pixel_to_tile(Vector2 position) const
-{
-    const Vector2 px = position - Vector2{windowSize()}*.5f - _shader.camera_offset();
-    const Vector2 vec = tile_shader::unproject(px) / Vector2{TILE_SIZE[0]*.5f, TILE_SIZE[1]*.5f} + Vector2{.5f, .5f};
-    const auto x = (std::int32_t)std::floor(vec[0]), y = (std::int32_t)std::floor(vec[1]);
-    return { x, y };
-}
-
 } // namespace floormat
-- 
cgit v1.2.3