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

The controller now uses a pointer image that isn't linked to the touchpad pointer

Browse Source
This commit is contained in:
SerpentSpirale 2021-05-27 17:59:16 +02:00 committed by SerpentSpirale
parent 45d2a26c51
commit 1b605d0548
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,10 +4,11 @@ import android.view.InputDevice;
import android.view.InputEvent; import android.view.InputEvent;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.widget.ImageView;
import net.kdt.pojavlaunch.BaseMainActivity; import net.kdt.pojavlaunch.BaseMainActivity;
import net.kdt.pojavlaunch.LWJGLGLFWKeycode; import net.kdt.pojavlaunch.LWJGLGLFWKeycode;
import net.kdt.pojavlaunch.Tools; import net.kdt.pojavlaunch.R;
import org.lwjgl.glfw.CallbackBridge; import org.lwjgl.glfw.CallbackBridge;
@ -24,7 +25,7 @@ import static net.kdt.pojavlaunch.customcontrols.gamepad.GamepadJoystick.DIRECTI
public class Gamepad { public class Gamepad {
private BaseMainActivity gameActivity; private BaseMainActivity gameActivity;
private ImageView pointerView;
private GamepadDpad gamepadDpad = new GamepadDpad(); private GamepadDpad gamepadDpad = new GamepadDpad();
@ -57,6 +58,7 @@ public class Gamepad {
this.gameActivity = gameActivity; this.gameActivity = gameActivity;
pointerView = this.gameActivity.findViewById(R.id.console_pointer);
createMapping(); createMapping();
mouseThread = new Thread("Gamepad Thread"){ mouseThread = new Thread("Gamepad Thread"){
@ -97,16 +99,15 @@ public class Gamepad {
acceleration = (mouseMagnitude - currentJoystick.getDeadzone())/(1 - currentJoystick.getDeadzone()); acceleration = (mouseMagnitude - currentJoystick.getDeadzone())/(1 - currentJoystick.getDeadzone());
acceleration = Math.pow(acceleration, mouseMaxAcceleration); acceleration = Math.pow(acceleration, mouseMaxAcceleration);
if(acceleration > 1){ if(acceleration > 1) acceleration = 1;
acceleration = 1;
}
gameActivity.mouse_x += Math.cos(mouseAngle) * acceleration * mouseSensitivity; gameActivity.mouse_x += Math.cos(mouseAngle) * acceleration * mouseSensitivity;
gameActivity.mouse_y -= Math.sin(mouseAngle) * acceleration * mouseSensitivity; gameActivity.mouse_y -= Math.sin(mouseAngle) * acceleration * mouseSensitivity;
CallbackBridge.sendCursorPos(gameActivity.mouse_x, gameActivity.mouse_y); CallbackBridge.sendCursorPos(gameActivity.mouse_x, gameActivity.mouse_y);
if(!isGrabbing){ if(!isGrabbing){
gameActivity.placeMouseAt(gameActivity.mouse_x / gameActivity.scaleFactor, gameActivity.mouse_y / gameActivity.scaleFactor); placePointerView((int)(gameActivity.mouse_x / gameActivity.scaleFactor), (int) (gameActivity.mouse_y / gameActivity.scaleFactor));
} }
} }
@ -133,7 +134,7 @@ public class Gamepad {
gameActivity.mouse_x = CallbackBridge.windowWidth/2; gameActivity.mouse_x = CallbackBridge.windowWidth/2;
gameActivity.mouse_y = CallbackBridge.windowHeight/2; gameActivity.mouse_y = CallbackBridge.windowHeight/2;
CallbackBridge.sendCursorPos(gameActivity.mouse_x, gameActivity.mouse_y); CallbackBridge.sendCursorPos(gameActivity.mouse_x, gameActivity.mouse_y);
gameActivity.placeMouseAt(CallbackBridge.physicalWidth/2, CallbackBridge.physicalHeight/2); placePointerView(CallbackBridge.physicalWidth/2, CallbackBridge.physicalHeight/2);
} }
} }
@ -288,6 +289,10 @@ public class Gamepad {
} }
} }
private void placePointerView(int x, int y){
pointerView.setTranslationX(x-32);
pointerView.setTranslationY(y-32);
}
private void sendButton(KeyEvent event){ private void sendButton(KeyEvent event){
int keycode = event.getKeyCode(); int keycode = event.getKeyCode();