github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-08-21 22:13:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add Touches to Controller State

Browse source
This commit is contained in:
Florian Märkl 2020-07-02 19:16:23 +02:00
commit 0b9f8798eb
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
2 changed files with 36 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/include/chiaki/controller.h
View file

@ -56,6 +56,14 @@ typedef enum chiaki_controller_analog_button_t
CHIAKI_CONTROLLER_ANALOG_BUTTON_R2 = (1 << 17) CHIAKI_CONTROLLER_ANALOG_BUTTON_R2 = (1 << 17)
} ChiakiControllerAnalogButton; } ChiakiControllerAnalogButton;
typedef struct chiaki_controller_touch_t
{
uint16_t x, y;
int8_t id; // -1 = up
} ChiakiControllerTouch;
#define CHIAKI_CONTROLLER_TOUCHES_MAX 2
typedef struct chiaki_controller_state_t typedef struct chiaki_controller_state_t
{ {
/** /**
@ -70,19 +78,32 @@ typedef struct chiaki_controller_state_t
int16_t left_y; int16_t left_y;
int16_t right_x; int16_t right_x;
int16_t right_y; int16_t right_y;
uint8_t touch_id_next;
ChiakiControllerTouch touches[CHIAKI_CONTROLLER_TOUCHES_MAX];
} ChiakiControllerState; } ChiakiControllerState;
CHIAKI_EXPORT void chiaki_controller_state_set_idle(ChiakiControllerState *state); CHIAKI_EXPORT void chiaki_controller_state_set_idle(ChiakiControllerState *state);
static inline bool chiaki_controller_state_equals(ChiakiControllerState *a, ChiakiControllerState *b) static inline bool chiaki_controller_state_equals(ChiakiControllerState *a, ChiakiControllerState *b)
{ {
return a->buttons == b->buttons if(!(a->buttons == b->buttons
&& a->l2_state == b->l2_state && a->l2_state == b->l2_state
&& a->r2_state == b->r2_state && a->r2_state == b->r2_state
&& a->left_x == b->left_x && a->left_x == b->left_x
&& a->left_y == b->left_y && a->left_y == b->left_y
&& a->right_x == b->right_x && a->right_x == b->right_x
&& a->right_y == b->right_y; && a->right_y == b->right_y))
return false;
for(size_t i=0; i<CHIAKI_CONTROLLER_TOUCHES_MAX; i++)
{
if(a->touches[i].id != b->touches[i].id)
return false;
if(a->touches[i].id >= 0 && (a->touches[i].x != b->touches[i].x || a->touches[i].y != b->touches[i].y))
return false;
}
return true;
} }
CHIAKI_EXPORT void chiaki_controller_state_or(ChiakiControllerState *out, ChiakiControllerState *a, ChiakiControllerState *b); CHIAKI_EXPORT void chiaki_controller_state_or(ChiakiControllerState *out, ChiakiControllerState *a, ChiakiControllerState *b);

13
lib/src/controller.c
View file

@ -39,4 +39,17 @@ CHIAKI_EXPORT void chiaki_controller_state_or(ChiakiControllerState *out, Chiaki
out->left_y = MAX_ABS(a->left_y, b->left_y); out->left_y = MAX_ABS(a->left_y, b->left_y);
out->right_x = MAX_ABS(a->right_x, b->right_x); out->right_x = MAX_ABS(a->right_x, b->right_x);
out->right_y = MAX_ABS(a->right_y, b->right_y); out->right_y = MAX_ABS(a->right_y, b->right_y);
out->touch_id_next = 0;
for(size_t i=0; i<CHIAKI_CONTROLLER_TOUCHES_MAX; i++)
{
ChiakiControllerTouch *touch = a->touches[i].id >= 0 ? &a->touches[i] : b->touches[i].id >= 0 ? &b->touches[i] : NULL;
if(!touch)
{
out->touches[i].id = -1;
out->touches[i].x = out->touches[i].y = 0;
continue;
}
out->touches[i] = *touch;
}
} }