|
|
@ -70,6 +70,16 @@ typedef struct { |
|
|
|
EGLConfig config; // Graphic config |
|
|
|
} PlatformData; |
|
|
|
|
|
|
|
typedef struct { |
|
|
|
// Store data for both Hover and Touch events |
|
|
|
// Used to ignore Hover events which are interpreted as Touch events |
|
|
|
int32_t pointCount; // Number of touch points active |
|
|
|
int32_t pointId[MAX_TOUCH_POINTS]; // Point identifiers |
|
|
|
Vector2 position[MAX_TOUCH_POINTS]; // Touch position on screen |
|
|
|
|
|
|
|
int32_t hoverPoints[MAX_TOUCH_POINTS]; // Hover Points |
|
|
|
} TouchRaw; |
|
|
|
|
|
|
|
//---------------------------------------------------------------------------------- |
|
|
|
// Global Variables Definition |
|
|
|
//---------------------------------------------------------------------------------- |
|
|
@ -246,16 +256,7 @@ static const KeyboardKey mapKeycode[KEYCODE_MAP_SIZE] = { |
|
|
|
KEY_KP_EQUAL // AKEYCODE_NUMPAD_EQUALS |
|
|
|
}; |
|
|
|
|
|
|
|
// Store data for both Hover and Touch events |
|
|
|
// Used to ignore Hover events which are interpreted as Touch events |
|
|
|
static struct { |
|
|
|
|
|
|
|
int32_t pointCount; // Number of touch points active |
|
|
|
int32_t pointId[MAX_TOUCH_POINTS]; // Point identifiers |
|
|
|
Vector2 position[MAX_TOUCH_POINTS]; // Touch position on screen |
|
|
|
|
|
|
|
int32_t hoverPoints[MAX_TOUCH_POINTS]; // Hover Points |
|
|
|
}touchRaw; |
|
|
|
static TouchRaw touchRaw = { 0 }; |
|
|
|
|
|
|
|
//---------------------------------------------------------------------------------- |
|
|
|
// Module Internal Functions Declaration |
|
|
@ -812,10 +813,7 @@ int InitPlatform(void) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
touchRaw.pointCount = 0; |
|
|
|
for(int i = 0; i < MAX_TOUCH_POINTS; i++){ |
|
|
|
touchRaw.hoverPoints[i] = -1; |
|
|
|
} |
|
|
|
for (int i = 0; i < MAX_TOUCH_POINTS; i++) touchRaw.hoverPoints[i] = -1; |
|
|
|
|
|
|
|
return 0; |
|
|
|
} |
|
|
@ -1306,30 +1304,36 @@ static int32_t AndroidInputCallback(struct android_app *app, AInputEvent *event) |
|
|
|
unsigned int flags = action & AMOTION_EVENT_ACTION_MASK; |
|
|
|
int32_t pointerIndex = (action & AMOTION_EVENT_ACTION_POINTER_INDEX_MASK) >> AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT; |
|
|
|
|
|
|
|
if(flags == AMOTION_EVENT_ACTION_HOVER_ENTER){ |
|
|
|
if (flags == AMOTION_EVENT_ACTION_HOVER_ENTER) |
|
|
|
{ |
|
|
|
// The new pointer is hover |
|
|
|
// So add it to hoverPoints |
|
|
|
for(int i = 0; i < MAX_TOUCH_POINTS; i++){ |
|
|
|
if(touchRaw.hoverPoints[i] == -1){ |
|
|
|
for (int i = 0; i < MAX_TOUCH_POINTS; i++) |
|
|
|
{ |
|
|
|
if (touchRaw.hoverPoints[i] == -1) |
|
|
|
{ |
|
|
|
touchRaw.hoverPoints[i] = touchRaw.pointId[pointerIndex]; |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if (flags == AMOTION_EVENT_ACTION_POINTER_UP || flags == AMOTION_EVENT_ACTION_UP || flags == AMOTION_EVENT_ACTION_HOVER_EXIT) |
|
|
|
if (p">(flags == AMOTION_EVENT_ACTION_POINTER_UP) || (flags == AMOTION_EVENT_ACTION_UP) || (flags == AMOTION_EVENT_ACTION_HOVER_EXIT)) |
|
|
|
{ |
|
|
|
// One of the touchpoints is released, remove it from touch point arrays |
|
|
|
if(flags == AMOTION_EVENT_ACTION_HOVER_EXIT){ |
|
|
|
if (flags == AMOTION_EVENT_ACTION_HOVER_EXIT) |
|
|
|
{ |
|
|
|
// If the touchPoint is hover, remove it from hoverPoints |
|
|
|
for(int i = 0; i < MAX_TOUCH_POINTS; i++){ |
|
|
|
if(touchRaw.hoverPoints[i] == touchRaw.pointId[pointerIndex]){ |
|
|
|
for (int i = 0; i < MAX_TOUCH_POINTS; i++) |
|
|
|
{ |
|
|
|
if (touchRaw.hoverPoints[i] == touchRaw.pointId[pointerIndex]) |
|
|
|
{ |
|
|
|
touchRaw.hoverPoints[i] = -1; |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
for (int i = pointerIndex; (i < touchRaw.pointCount - 1) && (i < MAX_TOUCH_POINTS-1); i++) |
|
|
|
for (int i = pointerIndex; (i < touchRaw.pointCount - 1) && (i < MAX_TOUCH_POINTS - 1); i++) |
|
|
|
{ |
|
|
|
touchRaw.pointId[i] = touchRaw.pointId[i+1]; |
|
|
|
touchRaw.position[i] = touchRaw.position[i+1]; |
|
|
@ -1339,18 +1343,19 @@ static int32_t AndroidInputCallback(struct android_app *app, AInputEvent *event) |
|
|
|
|
|
|
|
int pointCount = 0; |
|
|
|
for (int i = 0; (i < touchRaw.pointCount) && (i < MAX_TOUCH_POINTS); i++) |
|
|
|
{ |
|
|
|
{ |
|
|
|
// If the touchPoint is hover, Ignore it |
|
|
|
bool hover = false; |
|
|
|
for(int j = 0; j < MAX_TOUCH_POINTS; j++){ |
|
|
|
for (int j = 0; j < MAX_TOUCH_POINTS; j++) |
|
|
|
{ |
|
|
|
// Check if the touchPoint is in hoverPointers |
|
|
|
if(touchRaw.hoverPoints[j] == touchRaw.pointId[i]){ |
|
|
|
if (touchRaw.hoverPoints[j] == touchRaw.pointId[i]) |
|
|
|
{ |
|
|
|
hover = true; |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
if(hover) |
|
|
|
continue; |
|
|
|
if (hover) continue; |
|
|
|
|
|
|
|
CORE.Input.Touch.pointId[pointCount] = touchRaw.pointId[i]; |
|
|
|
CORE.Input.Touch.position[pointCount] = touchRaw.position[i]; |
|
|
|