diff options
Diffstat (limited to 'src/crepe/api')
| -rw-r--r-- | src/crepe/api/Event.h | 10 | ||||
| -rw-r--r-- | src/crepe/api/Script.cpp | 6 | ||||
| -rw-r--r-- | src/crepe/api/Script.h | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/crepe/api/Event.h b/src/crepe/api/Event.h index 4e57b45..73bf461 100644 --- a/src/crepe/api/Event.h +++ b/src/crepe/api/Event.h @@ -39,7 +39,7 @@ public: */ class MousePressEvent : public Event { public: - //! mouse position in game units + //! mouse position in world coordinates (game units). vec2 mouse_pos = {0, 0}; //! The mouse button that was pressed. @@ -51,7 +51,7 @@ public: */ class MouseClickEvent : public Event { public: - //! mouse position in game units + //! mouse position in world coordinates (game units). vec2 mouse_pos = {0, 0}; //! The mouse button that was clicked. @@ -63,7 +63,7 @@ public: */ class MouseReleaseEvent : public Event { public: - //! mouse position in game units + //! mouse position in world coordinates (game units). vec2 mouse_pos = {0, 0}; //! The mouse button that was released. @@ -75,7 +75,7 @@ public: */ class MouseMoveEvent : public Event { public: - //! mouse position in game units + //! mouse position in world coordinates (game units). vec2 mouse_pos = {0, 0}; //! The change in mouse position relative to the last position (in pixels). ivec2 mouse_delta = {0, 0}; @@ -86,7 +86,7 @@ public: */ class MouseScrollEvent : public Event { public: - //! mouse position in game units when the scroll happened. + //! mouse position in world coordinates (game units) when the scroll happened. vec2 mouse_pos = {0, 0}; //! scroll direction (-1 = down, 1 = up) int scroll_direction = 0; diff --git a/src/crepe/api/Script.cpp b/src/crepe/api/Script.cpp index 7b56f61..638cca7 100644 --- a/src/crepe/api/Script.cpp +++ b/src/crepe/api/Script.cpp @@ -1,7 +1,7 @@ #include <string> -#include "../manager/SceneManager.h" #include "../facade/SDLContext.h" +#include "../manager/SceneManager.h" #include "Script.h" using namespace crepe; @@ -26,7 +26,7 @@ void Script::set_next_scene(const string & name) { SaveManager & Script::get_save_manager() const { return this->mediator->save_manager; } -const keyboard_state_t& Script::get_keyboard_state() const{ - SDLContext& sdl_context = this->mediator->sdl_context; +const keyboard_state_t & Script::get_keyboard_state() const { + SDLContext & sdl_context = this->mediator->sdl_context; return sdl_context.get_keyboard_state(); } diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h index 4fbf344..dcecc07 100644 --- a/src/crepe/api/Script.h +++ b/src/crepe/api/Script.h @@ -2,11 +2,11 @@ #include <vector> +#include "../api/KeyCodes.h" #include "../manager/EventManager.h" #include "../manager/Mediator.h" #include "../system/CollisionSystem.h" #include "../types.h" -#include "../api/KeyCodes.h" #include "../util/OptionalRef.h" namespace crepe { @@ -142,7 +142,7 @@ protected: * \return current keyboard state map with Keycode as key and bool as value(true = pressed, false = not pressed) * */ - const keyboard_state_t& get_keyboard_state() const; + const keyboard_state_t & get_keyboard_state() const; //! \} private: |