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

Changes to AndroidInput to properly handle multipoint touch events with proper ids (thanks to techsonic)

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9172 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
rem..om 2012-02-17 13:27:02 +00:00
parent a3497ca8b2
commit bb9b2ea5ce
1 changed files with 25 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,142 +220,70 @@ public class AndroidInput extends GLSurfaceView implements TouchInput,
boolean bWasHandled = false; boolean bWasHandled = false;
TouchEvent touch; TouchEvent touch;
// System.out.println("native : " + event.getAction()); // System.out.println("native : " + event.getAction());
int action = event.getAction() & MotionEvent.ACTION_MASK;
int pointerIndex = (event.getAction() & MotionEvent.ACTION_POINTER_INDEX_MASK)
>> MotionEvent.ACTION_POINTER_INDEX_SHIFT;
int pointerId = event.getPointerId(pointerIndex);
// final int historySize = event.getHistorySize();
//final int pointerCount = event.getPointerCount();
final int historySize = event.getHistorySize(); switch (action) {
final int pointerCount = event.getPointerCount();
case MotionEvent.ACTION_POINTER_DOWN:
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) {
// Process history
for (int h = 0; h < historySize; h++) {
// Convert all pointers into events
for (int p = 0; p < pointerCount; p++) {
touch = getNextFreeTouchEvent();
touch.set(Type.DOWN, event.getHistoricalX(p, h), this.getHeight() - event.getHistoricalY(p, h), 0, 0);
touch.setPointerId(event.getPointerId(p));
touch.setTime(event.getHistoricalEventTime(h));
touch.setPressure(event.getHistoricalPressure(p, h));
processEvent(touch);
}
}
}
// System.out.println("DOWN : " + pointerCount);
// only considering the primary pointer event. other pointers will have their own event
//for (int p = 0; p < pointerCount; p++) {
touch = getNextFreeTouchEvent(); touch = getNextFreeTouchEvent();
touch.set(Type.DOWN, event.getX(0), this.getHeight() - event.getY(0), 0, 0); touch.set(Type.DOWN, event.getX(pointerIndex), this.getHeight() - event.getY(pointerIndex), 0, 0);
touch.setPointerId(event.getPointerId(0)); touch.setPointerId(pointerId);
touch.setTime(event.getEventTime()); touch.setTime(event.getEventTime());
touch.setPressure(event.getPressure(0)); touch.setPressure(event.getPressure(pointerIndex));
processEvent(touch); processEvent(touch);
//}
bWasHandled = true; bWasHandled = true;
break; break;
case MotionEvent.ACTION_POINTER_1_UP: case MotionEvent.ACTION_POINTER_UP:
case MotionEvent.ACTION_POINTER_2_UP: case MotionEvent.ACTION_CANCEL:
case MotionEvent.ACTION_POINTER_3_UP:
case MotionEvent.ACTION_UP: case MotionEvent.ACTION_UP:
if (!dontSendHistory) {
// Process history
for (int h = 0; h < historySize; h++) {
// Convert all pointers into events
for (int p = 0; p < pointerCount; p++) {
touch = getNextFreeTouchEvent();
touch.set(Type.UP, event.getHistoricalX(p, h), this.getHeight() - event.getHistoricalY(p, h), 0, 0);
touch.setPointerId(event.getPointerId(p));
touch.setTime(event.getHistoricalEventTime(h));
touch.setPressure(event.getHistoricalPressure(p, h));
processEvent(touch);
}
}
}
// only considering the primary pointer event. other pointers will have their own event
//for (int p = 0; p < pointerCount; p++) {
touch = getNextFreeTouchEvent(); touch = getNextFreeTouchEvent();
touch.set(Type.UP, event.getX(0), this.getHeight() - event.getY(0), 0, 0); touch.set(Type.UP, event.getX(pointerIndex), this.getHeight() - event.getY(pointerIndex), 0, 0);
touch.setPointerId(event.getPointerId(0)); touch.setPointerId(pointerId);
touch.setTime(event.getEventTime()); touch.setTime(event.getEventTime());
touch.setPressure(event.getPressure(0)); touch.setPressure(event.getPressure(pointerIndex));
processEvent(touch); processEvent(touch);
//}
bWasHandled = true; bWasHandled = true;
break; break;
case MotionEvent.ACTION_MOVE: case MotionEvent.ACTION_MOVE:
if (!dontSendHistory) {
// Process history
for (int h = 0; h < historySize; h++) {
// Convert all pointers into events
for (int p = 0; p < pointerCount; p++) {
Vector2f lastPos = lastPositions.get(event.getPointerId(p));
if (lastPos == null) {
lastPos = new Vector2f(event.getHistoricalX(p, h), this.getHeight() - event.getHistoricalY(p, h));
lastPositions.put(event.getPointerId(p), lastPos);
}
touch = getNextFreeTouchEvent();
touch.set(Type.MOVE, event.getHistoricalX(p, h), this.getHeight() - event.getHistoricalY(p, h),
event.getHistoricalX(p, h) - lastPos.x, this.getHeight() - event.getHistoricalY(p, h) - lastPos.y);
touch.setPointerId(event.getPointerId(p));
touch.setTime(event.getHistoricalEventTime(h));
touch.setPressure(event.getHistoricalPressure(p, h));
processEvent(touch);
lastPos.set(event.getHistoricalX(p, h), this.getHeight() - event.getHistoricalY(p, h));
}
}
}
// 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(pointerIndex);
if (lastPos == null) { if (lastPos == null) {
lastPos = new Vector2f(event.getX(p), this.getHeight() - event.getY(p)); lastPos = new Vector2f(event.getX(pointerIndex), this.getHeight() - event.getY(pointerIndex));
lastPositions.put(event.getPointerId(p), lastPos); lastPositions.put(pointerId, lastPos);
} }
touch = getNextFreeTouchEvent(); touch = getNextFreeTouchEvent();
touch.set(Type.MOVE, event.getX(p), this.getHeight() - event.getY(p), event.getX(p) - lastPos.x, this.getHeight() - event.getY(p) - lastPos.y); touch.set(Type.MOVE, event.getX(pointerIndex), this.getHeight() - event.getY(pointerIndex), event.getX(pointerIndex) - lastPos.x, this.getHeight() - event.getY(pointerIndex) - lastPos.y);
touch.setPointerId(event.getPointerId(p)); touch.setPointerId(pointerId);
touch.setTime(event.getEventTime()); touch.setTime(event.getEventTime());
touch.setPressure(event.getPressure(p)); touch.setPressure(event.getPressure(pointerIndex));
processEvent(touch); processEvent(touch);
lastPos.set(event.getX(p), this.getHeight() - event.getY(p)); lastPos.set(event.getX(pointerIndex), this.getHeight() - event.getY(pointerIndex));
} }
bWasHandled = true; bWasHandled = true;
break; break;
// // TODO: implement motion events
// case MotionEvent.ACTION_POINTER_UP:
// break;
//
// case MotionEvent.ACTION_POINTER_DOWN:
// break;
case MotionEvent.ACTION_OUTSIDE: case MotionEvent.ACTION_OUTSIDE:
break; break;
case MotionEvent.ACTION_CANCEL:
break;
} }
// Try to detect gestures // Try to detect gestures