KlemenPl/PixelDefense
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve drag input detection

Browse Source
This commit is contained in:
Klemen Plestenjak
2024-01-07 14:00:32 +01:00
parent 9c745d2857
commit b8b36d9cb7
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
game/input.h
View File

@@ -3,6 +3,7 @@
#include <breeze.h> #include <breeze.h>
#include <flecs.h> #include <flecs.h>
#include <raymath.h>
#include "components.h" #include "components.h"
@@ -17,7 +18,7 @@ typedef enum InputType {
#define MOUSE_BUTTON_COUNT (MOUSE_BUTTON_BACK + 1) #define MOUSE_BUTTON_COUNT (MOUSE_BUTTON_BACK + 1)
#define CLICK_LIMIT 0.12f #define DRAG_THRESHOLD 5
#define BUTTON_COUNT (MOUSE_BUTTON_BACK + 1) #define BUTTON_COUNT (MOUSE_BUTTON_BACK + 1)
typedef struct InputMapping { typedef struct InputMapping {
@@ -105,18 +106,26 @@ static void updateInputState(InputState *state, const Camera2D camera, const f32
state->mouseWorld = mouseWorld; state->mouseWorld = mouseWorld;
} }
static f32 inputMouseDelta(const InputState *state) {
Vector2 start = state->mouseDown;
Vector2 end = state->mouse;
f32 dst = Vector2DistanceSqr(start, end);
return dst;
}
static bool isInputBtnDragged(const InputState *state, const MouseButton btn) { static bool isInputBtnDragged(const InputState *state, const MouseButton btn) {
return IsMouseButtonDown(btn) && state->mouseDownElapsed[btn] > CLICK_LIMIT; if (!IsMouseButtonDown(btn)) return false;
return inputMouseDelta(state) >= DRAG_THRESHOLD;
} }
static bool isInputBtnJustDragged(const InputState *state, const MouseButton btn) { static bool isInputBtnJustDragged(const InputState *state, const MouseButton btn) {
return IsMouseButtonReleased(btn) && state->mouseDownElapsed[btn] > CLICK_LIMIT; if (!IsMouseButtonReleased(btn)) return false;
return inputMouseDelta(state) >= DRAG_THRESHOLD;
} }
static bool isInputBtnJustDown(const InputState *state, const MouseButton btn) { static bool isInputBtnJustDown(const InputState *state, const MouseButton btn) {
BZ_UNUSED(state); return IsMouseButtonPressed(btn) && inputMouseDelta(state) < DRAG_THRESHOLD;
return IsMouseButtonPressed(btn);
} }
static bool isInputBtnJustUp(const InputState *state, const MouseButton btn) { static bool isInputBtnJustUp(const InputState *state, const MouseButton btn) {
return IsMouseButtonReleased(btn) && state->mouseDownElapsed[btn] <= CLICK_LIMIT; return IsMouseButtonReleased(btn) && inputMouseDelta(state) < DRAG_THRESHOLD;
} }
static bool isInputBtnDown(const InputState *state, const MouseButton btn) { static bool isInputBtnDown(const InputState *state, const MouseButton btn) {
BZ_UNUSED(state); BZ_UNUSED(state);