a

4 files changed, 55 insertions, 41 deletions

diff --git a/main/app.cpp b/main/app.cpp
index 66857860..89d680de 100644
--- a/main/app.cpp
+++ b/main/app.cpp
@@ -7,7 +7,8 @@ app::app(const Arguments& arguments):
           arguments,
           Configuration{}
               .setTitle("Test")
-              .setSize({1024, 768}, dpi_policy::Physical),
+              .setSize({1024, 768}, dpi_policy::Physical)
+              .setWindowFlags(Configuration::WindowFlag::Resizable),
           GLConfiguration{}
               .setSampleCount(4)
               .setFlags(GLConfiguration::Flag::GpuValidation)
@@ -17,12 +18,6 @@ app::app(const Arguments& arguments):
     timeline.start();
 }
 
-void app::update_window_scale()
-{
-    auto sz = windowSize();
-    _shader.set_scale({ (float)sz[0], (float)sz[1] });
-}
-
 void app::update(float dt)
 {
     do_camera(dt);
diff --git a/main/app.hpp b/main/app.hpp
index 06ad882e..c1b45af9 100644
--- a/main/app.hpp
+++ b/main/app.hpp
@@ -28,7 +28,8 @@ struct app final : Platform::Application
     void keyReleaseEvent(KeyEvent& event) override;
     void do_key(KeyEvent::Key k, KeyEvent::Modifiers m, bool pressed, bool repeated);
     void draw_chunk(chunk& c);
-    void update_window_scale();
+    void update_window_scale(Vector2i window_size);
+    void viewportEvent(ViewportEvent& event) override;
 
     enum class key : int {
         camera_up, camera_left, camera_right, camera_down, camera_reset,
diff --git a/main/camera.cpp b/main/camera.cpp
new file mode 100644
index 00000000..c9fb0391
--- /dev/null
+++ b/main/camera.cpp
@@ -0,0 +1,39 @@
+#include "app.hpp"
+
+namespace Magnum::Examples {
+
+void app::do_camera(float dt)
+{
+    constexpr float pixels_per_second = 512;
+    if (keys[key::camera_up])
+        camera_offset += Vector2(0, 1) * dt * pixels_per_second;
+    else if (keys[key::camera_down])
+        camera_offset += Vector2(0, -1)  * dt * pixels_per_second;
+    if (keys[key::camera_left])
+        camera_offset += Vector2(1, 0) * dt * pixels_per_second;
+    else if (keys[key::camera_right])
+        camera_offset += Vector2(-1, 0)  * dt * pixels_per_second;
+
+    _shader.set_camera_offset(camera_offset);
+
+    if (keys[key::camera_reset])
+        reset_camera_offset();
+}
+
+void app::reset_camera_offset()
+{
+    camera_offset = _shader.project({TILE_MAX_DIM*TILE_SIZE[0]/2.f, TILE_MAX_DIM*TILE_SIZE[1]/2.f, 0});
+    //camera_offset = {};
+}
+
+void app::update_window_scale(Vector2i sz)
+{
+    _shader.set_scale(Vector2{sz});
+}
+
+void app::viewportEvent(Platform::Sdl2Application::ViewportEvent& event)
+{
+    update_window_scale(event.windowSize());
+}
+
+} // namespace Magnum::Examples
diff --git a/main/main.cpp b/main/main.cpp
index 34a7ae4a..2545865f 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -32,7 +32,7 @@ void app::drawEvent() {
     GL::Renderer::setDepthFunction(GL::Renderer::DepthFunction::Never);
 #endif
 
-    update_window_scale();
+    update_window_scale(windowSize());
     {
         float dt = timeline.previousFrameDuration();
         update(dt);
@@ -51,44 +51,23 @@ void app::draw_chunk(chunk& c)
     _wall_mesh.draw(_shader, c);
 }
 
-void app::do_camera(float dt)
-{
-    constexpr float pixels_per_second = 512;
-    if (keys[key::camera_up])
-        camera_offset += Vector2(0, 1) * dt * pixels_per_second;
-    else if (keys[key::camera_down])
-        camera_offset += Vector2(0, -1)  * dt * pixels_per_second;
-    if (keys[key::camera_left])
-        camera_offset += Vector2(1, 0) * dt * pixels_per_second;
-    else if (keys[key::camera_right])
-        camera_offset += Vector2(-1, 0)  * dt * pixels_per_second;
-
-    _shader.set_camera_offset(camera_offset);
-
-    if (keys[key::camera_reset])
-        reset_camera_offset();
-}
-
-void app::reset_camera_offset()
-{
-    camera_offset = _shader.project({TILE_MAX_DIM*TILE_SIZE[0]/2.f, TILE_MAX_DIM*TILE_SIZE[1]/2.f, 0});
-    //camera_offset = {};
-}
-
-
-
 } // namespace Magnum::Examples
 
 MAGNUM_APPLICATION_MAIN(Magnum::Examples::app)
 
 #ifdef _MSC_VER
-#   include <cstdlib>
-#   ifdef __clang__
-#       pragma clang diagnostic ignored "-Wmissing-prototypes"
-#       pragma clang diagnostic ignored "-Wmain"
-#   endif
+#include <cstdlib> // for __arg{c,v}
+#ifdef __clang__
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wmain"
+#endif
+extern "C" int __stdcall WinMain(void*, void*, void*, int);
 
-extern "C" int __stdcall WinMain(void*, void*, void*, int /* nCmdShow */) {
+extern "C" int __stdcall WinMain(void*, void*, void*, int)
+{
     return main(__argc, __argv);
 }
+#ifdef __clang__
+#    pragma clang diagnostic pop
+#endif
 #endif