From 980858186149651df5543b6fc99a4f7db0cdd089 Mon Sep 17 00:00:00 2001 From: Xavier Del Campo Romero Date: Tue, 27 Sep 2022 17:03:06 +0200 Subject: WIP --- src/camera/src/mouse.c | 3 +++ src/camera/src/pad.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/camera') diff --git a/src/camera/src/mouse.c b/src/camera/src/mouse.c index 22fc3ba..30fedb9 100644 --- a/src/camera/src/mouse.c +++ b/src/camera/src/mouse.c @@ -13,6 +13,9 @@ static void cursor_update(struct cursor *const c, const struct mouse *const m) c->x = m->x; c->y = m->y; + c->state = mouse_pressed(m, MOUSE_BUTTON_LEFT) || + mouse_pressed(m, MOUSE_BUTTON_RIGHT) ? + CURSOR_STATE_PRESSED: CURSOR_STATE_IDLE; } static void update_speed(struct camera *const cam, const struct mouse *const m) diff --git a/src/camera/src/pad.c b/src/camera/src/pad.c index 13cb43e..f3af527 100644 --- a/src/camera/src/pad.c +++ b/src/camera/src/pad.c @@ -36,8 +36,8 @@ static void cursor_update(struct camera *const cam, && (c->y != c->y_init || cam->y <= -cam->dim.h)) c->y += STEP; - c->state = input_pad_pressed(in, p, PAD_KEY_A) || - input_pad_pressed(in, p, PAD_KEY_B) ? + c->state = pad_pressed(p, PAD_KEY_A) || + pad_pressed(p, PAD_KEY_B) ? CURSOR_STATE_PRESSED: CURSOR_STATE_IDLE; } -- cgit v1.2.3