diff options
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/app.hpp | 2 | ||||
| -rw-r--r-- | editor/camera.cpp | 10 | ||||
| -rw-r--r-- | editor/events.cpp | 8 | ||||
| -rw-r--r-- | editor/precomp.hpp | 2 | ||||
| -rw-r--r-- | editor/update.cpp | 2 |
5 files changed, 13 insertions, 11 deletions
diff --git a/editor/app.hpp b/editor/app.hpp index b43d0e12..b2fcf480 100644 --- a/editor/app.hpp +++ b/editor/app.hpp @@ -94,7 +94,7 @@ private: wireframe_mesh<wireframe::quad> _wireframe_quad; wireframe_mesh<wireframe::box> _wireframe_box; editor _editor; - enum_bitset<key> _keys; + enum_bitset<key> keys; cursor_state cursor; }; diff --git a/editor/camera.cpp b/editor/camera.cpp index 07dba901..7e9d4870 100644 --- a/editor/camera.cpp +++ b/editor/camera.cpp @@ -8,19 +8,19 @@ namespace floormat { void app::do_camera(float dt) { - if (_keys[key::camera_reset]) + if (keys[key::camera_reset]) reset_camera_offset(); else { Vector2d dir{}; - if (_keys[key::camera_up]) + if (keys[key::camera_up]) dir += Vector2d{0, -1}; - else if (_keys[key::camera_down]) + else if (keys[key::camera_down]) dir += Vector2d{0, 1}; - if (_keys[key::camera_left]) + if (keys[key::camera_left]) dir += Vector2d{-1, 0}; - else if (_keys[key::camera_right]) + else if (keys[key::camera_right]) dir += Vector2d{1, 0}; if (dir != Vector2d{}) diff --git a/editor/events.cpp b/editor/events.cpp index 1df7163b..cfa0b904 100644 --- a/editor/events.cpp +++ b/editor/events.cpp @@ -101,10 +101,10 @@ void app::on_key_up_down(const floormat::key_event& event, bool is_down) noexcep case SDLK_ESCAPE: return key::quit; }); if (x != key::COUNT) - _keys[x] = is_down; + keys[x] = is_down; } else - _keys = {}; + keys = {}; } void app::on_text_input_event(const floormat::text_input_event& event) noexcept @@ -113,7 +113,7 @@ void app::on_text_input_event(const floormat::text_input_event& event) noexcept accessor(Containers::StringView, text) } e = {event.text}; if (_imgui.handleTextInputEvent(e)) - _keys = {}; + keys = {}; } void app::on_viewport_event(const Math::Vector2<int>& size) noexcept @@ -125,7 +125,7 @@ void app::on_focus_out() noexcept { cursor.pixel = std::nullopt; recalc_cursor_tile(); - _keys = {}; + keys = {}; } void app::on_mouse_leave() noexcept diff --git a/editor/precomp.hpp b/editor/precomp.hpp index e023f45d..fcc422b6 100644 --- a/editor/precomp.hpp +++ b/editor/precomp.hpp @@ -17,3 +17,5 @@ #include <Magnum/GL/Renderer.h> #include <Magnum/Platform/Sdl2Application.h> #include <Magnum/ImGuiIntegration/Context.h> + +#include <SDL_video.h> diff --git a/editor/update.cpp b/editor/update.cpp index 0f723648..bed45c94 100644 --- a/editor/update.cpp +++ b/editor/update.cpp @@ -53,7 +53,7 @@ void app::update(float dt) { do_camera(dt); draw_ui(); - if (_keys[key::quit]) + if (keys[key::quit]) M->quit(0); } |