aboutsummaryrefslogtreecommitdiff
path: root/src/crepe/system/InputSystem.cpp
diff options
context:
space:
mode:
authorLoek Le Blansch <loek@pipeframe.xyz>2025-01-07 10:37:52 +0100
committerLoek Le Blansch <loek@pipeframe.xyz>2025-01-07 10:37:52 +0100
commitd46548ab15699f7ae91227625302553e79a126bc (patch)
treee5b05fc99dca66512cf76cce30bf905e2213de8b /src/crepe/system/InputSystem.cpp
parentc817f6ff091de9869c803868c50a9ea884ead376 (diff)
parent77d02bf2e2d5d04e8cacb3c783446541517e8e76 (diff)
merge master
Diffstat (limited to 'src/crepe/system/InputSystem.cpp')
-rw-r--r--src/crepe/system/InputSystem.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp
index b4a0633..be7eda6 100644
--- a/src/crepe/system/InputSystem.cpp
+++ b/src/crepe/system/InputSystem.cpp
@@ -1,8 +1,8 @@
#include "../api/Button.h"
+#include "../api/Config.h"
#include "../facade/SDLContext.h"
#include "../manager/ComponentManager.h"
#include "../manager/EventManager.h"
-#include "util/Log.h"
#include "InputSystem.h"
@@ -213,10 +213,10 @@ bool InputSystem::is_mouse_inside_button(
const Transform & cam_transform
) {
vec2 actual_pos = transform.position + button.offset;
- if (!button.world_space) {
+ if (!button.data.world_space) {
actual_pos += cam_transform.position;
}
- vec2 half_dimensions = button.dimensions / 2;
+ vec2 half_dimensions = button.dimensions * transform.scale / 2;
return mouse_pos.x >= actual_pos.x - half_dimensions.x
&& mouse_pos.x <= actual_pos.x + half_dimensions.x