vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update touch code

Browse source
This commit is contained in:
mittorn 2016-05-04 21:34:15 +00:00
parent cd81aa82ea
commit e33ceda57a
1 changed files with 42 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/in/celest/xash3d/XashActivity.java
View file

@ -501,28 +501,54 @@ View.OnKeyListener, View.OnTouchListener {
// Touch events // Touch events
public boolean onTouch(View v, MotionEvent event) { public boolean onTouch(View v, MotionEvent event) {
final int touchDevId = event.getDeviceId(); /* Ref: http://developer.android.com/training/gestures/multi.html */
final int pointerCount = event.getPointerCount();
// touchId, pointerId, action, x, y, pressure
int actionPointerIndex = event.getActionIndex();
int pointerFingerId = event.getPointerId(actionPointerIndex);
int action = event.getActionMasked();
float x = event.getX(actionPointerIndex); final int touchDevId = event.getDeviceId();
float y = event.getY(actionPointerIndex); final int pointerCount = event.getPointerCount();
int action = event.getActionMasked();
int pointerFingerId;
int mouseButton;
int i = -1;
float x,y;
switch(action) {
case MotionEvent.ACTION_MOVE:
for (i = 0; i < pointerCount; i++) {
pointerFingerId = event.getPointerId(i);
x = event.getX(i);
y = event.getY(i);
XashActivity.nativeTouch(pointerFingerId, action, x, y);
}
break;
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_DOWN:
// Primary pointer up/down, the index is always zero
i = 0;
case MotionEvent.ACTION_POINTER_UP:
case MotionEvent.ACTION_POINTER_DOWN:
// Non primary pointer up/down
if (i == -1) {
i = event.getActionIndex();
}
if (action == MotionEvent.ACTION_MOVE && pointerCount > 1) {
// TODO send motion to every pointer if its position has
// changed since prev event.
for (int i = 0; i < pointerCount; i++) {
pointerFingerId = event.getPointerId(i); pointerFingerId = event.getPointerId(i);
x = event.getX(i); x = event.getX(i);
y = event.getY(i); y = event.getY(i);
XashActivity.nativeTouch(pointerFingerId, action, x, y); XashActivity.nativeTouch(pointerFingerId, action, x, y);
} break;
} else {
XashActivity.nativeTouch(pointerFingerId, action, x, y); case MotionEvent.ACTION_CANCEL:
} for (i = 0; i < pointerCount; i++) {
pointerFingerId = event.getPointerId(i);
x = event.getX(i);
y = event.getY(i);
XashActivity.nativeTouch(pointerFingerId, action, x, y);
}
break;
default:
break;
}
return true; return true;
} }