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

Fix ArrayIndexOutOfBoundsException when glfwGetKey(0)

Browse Source
This commit is contained in:
Duy Tran Khanh 2022-02-28 09:00:13 +07:00 committed by GitHub
parent 902632cae1
commit 491c16ecab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jre_lwjgl3glfw/src/main/java/org/lwjgl/glfw/GLFW.java
View File

@ -497,7 +497,7 @@ public class GLFW
private static ArrayMap<Long, GLFWWindowProperties> mGLFWWindowMap; private static ArrayMap<Long, GLFWWindowProperties> mGLFWWindowMap;
public static boolean mGLFWIsGrabbing, mGLFWIsInputReady, mGLFWIsUseStackQueue = false; public static boolean mGLFWIsGrabbing, mGLFWIsInputReady, mGLFWIsUseStackQueue = false;
public static final byte[] keyDownBuffer = new byte[316]; public static final byte[] keyDownBuffer = new byte[317];
private static final String PROP_WINDOW_WIDTH = "glfwstub.windowWidth"; private static final String PROP_WINDOW_WIDTH = "glfwstub.windowWidth";
private static final String PROP_WINDOW_HEIGHT= "glfwstub.windowHeight"; private static final String PROP_WINDOW_HEIGHT= "glfwstub.windowHeight";
public static long mainContext = 0; public static long mainContext = 0;
@ -1099,7 +1099,7 @@ public class GLFW
break; break;
case CallbackBridge.EVENT_TYPE_KEY: case CallbackBridge.EVENT_TYPE_KEY:
if (mGLFWKeyCallback != null) { if (mGLFWKeyCallback != null) {
keyDownBuffer[dataArr[1]-32]=(byte)(int)dataArr[3]; keyDownBuffer[Math.max(0, dataArr[1]-31)]=(byte)(int)dataArr[3];
mGLFWKeyCallback.invoke(ptr, dataArr[1], dataArr[2], dataArr[3], dataArr[4]); mGLFWKeyCallback.invoke(ptr, dataArr[1], dataArr[2], dataArr[3], dataArr[4]);
} }
break; break;
@ -1191,7 +1191,7 @@ public class GLFW
} }
public static int glfwGetKey(@NativeType("GLFWwindow *") long window, int key) { public static int glfwGetKey(@NativeType("GLFWwindow *") long window, int key) {
return keyDownBuffer[key-32]; return keyDownBuffer[Math.max(0, dataArr[1]-31)];
} }
public static int glfwGetMouseButton(@NativeType("GLFWwindow *") long window, int button) { public static int glfwGetMouseButton(@NativeType("GLFWwindow *") long window, int button) {