diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/floormat-events.cpp | 5 | ||||
| -rw-r--r-- | main/floormat-main-impl.hpp | 4 | ||||
| -rw-r--r-- | main/floormat.hpp | 2 | ||||
| -rw-r--r-- | main/main.cpp | 4 |
4 files changed, 9 insertions, 6 deletions
diff --git a/main/floormat-events.cpp b/main/floormat-events.cpp index 62409d35..3200728a 100644 --- a/main/floormat-events.cpp +++ b/main/floormat-events.cpp @@ -1,4 +1,3 @@ -#pragma once #include "floormat-main-impl.hpp" #include "floormat-app.hpp" #include "floormat-events.hpp" @@ -63,7 +62,7 @@ void main_impl::keyPressEvent(Platform::Sdl2Application::KeyEvent& event) app.on_key_up_down({(SDL_Keycode)(std::uint32_t)event.key(), (SDL_Keymod)(std::uint16_t)event.modifiers(), event.isRepeated()}, - true) + true); } void main_impl::keyReleaseEvent(Platform::Sdl2Application::KeyEvent& event) @@ -71,7 +70,7 @@ void main_impl::keyReleaseEvent(Platform::Sdl2Application::KeyEvent& event) app.on_key_up_down({(SDL_Keycode)(std::uint32_t)event.key(), (SDL_Keymod)(std::uint16_t)event.modifiers(), event.isRepeated()}, - false) + false); } void main_impl::anyEvent(SDL_Event& event) diff --git a/main/floormat-main-impl.hpp b/main/floormat-main-impl.hpp index c6a75129..0406760a 100644 --- a/main/floormat-main-impl.hpp +++ b/main/floormat-main-impl.hpp @@ -31,8 +31,8 @@ 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; + fm_settings& settings() noexcept override; + const fm_settings& settings() const noexcept override; global_coords pixel_to_tile(Vector2d position) const noexcept override; diff --git a/main/floormat.hpp b/main/floormat.hpp index 032c7865..d596c21b 100644 --- a/main/floormat.hpp +++ b/main/floormat.hpp @@ -25,7 +25,7 @@ struct fm_settings fullscreen_desktop : 1 = false, borderless : 1 = false, maximized : 1 = false, - msaa : 1 = true; // TODO + msaa : 1 = true; }; } // namespace floormat diff --git a/main/main.cpp b/main/main.cpp index 7ffc1a28..37325809 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -6,6 +6,8 @@ #include <Corrade/Utility/DebugStl.h> #include <Magnum/GL/DefaultFramebuffer.h> +#if 0 + #ifdef FM_MSAA #include <Magnum/GL/RenderbufferFormat.h> #endif @@ -109,3 +111,5 @@ extern "C" int __stdcall WinMain(void*, void*, void*, int) # pragma clang diagnostic pop #endif #endif + +#endif |