diff --git a/src/main/assets/lwjgl/lwjgl-glfw-classes.jar b/src/main/assets/lwjgl/lwjgl-glfw-classes.jar index 97de44cf..dc9c4c67 100644 Binary files a/src/main/assets/lwjgl/lwjgl-glfw-classes.jar and b/src/main/assets/lwjgl/lwjgl-glfw-classes.jar differ diff --git a/src/main/assets/lwjgl/version b/src/main/assets/lwjgl/version index 7de03422..5e67da72 100644 --- a/src/main/assets/lwjgl/version +++ b/src/main/assets/lwjgl/version @@ -1 +1 @@ -1725963866338 \ No newline at end of file +1725980855923 \ No newline at end of file diff --git a/src/main/java/pojlib/UnityPlayerActivity.java b/src/main/java/pojlib/UnityPlayerActivity.java index eb707b44..7171f137 100644 --- a/src/main/java/pojlib/UnityPlayerActivity.java +++ b/src/main/java/pojlib/UnityPlayerActivity.java @@ -103,6 +103,8 @@ protected String updateUnityCommandLineArguments(String cmdLine) .remapLeftTrigger(true) .remapRightTrigger(true) .remapDpad(true)); + + CallbackBridge.nativeSetUseInputStackQueue(true); } public static DisplayMetrics getDisplayMetrics(Activity activity) { diff --git a/src/main/java/pojlib/input/gamepad/Gamepad.java b/src/main/java/pojlib/input/gamepad/Gamepad.java index b162c922..b390f3f2 100644 --- a/src/main/java/pojlib/input/gamepad/Gamepad.java +++ b/src/main/java/pojlib/input/gamepad/Gamepad.java @@ -44,7 +44,7 @@ public class Gamepad implements GrabListener, GamepadHandler { /* Resolution scaler option, allow downsizing a window */ - private final float mScaleFactor = 0; // LauncherPreferences.DEFAULT_PREF.getInt("resolutionRatio",100)/100f; + private final float mScaleFactor = 1; // LauncherPreferences.DEFAULT_PREF.getInt("resolutionRatio",100)/100f; /* Sensitivity, adjusted according to screen size */ private final double mSensitivityFactor = (1.4 * (1080f/ currentDisplayMetrics.heightPixels)); @@ -79,7 +79,7 @@ public class Gamepad implements GrabListener, GamepadHandler { private final GamepadDataProvider mMapProvider; public Gamepad(InputDevice inputDevice, GamepadDataProvider mapProvider){ - Settings.setDeadzoneScale(100f); + Settings.setDeadzoneScale(1f); mScreenChoreographer = Choreographer.getInstance(); Choreographer.FrameCallback frameCallback = new Choreographer.FrameCallback() { diff --git a/src/main/java/pojlib/input/gamepad/GamepadMap.java b/src/main/java/pojlib/input/gamepad/GamepadMap.java index f1ba16c8..27c2a1cd 100644 --- a/src/main/java/pojlib/input/gamepad/GamepadMap.java +++ b/src/main/java/pojlib/input/gamepad/GamepadMap.java @@ -148,7 +148,8 @@ public static GamepadMap getDefaultMenuMap(){ keycodes[0] = keycodes[1] = keycodes[2] = keycodes[3] = GamepadMap.MOUSE_SCROLL_DOWN; } - menuMap.DPAD_DOWN.keycodes[0] = LwjglGlfwKeycode.GLFW_KEY_O; //For mods ? + menuMap.DPAD_UP.keycodes[0] = LwjglGlfwKeycode.GLFW_KEY_TAB; // QC Funnies + menuMap.DPAD_DOWN.keycodes[0] = LwjglGlfwKeycode.GLFW_KEY_ENTER; //For mods ? menuMap.DPAD_RIGHT.keycodes[0] = LwjglGlfwKeycode.GLFW_KEY_K; //For mods ? menuMap.DPAD_LEFT.keycodes[0] = LwjglGlfwKeycode.GLFW_KEY_J; //For mods ? diff --git a/src/main/jni/input_bridge_v3.c b/src/main/jni/input_bridge_v3.c index 929006be..670f0149 100644 --- a/src/main/jni/input_bridge_v3.c +++ b/src/main/jni/input_bridge_v3.c @@ -109,6 +109,7 @@ void pojavPumpEvents(void* window) { while (targetIndex != index) { GLFWInputEvent event = pojav_environ->events[index]; + printf("event type: %i\n", event.type); switch (event.type) { case EVENT_TYPE_CHAR: if(pojav_environ->GLFW_invoke_Char) pojav_environ->GLFW_invoke_Char(window, event.i1);