kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make all touch events use normalized (0-1) coordinates

Browse Source
This commit is contained in:
Joshua Granick
2015-08-12 10:58:02 -07:00
parent 6d2930b369
commit 603da175d2
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lime/_backend/flash/FlashApplication.hx
View File

@@ -241,8 +241,8 @@ class FlashApplication {
if (parent.window != null) { if (parent.window != null) {
var id = 0; var id = 0;
var x = event.stageX; var x = event.stageX / parent.window.width;
var y = event.stageY; var y = event.stageY / parent.window.height;
switch (event.type) { switch (event.type) {

3
lime/_backend/html5/HTML5Window.hx
View File

@@ -362,6 +362,9 @@ class HTML5Window {
} }
x = x / setWidth;
y = y / setHeight;
switch (event.type) { switch (event.type) {
case "touchstart": case "touchstart":

4
project/src/backend/sdl/SDLApplication.cpp
View File

@@ -347,10 +347,6 @@ namespace lime {
void SDLApplication::ProcessMouseEvent (SDL_Event* event) { void SDLApplication::ProcessMouseEvent (SDL_Event* event) {
#ifdef IPHONEOS
return;
#endif
if (MouseEvent::callback) { if (MouseEvent::callback) {
switch (event->type) { switch (event->type) {

12
templates/android/template/src/org/libsdl/app/SDLActivity.java
View File

@@ -1170,8 +1170,8 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
case MotionEvent.ACTION_MOVE: case MotionEvent.ACTION_MOVE:
for (i = 0; i < pointerCount; i++) { for (i = 0; i < pointerCount; i++) {
pointerFingerId = event.getPointerId(i); pointerFingerId = event.getPointerId(i);
x = event.getX(i); x = event.getX(i) / mWidth;
y = event.getY(i); y = event.getY(i) / mHeight;
p = event.getPressure(i); p = event.getPressure(i);
if (p > 1.0f) { if (p > 1.0f) {
// may be larger than 1.0f on some devices // may be larger than 1.0f on some devices
@@ -1194,8 +1194,8 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
} }
pointerFingerId = event.getPointerId(i); pointerFingerId = event.getPointerId(i);
x = event.getX(i); x = event.getX(i) / mWidth;
y = event.getY(i); y = event.getY(i) / mHeight;
p = event.getPressure(i); p = event.getPressure(i);
if (p > 1.0f) { if (p > 1.0f) {
// may be larger than 1.0f on some devices // may be larger than 1.0f on some devices
@@ -1208,8 +1208,8 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
case MotionEvent.ACTION_CANCEL: case MotionEvent.ACTION_CANCEL:
for (i = 0; i < pointerCount; i++) { for (i = 0; i < pointerCount; i++) {
pointerFingerId = event.getPointerId(i); pointerFingerId = event.getPointerId(i);
x = event.getX(i); x = event.getX(i) / mWidth;
y = event.getY(i); y = event.getY(i) / mHeight;
p = event.getPressure(i); p = event.getPressure(i);
if (p > 1.0f) { if (p > 1.0f) {
// may be larger than 1.0f on some devices // may be larger than 1.0f on some devices