TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-17 00:29:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

light optimisation of motion events on Gamepad.java

Browse Source
This commit is contained in:
SerpentSpirale 2021-07-16 18:49:44 +02:00
parent 905f05605b
commit 17ab69dfad
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/Gamepad.java
View File

@ -5,6 +5,7 @@ import android.view.KeyEvent;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.Toast;
import net.kdt.pojavlaunch.BaseMainActivity; import net.kdt.pojavlaunch.BaseMainActivity;
import net.kdt.pojavlaunch.LWJGLGLFWKeycode; import net.kdt.pojavlaunch.LWJGLGLFWKeycode;
@ -50,6 +51,7 @@ public class Gamepad {
private GamepadMap currentMap = gameMap; private GamepadMap currentMap = gameMap;
private boolean lastGrabbingState = true; private boolean lastGrabbingState = true;
private MotionEvent lastMotionEvent = null;
private final Thread mouseThread; private final Thread mouseThread;
@ -57,6 +59,8 @@ public class Gamepad {
private final Runnable switchStateRunnable; private final Runnable switchStateRunnable;
public Gamepad(BaseMainActivity gameActivity, InputDevice inputDevice){ public Gamepad(BaseMainActivity gameActivity, InputDevice inputDevice){
Toast.makeText(gameActivity.getApplicationContext(),"GAMEPAD CREATED", Toast.LENGTH_LONG).show();
leftJoystick = new GamepadJoystick(MotionEvent.AXIS_X, MotionEvent.AXIS_Y, inputDevice); leftJoystick = new GamepadJoystick(MotionEvent.AXIS_X, MotionEvent.AXIS_Y, inputDevice);
rightJoystick = new GamepadJoystick(MotionEvent.AXIS_Z, MotionEvent.AXIS_RZ, inputDevice); rightJoystick = new GamepadJoystick(MotionEvent.AXIS_Z, MotionEvent.AXIS_RZ, inputDevice);
@ -99,6 +103,12 @@ public class Gamepad {
} }
private void tick(){ private void tick(){
if(lastMotionEvent != null){
updateDirectionalJoystick(lastMotionEvent);
updateMouseJoystick(lastMotionEvent);
updateAnalogTriggers(lastMotionEvent);
}
if(lastHorizontalValue != 0 || lastVerticalValue != 0){ if(lastHorizontalValue != 0 || lastVerticalValue != 0){
GamepadJoystick currentJoystick = CallbackBridge.isGrabbing() ? leftJoystick : rightJoystick; GamepadJoystick currentJoystick = CallbackBridge.isGrabbing() ? leftJoystick : rightJoystick;
@ -227,10 +237,9 @@ public class Gamepad {
} }
public void update(MotionEvent event){ public void update(MotionEvent event){
gamepadDpad.update(event); lastMotionEvent = event;
updateDirectionalJoystick(event); if(gamepadDpad.update(event) != -1) return;
updateMouseJoystick(event); //The rest of events are now sent each 1/60 second.
updateAnalogTriggers(event);
} }
private void updateMouseJoystick(MotionEvent event){ private void updateMouseJoystick(MotionEvent event){
@ -388,12 +397,12 @@ public class Gamepad {
break; break;
case LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT: case LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT:
CallbackBridge.putMouseEventWithCoords(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT, isDown?1:0, CallbackBridge.mouseX, CallbackBridge.mouseY); //CallbackBridge.putMouseEventWithCoords(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT, isDown?1:0, CallbackBridge.mouseX, CallbackBridge.mouseY);
//MainActivity.sendMouseButton(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT, isDown); MainActivity.sendMouseButton(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT, isDown);
break; break;
case LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_LEFT: case LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_LEFT:
CallbackBridge.putMouseEventWithCoords(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_LEFT, isDown?1:0, CallbackBridge.mouseX, CallbackBridge.mouseY); //CallbackBridge.putMouseEventWithCoords(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_LEFT, isDown?1:0, CallbackBridge.mouseX, CallbackBridge.mouseY);
//MainActivity.sendMouseButton(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_LEFT, isDown); MainActivity.sendMouseButton(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_LEFT, isDown);
break; break;
@ -410,7 +419,6 @@ public class Gamepad {
} }
public static boolean isGamepadEvent(KeyEvent event){ public static boolean isGamepadEvent(KeyEvent event){
//return false;
return ((event.getSource() & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD return ((event.getSource() & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD