Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-27 08:05:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Android: Improve multitouch with guncon

Browse source
This commit is contained in:
Connor McLaughlin 2021-06-02 02:45:57 +10:00
parent 98ae230d2d
commit 3cb4d8e35a
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
android/app/src/main/java/com/github/stenzek/duckstation/TouchscreenControllerView.java
View file

@ -46,6 +46,7 @@ public class TouchscreenControllerView extends FrameLayout {
private ArrayList<TouchscreenControllerAxisView> mAxisViews = new ArrayList<>(); private ArrayList<TouchscreenControllerAxisView> mAxisViews = new ArrayList<>();
private TouchscreenControllerDPadView mDPadView = null; private TouchscreenControllerDPadView mDPadView = null;
private int mPointerButtonCode = -1; private int mPointerButtonCode = -1;
private int mPointerPointerId = -1;
private boolean mHapticFeedback; private boolean mHapticFeedback;
private String mLayoutOrientation; private String mLayoutOrientation;
private EditMode mEditMode = EditMode.NONE; private EditMode mEditMode = EditMode.NONE;
@ -594,8 +595,9 @@ public class TouchscreenControllerView extends FrameLayout {
return false; return false;
Rect rect = new Rect(); Rect rect = new Rect();
final int actionMasked = event.getActionMasked();
final int pointerCount = event.getPointerCount(); final int pointerCount = event.getPointerCount();
final int liftedPointerIndex = (event.getActionMasked() == MotionEvent.ACTION_POINTER_UP) ? event.getActionIndex() : -1; final int liftedPointerIndex = (actionMasked == MotionEvent.ACTION_POINTER_UP) ? event.getActionIndex() : -1;
for (TouchscreenControllerButtonView buttonView : mButtonViews) { for (TouchscreenControllerButtonView buttonView : mButtonViews) {
if (buttonView.getVisibility() != VISIBLE) if (buttonView.getVisibility() != VISIBLE)
continue; continue;
@ -671,15 +673,26 @@ public class TouchscreenControllerView extends FrameLayout {
mDPadView.setUnpressed(); mDPadView.setUnpressed();
} }
if (mPointerButtonCode >= 0 && pointerCount > 0) { if (mPointerButtonCode >= 0) {
if (event.getActionMasked() == MotionEvent.ACTION_DOWN) { final int pointerIndex = event.getActionIndex();
final int pointerId = event.getPointerId(pointerIndex);
if (mPointerPointerId < 0 && (actionMasked == MotionEvent.ACTION_DOWN || actionMasked == MotionEvent.ACTION_POINTER_DOWN)) {
if (!mGlidePairs.containsKey(pointerId)) {
AndroidHostInterface.getInstance().setControllerButtonState(mControllerIndex, AndroidHostInterface.getInstance().setControllerButtonState(mControllerIndex,
mPointerButtonCode, true); mPointerButtonCode, true);
mPointerPointerId = pointerId;
}
} else if (actionMasked == MotionEvent.ACTION_POINTER_UP) {
if (pointerId == mPointerPointerId) {
AndroidHostInterface.getInstance().setControllerButtonState(mControllerIndex,
mPointerButtonCode, false);
mPointerPointerId = -1;
}
} }
AndroidHostInterface.getInstance().setMousePosition( AndroidHostInterface.getInstance().setMousePosition(
(int)event.getX(0), (int) event.getX(pointerIndex),
(int)event.getY(0)); (int) event.getY(pointerIndex));
} }
return true; return true;
@ -704,9 +717,10 @@ public class TouchscreenControllerView extends FrameLayout {
if (mDPadView != null) if (mDPadView != null)
mDPadView.setUnpressed(); mDPadView.setUnpressed();
if (mPointerButtonCode >= 0) { if (mPointerPointerId >= 0) {
AndroidHostInterface.getInstance().setControllerButtonState( AndroidHostInterface.getInstance().setControllerButtonState(
mControllerIndex, mPointerButtonCode, false); mControllerIndex, mPointerButtonCode, false);
mPointerPointerId = -1;
} }
return true; return true;