From 0255a421906b9b3a77d9b51eb7d0126f16a9f0db Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Tue, 8 Apr 2025 02:14:41 +0100 Subject: Create WindowContent with a size object Not individual width/height parameters. --- ui/gameMainWindow.cpp | 2 +- ui/gameMainWindow.h | 2 +- ui/window.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ui') diff --git a/ui/gameMainWindow.cpp b/ui/gameMainWindow.cpp index afb7a2e..e87009f 100644 --- a/ui/gameMainWindow.cpp +++ b/ui/gameMainWindow.cpp @@ -50,7 +50,7 @@ private: GameMainSelector * gms; }; -GameMainWindow::GameMainWindow(size_t w, size_t h) : SceneRenderer {{w, h}, 0} +GameMainWindow::GameMainWindow(ScreenAbsCoord size) : SceneRenderer {size, 0} { uiComponents.create(glm::vec2 {310'727'624, 494'018'810}); auto gms = uiComponents.create(&camera); diff --git a/ui/gameMainWindow.h b/ui/gameMainWindow.h index 14e099c..41163d0 100644 --- a/ui/gameMainWindow.h +++ b/ui/gameMainWindow.h @@ -7,7 +7,7 @@ class GameMainWindow : public WindowContent, SceneRenderer, public SceneProvider { public: - GameMainWindow(size_t w, size_t h); + GameMainWindow(ScreenAbsCoord size); ~GameMainWindow() override; NO_MOVE(GameMainWindow); diff --git a/ui/window.h b/ui/window.h index 0316a1f..1c3d09c 100644 --- a/ui/window.h +++ b/ui/window.h @@ -27,7 +27,7 @@ public: { glm::ivec2 size {}; SDL_GetWindowSizeInPixels(m_window, &size.x, &size.y); - content = std::make_unique(size.x, size.y, std::forward

(p)...); + content = std::make_unique(ScreenAbsCoord {size.x, size.y}, std::forward

(p)...); } void tick(TickDuration elapsed); -- cgit v1.2.3