summaryrefslogtreecommitdiffhomepage
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/app.cpp7
-rw-r--r--main/app.hpp1
-rw-r--r--main/camera.cpp5
3 files changed, 2 insertions, 11 deletions
diff --git a/main/app.cpp b/main/app.cpp
index b1e616e4..a5062a82 100644
--- a/main/app.cpp
+++ b/main/app.cpp
@@ -65,8 +65,6 @@ app::app(const Arguments& arguments, app_settings opts):
#endif
//_framebuffer.attachRenderbuffer(GL::Framebuffer::BufferAttachment::DepthStencil, depthStencil);
- update_window_scale(windowSize());
-
setMinimalLoopPeriod(5);
{
auto c = _world[chunk_coords{0, 0}];
@@ -77,7 +75,8 @@ app::app(const Arguments& arguments, app_settings opts):
void app::recalc_viewport(Vector2i size)
{
- update_window_scale(size);
+ _shader.set_scale(Vector2(size));
+ _imgui.relayout(Vector2{ size }, size, size);
GL::defaultFramebuffer.setViewport({{}, size });
_framebuffer.detach(GL::Framebuffer::ColorAttachment{0});
@@ -85,8 +84,6 @@ void app::recalc_viewport(Vector2i size)
_msaa_color_texture.setStorage(1, GL::TextureFormat::RGBA8, size);
_framebuffer.setViewport({{}, size });
_framebuffer.attachTexture(GL::Framebuffer::ColorAttachment{0}, _msaa_color_texture);
-
- _imgui.relayout(Vector2{ size }, size, size);
}
void app::viewportEvent(Platform::Sdl2Application::ViewportEvent& event)
diff --git a/main/app.hpp b/main/app.hpp
index b6fb5605..5da7713d 100644
--- a/main/app.hpp
+++ b/main/app.hpp
@@ -42,7 +42,6 @@ private:
void do_camera(float dt);
void reset_camera_offset();
- void update_window_scale(Vector2i window_size);
void recalc_cursor_tile();
void recalc_viewport(Vector2i size);
diff --git a/main/camera.cpp b/main/camera.cpp
index 82d540a1..be22d89c 100644
--- a/main/camera.cpp
+++ b/main/camera.cpp
@@ -41,11 +41,6 @@ void app::reset_camera_offset()
recalc_cursor_tile();
}
-void app::update_window_scale(Vector2i sz)
-{
- _shader.set_scale(Vector2{sz});
-}
-
void app::recalc_cursor_tile()
{
if (_cursor_pixel)