diff options
Diffstat (limited to 'main/floormat-main-impl.hpp')
| -rw-r--r-- | main/floormat-main-impl.hpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/main/floormat-main-impl.hpp b/main/floormat-main-impl.hpp index 2674bbae..c6a75129 100644 --- a/main/floormat-main-impl.hpp +++ b/main/floormat-main-impl.hpp @@ -17,7 +17,7 @@ struct floormat_app; struct main_impl final : Platform::Sdl2Application, floormat_main { - main_impl(floormat_app& app, fm_options opts) noexcept; + main_impl(floormat_app& app, fm_settings opts) noexcept; ~main_impl() noexcept override; int exec() override; @@ -31,6 +31,9 @@ struct main_impl final : Platform::Sdl2Application, floormat_main struct world& world() noexcept override; SDL_Window* window() noexcept override; + fm_settings& settings() noexcept; + const fm_settings& settings() const noexcept; + global_coords pixel_to_tile(Vector2d position) const noexcept override; [[maybe_unused]] void viewportEvent(ViewportEvent& event) override; @@ -52,13 +55,13 @@ private: floor_mesh _floor_mesh; wall_mesh _wall_mesh; Magnum::Timeline timeline; - fm_options s; + fm_settings s; int fake_argc = 1; struct draw_bounds final { std::int16_t minx, maxx, miny, maxy; }; #ifdef FM_MSAA - GL::Framebuffer _msaa_framebuffer{{{}, windowSize()}}; + GL::Framebuffer _msaa_framebuffer{{{}, window_size()}}; GL::Renderbuffer _msaa_renderbuffer{}; #endif @@ -72,9 +75,9 @@ private: static void _debug_callback(GL::DebugOutput::Source src, GL::DebugOutput::Type type, UnsignedInt id, GL::DebugOutput::Severity severity, const std::string& str, const void* self); - static Configuration make_conf(const fm_options& s); - static GLConfiguration make_gl_conf(const fm_options& s); - static Configuration::WindowFlags make_window_flags(const fm_options& s); + static Configuration make_conf(const fm_settings& s); + static GLConfiguration make_gl_conf(const fm_settings& s); + static Configuration::WindowFlags make_window_flags(const fm_settings& s); }; } // namespace floormat |