geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Emscripten: Fixed touch coordinates not being normalized.

Philipp Wiesemann 2015-05-06 21:10:48 +02:00
parent 5715097a0c
commit 3f51758ec5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/video/emscripten/SDL_emscriptenevents.c
View File

@ -371,7 +371,7 @@ Emscripten_HandleFocus(int eventType, const EmscriptenFocusEvent *wheelEvent, vo
EM_BOOL EM_BOOL
Emscripten_HandleTouch(int eventType, const EmscriptenTouchEvent *touchEvent, void *userData) Emscripten_HandleTouch(int eventType, const EmscriptenTouchEvent *touchEvent, void *userData)
{ {
/*SDL_WindowData *window_data = userData;*/ SDL_WindowData *window_data = userData;
int i; int i;
SDL_TouchID deviceId = 0; SDL_TouchID deviceId = 0;
@ -382,14 +382,15 @@ Emscripten_HandleTouch(int eventType, const EmscriptenTouchEvent *touchEvent, vo
} }
for (i = 0; i < touchEvent->numTouches; i++) { for (i = 0; i < touchEvent->numTouches; i++) {
long x, y, id; SDL_FingerID id;
float x, y;
if (!touchEvent->touches[i].isChanged) if (!touchEvent->touches[i].isChanged)
continue; continue;
id = touchEvent->touches[i].identifier; id = touchEvent->touches[i].identifier;
x = touchEvent->touches[i].canvasX; x = touchEvent->touches[i].canvasX / (float)window_data->windowed_width;
y = touchEvent->touches[i].canvasY; y = touchEvent->touches[i].canvasY / (float)window_data->windowed_height;
if (eventType == EMSCRIPTEN_EVENT_TOUCHMOVE) { if (eventType == EMSCRIPTEN_EVENT_TOUCHMOVE) {
SDL_SendTouchMotion(deviceId, id, x, y, 1.0f); SDL_SendTouchMotion(deviceId, id, x, y, 1.0f);