sigonasr2
/
jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

AndroidInput now correctly handles mutiple pointers touch events

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9001 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
3.0
rem..om 13 years ago
parent 5a5f321304
commit 1547500b5a
1 changed files with 50 additions and 31 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 81
      engine/src/android/com/jme3/input/android/AndroidInput.java

81
engine/src/android/com/jme3/input/android/AndroidInput.java
Unescape View File

@ -147,14 +147,14 @@ public class AndroidInput extends GLSurfaceView implements TouchInput,
public AndroidInput(Context ctx, AttributeSet attribs) { public AndroidInput(Context ctx, AttributeSet attribs) {
super(ctx, attribs); super(ctx, attribs);
detector = new GestureDetector(this); detector = new GestureDetector(null, this, null, false);
scaledetector = new ScaleGestureDetector(ctx, this); scaledetector = new ScaleGestureDetector(ctx, this);
} }
public AndroidInput(Context ctx) { public AndroidInput(Context ctx) {
super(ctx); super(ctx);
detector = new GestureDetector(this); detector = new GestureDetector(null, this, null, false);
scaledetector = new ScaleGestureDetector(ctx, this); scaledetector = new ScaleGestureDetector(ctx, this);
} }
@ -219,15 +219,18 @@ public class AndroidInput extends GLSurfaceView implements TouchInput,
public boolean onTouchEvent(MotionEvent event) { public boolean onTouchEvent(MotionEvent event) {
boolean bWasHandled = false; boolean bWasHandled = false;
TouchEvent touch; TouchEvent touch;
// System.out.println("native : " + event.getAction());
// Try to detect gestures
this.detector.onTouchEvent(event);
this.scaledetector.onTouchEvent(event);
final int historySize = event.getHistorySize(); final int historySize = event.getHistorySize();
final int pointerCount = event.getPointerCount(); final int pointerCount = event.getPointerCount();
switch (event.getAction()) { switch (event.getAction()) {
case MotionEvent.ACTION_POINTER_1_DOWN:
case MotionEvent.ACTION_POINTER_2_DOWN:
case MotionEvent.ACTION_POINTER_3_DOWN:
case MotionEvent.ACTION_DOWN: case MotionEvent.ACTION_DOWN:
if (!dontSendHistory) { if (!dontSendHistory) {
@ -245,19 +248,25 @@ public class AndroidInput extends GLSurfaceView implements TouchInput,
} }
} }
// Convert all pointers into events
for (int p = 0; p < pointerCount; p++) { // System.out.println("DOWN : " + pointerCount);
touch = getNextFreeTouchEvent();
touch.set(Type.DOWN, event.getX(p), this.getHeight() - event.getY(p), 0, 0); // only considering the primary pointer event. other pointers will have their own event
touch.setPointerId(event.getPointerId(p)); //for (int p = 0; p < pointerCount; p++) {
touch.setTime(event.getEventTime()); touch = getNextFreeTouchEvent();
touch.setPressure(event.getPressure(p)); touch.set(Type.DOWN, event.getX(0), this.getHeight() - event.getY(0), 0, 0);
processEvent(touch); touch.setPointerId(event.getPointerId(0));
} touch.setTime(event.getEventTime());
touch.setPressure(event.getPressure(0));
processEvent(touch);
//}
bWasHandled = true; bWasHandled = true;
break; break;
case MotionEvent.ACTION_POINTER_1_UP:
case MotionEvent.ACTION_POINTER_2_UP:
case MotionEvent.ACTION_POINTER_3_UP:
case MotionEvent.ACTION_UP: case MotionEvent.ACTION_UP:
if (!dontSendHistory) { if (!dontSendHistory) {
@ -276,15 +285,16 @@ public class AndroidInput extends GLSurfaceView implements TouchInput,
} }
} }
// Convert all pointers into events
for (int p = 0; p < pointerCount; p++) { // only considering the primary pointer event. other pointers will have their own event
touch = getNextFreeTouchEvent(); //for (int p = 0; p < pointerCount; p++) {
touch.set(Type.UP, event.getX(p), this.getHeight() - event.getY(p), 0, 0); touch = getNextFreeTouchEvent();
touch.setPointerId(event.getPointerId(p)); touch.set(Type.UP, event.getX(0), this.getHeight() - event.getY(0), 0, 0);
touch.setTime(event.getEventTime()); touch.setPointerId(event.getPointerId(0));
touch.setPressure(event.getPressure(p)); touch.setTime(event.getEventTime());
processEvent(touch); touch.setPressure(event.getPressure(0));
} processEvent(touch);
//}
bWasHandled = true; bWasHandled = true;
break; break;
@ -313,7 +323,9 @@ public class AndroidInput extends GLSurfaceView implements TouchInput,
} }
} }
// if (event.getPointerCount() > 1) {
// System.out.println("MOVE : " + event.getPointerCount());
// }
// Convert all pointers into events // Convert all pointers into events
for (int p = 0; p < event.getPointerCount(); p++) { for (int p = 0; p < event.getPointerCount(); p++) {
Vector2f lastPos = lastPositions.get(event.getPointerId(p)); Vector2f lastPos = lastPositions.get(event.getPointerId(p));
@ -332,12 +344,12 @@ public class AndroidInput extends GLSurfaceView implements TouchInput,
bWasHandled = true; bWasHandled = true;
break; break;
// TODO: implement motion events // // TODO: implement motion events
case MotionEvent.ACTION_POINTER_UP: // case MotionEvent.ACTION_POINTER_UP:
break; // break;
//
case MotionEvent.ACTION_POINTER_DOWN: // case MotionEvent.ACTION_POINTER_DOWN:
break; // break;
case MotionEvent.ACTION_OUTSIDE: case MotionEvent.ACTION_OUTSIDE:
break; break;
@ -345,6 +357,11 @@ public class AndroidInput extends GLSurfaceView implements TouchInput,
case MotionEvent.ACTION_CANCEL: case MotionEvent.ACTION_CANCEL:
break; break;
} }
// Try to detect gestures
this.detector.onTouchEvent(event);
this.scaledetector.onTouchEvent(event);
return bWasHandled; return bWasHandled;
} }
@ -551,7 +568,6 @@ public class AndroidInput extends GLSurfaceView implements TouchInput,
return true; return true;
} }
public boolean onSingleTapConfirmed(MotionEvent event) { public boolean onSingleTapConfirmed(MotionEvent event) {
//Nothing to do here the tap has already been detected. //Nothing to do here the tap has already been detected.
return false; return false;
@ -578,6 +594,7 @@ public class AndroidInput extends GLSurfaceView implements TouchInput,
touch.setScaleSpan(scaleGestureDetector.getCurrentSpan()); touch.setScaleSpan(scaleGestureDetector.getCurrentSpan());
touch.setScaleFactor(scaleGestureDetector.getScaleFactor()); touch.setScaleFactor(scaleGestureDetector.getScaleFactor());
processEvent(touch); processEvent(touch);
// System.out.println("scaleBegin");
return true; return true;
} }
@ -590,6 +607,7 @@ public class AndroidInput extends GLSurfaceView implements TouchInput,
touch.setScaleSpan(scaleGestureDetector.getCurrentSpan()); touch.setScaleSpan(scaleGestureDetector.getCurrentSpan());
touch.setScaleFactor(scaleGestureDetector.getScaleFactor()); touch.setScaleFactor(scaleGestureDetector.getScaleFactor());
processEvent(touch); processEvent(touch);
// System.out.println("scale");
return false; return false;
} }
@ -610,6 +628,7 @@ public class AndroidInput extends GLSurfaceView implements TouchInput,
touch.setPointerId(0); touch.setPointerId(0);
touch.setTime(e1.getEventTime()); touch.setTime(e1.getEventTime());
processEvent(touch); processEvent(touch);
//System.out.println("scroll " + e1.getPointerCount());
return false; return false;
} }

Write Preview
Loading…
Cancel
Save