Skip to content

Commit 21cfcdb

Browse files
artdeellartdeell
authored
Feat[input]: GLFW direct controller input (#6604)
1 parent ffc74c5 commit 21cfcdb

File tree

21 files changed

+308
-39
lines changed

21 files changed

+308
-39
lines changed

‎app_pojavlauncher/src/main/assets/components/arc_dns_injector/arc_dns_injector.jar

0 Bytes
Binary file not shown.

‎app_pojavlauncher/src/main/assets/components/arc_dns_injector/version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1687691695196
1+
1738839797928

‎app_pojavlauncher/src/main/assets/components/forge_installer/forge_installer.jar

1 Byte
Binary file not shown.

‎app_pojavlauncher/src/main/assets/components/forge_installer/version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1692525087345
1+
1738839797913

‎app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar

1.9 KB
Binary file not shown.

‎app_pojavlauncher/src/main/assets/components/lwjgl3/version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1732218529630
1+
1738839797921

‎app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MinecraftGLSurface.java

+26-7
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
import net.kdt.pojavlaunch.customcontrols.ControlLayout;
3030
import net.kdt.pojavlaunch.customcontrols.gamepad.DefaultDataProvider;
3131
import net.kdt.pojavlaunch.customcontrols.gamepad.Gamepad;
32+
import net.kdt.pojavlaunch.customcontrols.gamepad.direct.DirectGamepad;
33+
import net.kdt.pojavlaunch.customcontrols.gamepad.direct.DirectGamepadEnableHandler;
3234
import net.kdt.pojavlaunch.customcontrols.mouse.AbstractTouchpad;
3335
import net.kdt.pojavlaunch.customcontrols.mouse.AndroidPointerCapture;
3436
import net.kdt.pojavlaunch.customcontrols.mouse.InGUIEventProcessor;
@@ -40,15 +42,16 @@
4042

4143
import org.lwjgl.glfw.CallbackBridge;
4244

45+
import fr.spse.gamepad_remapper.GamepadHandler;
4346
import fr.spse.gamepad_remapper.RemapperManager;
4447
import fr.spse.gamepad_remapper.RemapperView;
4548

4649
/**
4750
* Class dealing with showing minecraft surface and taking inputs to dispatch them to minecraft
4851
*/
49-
public class MinecraftGLSurface extends View implements GrabListener {
52+
public class MinecraftGLSurface extends View implements GrabListener, DirectGamepadEnableHandler {
5053
/* Gamepad object for gamepad inputs, instantiated on need */
51-
private Gamepad mGamepad = null;
54+
private GamepadHandler mGamepadHandler;
5255
/* The RemapperView.Builder object allows you to set which buttons to remap */
5356
private final RemapperManager mInputManager = new RemapperManager(getContext(), new RemapperView.Builder(null)
5457
.remapA(true)
@@ -88,6 +91,7 @@ public MinecraftGLSurface(Context context) {
8891
public MinecraftGLSurface(Context context, AttributeSet attributeSet) {
8992
super(context, attributeSet);
9093
setFocusable(true);
94+
CallbackBridge.setDirectGamepadEnableHandler(this);
9195
}
9296

9397
@RequiresApi(api = Build.VERSION_CODES.O)
@@ -203,7 +207,11 @@ public boolean onTouchEvent(MotionEvent e) {
203207
}
204208

205209
private void createGamepad(View contextView, InputDevice inputDevice) {
206-
mGamepad = new Gamepad(contextView, inputDevice, DefaultDataProvider.INSTANCE, true);
210+
if(CallbackBridge.sGamepadDirectInput) {
211+
mGamepadHandler = new DirectGamepad();
212+
}else {
213+
mGamepadHandler = new Gamepad(contextView, inputDevice, DefaultDataProvider.INSTANCE, true);
214+
}
207215
}
208216

209217
/**
@@ -215,9 +223,9 @@ public boolean dispatchGenericMotionEvent(MotionEvent event) {
215223
int mouseCursorIndex = -1;
216224

217225
if(Gamepad.isGamepadEvent(event)){
218-
if(mGamepad == null) createGamepad(this, event.getDevice());
226+
if(mGamepadHandler == null) createGamepad(this, event.getDevice());
219227

220-
mInputManager.handleMotionEventInput(getContext(), event, mGamepad);
228+
mInputManager.handleMotionEventInput(getContext(), event, mGamepadHandler);
221229
return true;
222230
}
223231

@@ -287,9 +295,9 @@ public boolean processKeyEvent(KeyEvent event) {
287295
}
288296

289297
if(Gamepad.isGamepadEvent(event)){
290-
if(mGamepad == null) createGamepad(this, event.getDevice());
298+
if(mGamepadHandler == null) createGamepad(this, event.getDevice());
291299

292-
mInputManager.handleKeyEventInput(getContext(), event, mGamepad);
300+
mInputManager.handleKeyEventInput(getContext(), event, mGamepadHandler);
293301
return true;
294302
}
295303

@@ -411,6 +419,17 @@ private void updateGrabState(boolean isGrabbing) {
411419
}
412420
}
413421

422+
@Override
423+
public void onDirectGamepadEnabled() {
424+
post(()->{
425+
if(mGamepadHandler != null && mGamepadHandler instanceof Gamepad) {
426+
((Gamepad)mGamepadHandler).removeSelf();
427+
}
428+
// Force gamepad recreation on next event
429+
mGamepadHandler = null;
430+
});
431+
}
432+
414433
/** A small interface called when the listener is ready for the first time */
415434
public interface SurfaceReadyListener {
416435
void isReady();

‎app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/DefaultDataProvider.java

+5
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,9 @@ public boolean isGrabbing() {
3030
public void attachGrabListener(GrabListener grabListener) {
3131
CallbackBridge.addGrabListener(grabListener);
3232
}
33+
34+
@Override
35+
public void detachGrabListener(GrabListener grabListener) {
36+
CallbackBridge.removeGrabListener(grabListener);
37+
}
3338
}

‎app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/Gamepad.java

+14-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import net.kdt.pojavlaunch.GrabListener;
2727
import net.kdt.pojavlaunch.LwjglGlfwKeycode;
2828
import net.kdt.pojavlaunch.R;
29-
import net.kdt.pojavlaunch.prefs.LauncherPreferences;
3029
import net.kdt.pojavlaunch.utils.MCOptionUtils;
3130

3231
import org.lwjgl.glfw.CallbackBridge;
@@ -88,6 +87,8 @@ public class Gamepad implements GrabListener, GamepadHandler {
8887

8988
private final GamepadDataProvider mMapProvider;
9089

90+
private boolean mRemoved = false;
91+
9192
public Gamepad(View contextView, InputDevice inputDevice, GamepadDataProvider mapProvider, boolean showCursor){
9293
Settings.setDeadzoneScale(PREF_DEADZONE_SCALE);
9394

@@ -96,7 +97,7 @@ public Gamepad(View contextView, InputDevice inputDevice, GamepadDataProvider ma
9697
@Override
9798
public void doFrame(long frameTimeNanos) {
9899
tick(frameTimeNanos);
99-
mScreenChoreographer.postFrameCallback(this);
100+
if(!mRemoved) mScreenChoreographer.postFrameCallback(this);
100101
}
101102
};
102103
mScreenChoreographer.postFrameCallback(frameCallback);
@@ -453,4 +454,15 @@ public void handleGamepadInput(int keycode, float value) {
453454
break;
454455
}
455456
}
457+
458+
/**
459+
* Stops the Gamepad and removes all traces of the Gamepad from the view hierarchy.
460+
* After this call, the Gamepad is not recoverable and a new one must be made.
461+
*/
462+
public void removeSelf() {
463+
mRemoved = true;
464+
mMapProvider.detachGrabListener(this);
465+
ViewGroup viewGroup = (ViewGroup) mPointerImageView.getParent();
466+
if(viewGroup != null) viewGroup.removeView(mPointerImageView);
467+
}
456468
}

‎app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadDataProvider.java

+1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ public interface GamepadDataProvider {
77
GamepadMap getGameMap();
88
boolean isGrabbing();
99
void attachGrabListener(GrabListener grabListener);
10+
void detachGrabListener(GrabListener grabListener);
1011
}

‎app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadMapperAdapter.java

+5
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,11 @@ public void attachGrabListener(GrabListener grabListener) {
325325
grabListener.onGrabState(mGrabState);
326326
}
327327

328+
@Override
329+
public void detachGrabListener(GrabListener grabListener) {
330+
mGamepadGrabListener = null;
331+
}
332+
328333
public void setGrabState(boolean newState) {
329334
mGrabState = newState;
330335
if(mGamepadGrabListener != null) mGamepadGrabListener.onGrabState(newState);

‎app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/direct/DirectGamepad.java

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
package net.kdt.pojavlaunch.customcontrols.gamepad.direct;
2+
3+
import static org.lwjgl.glfw.CallbackBridge.sGamepadAxisBuffer;
4+
import static org.lwjgl.glfw.CallbackBridge.sGamepadButtonBuffer;
5+
6+
import android.view.KeyEvent;
7+
import android.view.MotionEvent;
8+
9+
import fr.spse.gamepad_remapper.GamepadHandler;
10+
11+
public class DirectGamepad implements GamepadHandler {
12+
@Override
13+
public void handleGamepadInput(int keycode, float value) {
14+
int gKeycode = -1, gAxis = -1;
15+
switch (keycode) {
16+
case KeyEvent.KEYCODE_BUTTON_A: gKeycode = GamepadKeycodes.GLFW_GAMEPAD_BUTTON_A; break;
17+
case KeyEvent.KEYCODE_BUTTON_B: gKeycode = GamepadKeycodes.GLFW_GAMEPAD_BUTTON_B; break;
18+
case KeyEvent.KEYCODE_BUTTON_X: gKeycode = GamepadKeycodes.GLFW_GAMEPAD_BUTTON_X; break;
19+
case KeyEvent.KEYCODE_BUTTON_Y: gKeycode = GamepadKeycodes.GLFW_GAMEPAD_BUTTON_Y; break;
20+
case KeyEvent.KEYCODE_BUTTON_L1: gKeycode = GamepadKeycodes.GLFW_GAMEPAD_BUTTON_LEFT_BUMPER; break;
21+
case KeyEvent.KEYCODE_BUTTON_R1: gKeycode = GamepadKeycodes.GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER; break;
22+
case KeyEvent.KEYCODE_BUTTON_L2:
23+
case MotionEvent.AXIS_LTRIGGER:
24+
gAxis = GamepadKeycodes.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER;
25+
break;
26+
case KeyEvent.KEYCODE_BUTTON_R2:
27+
case MotionEvent.AXIS_RTRIGGER:
28+
gAxis = GamepadKeycodes.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER;
29+
break;
30+
case KeyEvent.KEYCODE_BUTTON_THUMBL: gKeycode = GamepadKeycodes.GLFW_GAMEPAD_BUTTON_LEFT_THUMB; break;
31+
case KeyEvent.KEYCODE_BUTTON_THUMBR: gKeycode = GamepadKeycodes.GLFW_GAMEPAD_BUTTON_RIGHT_THUMB; break;
32+
case KeyEvent.KEYCODE_BUTTON_START: gKeycode = GamepadKeycodes.GLFW_GAMEPAD_BUTTON_START; break;
33+
case KeyEvent.KEYCODE_BUTTON_SELECT: gKeycode = GamepadKeycodes.GLFW_GAMEPAD_BUTTON_BACK; break;
34+
case KeyEvent.KEYCODE_DPAD_UP: gKeycode = GamepadKeycodes.GLFW_GAMEPAD_BUTTON_DPAD_UP; break;
35+
case KeyEvent.KEYCODE_DPAD_DOWN: gKeycode = GamepadKeycodes.GLFW_GAMEPAD_BUTTON_DPAD_DOWN; break;
36+
case KeyEvent.KEYCODE_DPAD_LEFT: gKeycode = GamepadKeycodes.GLFW_GAMEPAD_BUTTON_DPAD_LEFT; break;
37+
case KeyEvent.KEYCODE_DPAD_RIGHT: gKeycode = GamepadKeycodes.GLFW_GAMEPAD_BUTTON_DPAD_RIGHT; break;
38+
case KeyEvent.KEYCODE_DPAD_CENTER:
39+
// Behave the same way as the Gamepad here, as GLFW doesn't have a keycode
40+
// for the dpad center.
41+
sGamepadButtonBuffer.put(GamepadKeycodes.GLFW_GAMEPAD_BUTTON_DPAD_UP, GamepadKeycodes.GLFW_RELEASE);
42+
sGamepadButtonBuffer.put(GamepadKeycodes.GLFW_GAMEPAD_BUTTON_DPAD_DOWN, GamepadKeycodes.GLFW_RELEASE);
43+
sGamepadButtonBuffer.put(GamepadKeycodes.GLFW_GAMEPAD_BUTTON_DPAD_LEFT, GamepadKeycodes.GLFW_RELEASE);
44+
sGamepadButtonBuffer.put(GamepadKeycodes.GLFW_GAMEPAD_BUTTON_DPAD_RIGHT, GamepadKeycodes.GLFW_RELEASE);
45+
return;
46+
case MotionEvent.AXIS_X: gAxis = GamepadKeycodes.GLFW_GAMEPAD_AXIS_LEFT_X; break;
47+
case MotionEvent.AXIS_Y: gAxis = GamepadKeycodes.GLFW_GAMEPAD_AXIS_LEFT_Y; break;
48+
case MotionEvent.AXIS_Z: gAxis = GamepadKeycodes.GLFW_GAMEPAD_AXIS_RIGHT_X; break;
49+
case MotionEvent.AXIS_RZ: gAxis = GamepadKeycodes.GLFW_GAMEPAD_AXIS_RIGHT_Y; break;
50+
case MotionEvent.AXIS_HAT_X:
51+
sGamepadButtonBuffer.put(
52+
GamepadKeycodes.GLFW_GAMEPAD_BUTTON_DPAD_LEFT,
53+
value < -0.85 ? GamepadKeycodes.GLFW_PRESS : GamepadKeycodes.GLFW_RELEASE
54+
);
55+
sGamepadButtonBuffer.put(
56+
GamepadKeycodes.GLFW_GAMEPAD_BUTTON_DPAD_RIGHT,
57+
value > 0.85 ? GamepadKeycodes.GLFW_PRESS : GamepadKeycodes.GLFW_RELEASE
58+
);
59+
return;
60+
case MotionEvent.AXIS_HAT_Y:
61+
sGamepadButtonBuffer.put(
62+
GamepadKeycodes.GLFW_GAMEPAD_BUTTON_DPAD_UP,
63+
value < -0.85 ? GamepadKeycodes.GLFW_PRESS : GamepadKeycodes.GLFW_RELEASE
64+
);
65+
sGamepadButtonBuffer.put(
66+
GamepadKeycodes.GLFW_GAMEPAD_BUTTON_DPAD_DOWN,
67+
value > 0.85 ? GamepadKeycodes.GLFW_PRESS : GamepadKeycodes.GLFW_RELEASE
68+
);
69+
return;
70+
}
71+
if(gKeycode != -1) {
72+
sGamepadButtonBuffer.put(gKeycode, value > 0.85 ? GamepadKeycodes.GLFW_PRESS : GamepadKeycodes.GLFW_RELEASE);
73+
}
74+
if(gAxis != -1) {
75+
sGamepadAxisBuffer.put(gAxis, value);
76+
}
77+
}
78+
}

‎app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/direct/DirectGamepadEnableHandler.java

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package net.kdt.pojavlaunch.customcontrols.gamepad.direct;
2+
3+
/**
4+
* Interface that is called once when the GLFW implementation requests to switch from
5+
* the default gamepad implementation to the direct one. The implementor of this interface
6+
* must take the necessary steps to disable the default gamepad implementation and replace
7+
* it with an instance of DirectGamepad.
8+
9+
* This is useful for switching from default to direct input after the user has already
10+
* interacted with the gamepad.
11+
*/
12+
public interface DirectGamepadEnableHandler {
13+
/**
14+
* Called once when GLFW requests switching the gamepad mode from default to direct.
15+
*/
16+
void onDirectGamepadEnabled();
17+
}

‎app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/direct/GamepadKeycodes.java

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package net.kdt.pojavlaunch.customcontrols.gamepad.direct;
2+
3+
public class GamepadKeycodes {
4+
public static final byte GLFW_RELEASE = 0;
5+
public static final byte GLFW_PRESS = 1;
6+
7+
public static final short GLFW_GAMEPAD_BUTTON_A = 0;
8+
public static final short GLFW_GAMEPAD_BUTTON_B = 1;
9+
public static final short GLFW_GAMEPAD_BUTTON_X = 2;
10+
public static final short GLFW_GAMEPAD_BUTTON_Y = 3;
11+
public static final short GLFW_GAMEPAD_BUTTON_LEFT_BUMPER = 4;
12+
public static final short GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER = 5;
13+
public static final short GLFW_GAMEPAD_BUTTON_BACK = 6;
14+
public static final short GLFW_GAMEPAD_BUTTON_START = 7;
15+
// Home button, unused because Android takes the home button events
16+
// for itself
17+
public static final short GLFW_GAMEPAD_BUTTON_GUIDE = 8;
18+
public static final short GLFW_GAMEPAD_BUTTON_LEFT_THUMB = 9;
19+
public static final short GLFW_GAMEPAD_BUTTON_RIGHT_THUMB = 10;
20+
public static final short GLFW_GAMEPAD_BUTTON_DPAD_UP = 11;
21+
public static final short GLFW_GAMEPAD_BUTTON_DPAD_RIGHT = 12;
22+
public static final short GLFW_GAMEPAD_BUTTON_DPAD_DOWN = 13;
23+
public static final short GLFW_GAMEPAD_BUTTON_DPAD_LEFT = 14;
24+
25+
public static final short GLFW_GAMEPAD_AXIS_LEFT_X = 0;
26+
public static final short GLFW_GAMEPAD_AXIS_LEFT_Y = 1;
27+
public static final short GLFW_GAMEPAD_AXIS_RIGHT_X = 2;
28+
public static final short GLFW_GAMEPAD_AXIS_RIGHT_Y = 3;
29+
public static final short GLFW_GAMEPAD_AXIS_LEFT_TRIGGER = 4;
30+
public static final short GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER = 5;
31+
}

‎app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceControlFragment.java

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import android.content.Context;
44
import android.content.SharedPreferences;
5-
import android.hardware.Sensor;
6-
import android.hardware.SensorManager;
75
import android.os.Bundle;
86

97
import androidx.preference.PreferenceCategory;

0 commit comments

Comments
 (0)