Make all touch events use normalized (0-1) coordinates
This commit is contained in:
@@ -241,8 +241,8 @@ class FlashApplication {
|
||||
if (parent.window != null) {
|
||||
|
||||
var id = 0;
|
||||
var x = event.stageX;
|
||||
var y = event.stageY;
|
||||
var x = event.stageX / parent.window.width;
|
||||
var y = event.stageY / parent.window.height;
|
||||
|
||||
switch (event.type) {
|
||||
|
||||
|
||||
@@ -362,6 +362,9 @@ class HTML5Window {
|
||||
|
||||
}
|
||||
|
||||
x = x / setWidth;
|
||||
y = y / setHeight;
|
||||
|
||||
switch (event.type) {
|
||||
|
||||
case "touchstart":
|
||||
|
||||
@@ -347,10 +347,6 @@ namespace lime {
|
||||
|
||||
void SDLApplication::ProcessMouseEvent (SDL_Event* event) {
|
||||
|
||||
#ifdef IPHONEOS
|
||||
return;
|
||||
#endif
|
||||
|
||||
if (MouseEvent::callback) {
|
||||
|
||||
switch (event->type) {
|
||||
|
||||
@@ -1170,8 +1170,8 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
|
||||
case MotionEvent.ACTION_MOVE:
|
||||
for (i = 0; i < pointerCount; i++) {
|
||||
pointerFingerId = event.getPointerId(i);
|
||||
x = event.getX(i);
|
||||
y = event.getY(i);
|
||||
x = event.getX(i) / mWidth;
|
||||
y = event.getY(i) / mHeight;
|
||||
p = event.getPressure(i);
|
||||
if (p > 1.0f) {
|
||||
// may be larger than 1.0f on some devices
|
||||
@@ -1194,8 +1194,8 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
|
||||
}
|
||||
|
||||
pointerFingerId = event.getPointerId(i);
|
||||
x = event.getX(i);
|
||||
y = event.getY(i);
|
||||
x = event.getX(i) / mWidth;
|
||||
y = event.getY(i) / mHeight;
|
||||
p = event.getPressure(i);
|
||||
if (p > 1.0f) {
|
||||
// may be larger than 1.0f on some devices
|
||||
@@ -1208,8 +1208,8 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
|
||||
case MotionEvent.ACTION_CANCEL:
|
||||
for (i = 0; i < pointerCount; i++) {
|
||||
pointerFingerId = event.getPointerId(i);
|
||||
x = event.getX(i);
|
||||
y = event.getY(i);
|
||||
x = event.getX(i) / mWidth;
|
||||
y = event.getY(i) / mHeight;
|
||||
p = event.getPressure(i);
|
||||
if (p > 1.0f) {
|
||||
// may be larger than 1.0f on some devices
|
||||
|
||||
Reference in New Issue
Block a user