Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Checkpoint on getting touch events to come through SDL. This (deliberately) breaks the mouse emulation & cripples input on Android, as those calls are being replaced with real finger down/up/motion commands instead. More to come...

Browse Source
This commit is contained in:
wrenczes
2011-06-07 00:32:26 +00:00
parent 92dd1f2d40
commit f7cad41013
2 changed files with 448 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
JGE/Dependencies/SDL/src/video/android/SDL_androidtouch.c
View File

@@ -23,6 +23,7 @@
#include <android/log.h>
#include "SDL_events.h"
#include "SDL_touch.h"
#include "../../events/SDL_mouse_c.h"
#include "SDL_androidtouch.h"
@@ -34,25 +35,65 @@
#define ACTION_CANCEL 3
#define ACTION_OUTSIDE 4
static SDL_TouchID gTouchID = 0;
SDL_Touch* CreateTouchInstance()
{
SDL_Touch touch;
touch.id = gTouchID;
touch.x_min = 0;
touch.x_max = 1;
touch.native_xres = touch.x_max - touch.x_min;
touch.y_min = 0;
touch.y_max = 1;
touch.native_yres = touch.y_max - touch.y_min;
touch.pressure_min = 0;
touch.pressure_max = 1;
touch.native_pressureres = touch.pressure_max - touch.pressure_min;
SDL_AddTouch(&touch, "");
return SDL_GetTouch(touch.id);
}
void Android_OnTouch(int action, float x, float y, float p)
{
if (!Android_Window) {
if (!Android_Window)
{
return;
}
if ((action != ACTION_CANCEL) && (action != ACTION_OUTSIDE)) {
SDL_SetMouseFocus(Android_Window);
SDL_SendMouseMotion(Android_Window, 0, (int)x, (int)y);
switch(action) {
if ((action != ACTION_CANCEL) && (action != ACTION_OUTSIDE))
{
//SDL_SetMouseFocus(Android_Window);
//SDL_SendMouseMotion(Android_Window, 0, (int)x, (int)y);
SDL_Touch* touch = SDL_GetTouch(gTouchID);
if (touch == NULL)
{
touch = CreateTouchInstance();
}
switch(action)
{
case ACTION_DOWN:
SDL_SendMouseButton(Android_Window, SDL_PRESSED, SDL_BUTTON_LEFT);
SDL_SendFingerDown(touch->id, 1, 1, x, y, p);
//SDL_SendMouseButton(Android_Window, SDL_PRESSED, SDL_BUTTON_LEFT);
break;
case ACTION_MOVE:
SDL_SendTouchMotion(touch->id, 1, 0, x, y, 1);
break;
case ACTION_UP:
SDL_SendMouseButton(Android_Window, SDL_RELEASED, SDL_BUTTON_LEFT);
SDL_SendFingerDown(touch->id, 1, 0, x, y, p);
//SDL_SendMouseButton(Android_Window, SDL_RELEASED, SDL_BUTTON_LEFT);
break;
}
} else {
SDL_SetMouseFocus(NULL);
}
else
{
//SDL_SetMouseFocus(NULL);
}
}