GLFW Update

QuestCraftPlusPlus · Dec 4, 2023 · f151812 · f151812
1 parent 95ae32f
commit f151812
Show file tree

Hide file tree

Showing 15 changed files with 54 additions and 8 deletions.
diff --git a/lib/src/main/assets/lwjgl/lwjgl-glfw-classes.jar b/lib/src/main/assets/lwjgl/lwjgl-glfw-classes.jar
diff --git a/lib/src/main/assets/optionsviveprofiles.txt b/lib/src/main/assets/optionsviveprofiles.txt
@@ -17,7 +17,7 @@
         "RADIALALT_2": "",
         "RADIALALT_1": "",
         "RADIALALT_0": "key.voice_chat_settings",
-        "weaponCollisionNew": "ON",
+        "weaponCollisionNew": "AUTO",
         "vrTouchHotbar": "true",
         "mixedRealityKeyColor": "0,0,0",
         "useCrosshairOcclusion": "true",
@@ -31,9 +31,9 @@
         "low_health_indicator": "true",
         "version": "0",
         "originOffset": "0.0,0.0,0.0",
-        "vrToggleButtonEnabled": "true",
+        "vrToggleButtonEnabled": "false",
         "mixedRealityAlphaMask": "false",
-        "handCameraResScale": "0.5",
+        "handCameraResScale": "1.0",
         "forceHardwareDetection": "0",
         "handCameraFov": "70.0",
         "lastUpdate": "",
@@ -110,7 +110,7 @@
         "physicalKeyboardTheme": "DEFAULT",
         "rightclickDelay": "VANILLA",
         "limitedTeleport": "true",
-        "manualCalibration": "0.80582666",
+        "manualCalibration": "1.1396246",
         "allowCrawling": "true",
         "smoothRunTickCount": "20",
         "bowMode": "ON",
@@ -123,7 +123,7 @@
         "fovReductionMin": "0.25",
         "autoCalibration": "-1.0",
         "renderInGameCrosshairMode": "ALWAYS",
-        "worldRotation": "0.0",
+        "worldRotation": "225.0",
         "displayMirrorCenterSmooth": "0.0",
         "alwaysSimulateKeyboard": "false",
         "externalCameraAngleOrder": "XZY",
@@ -137,7 +137,6 @@
         "RADIAL_3": "key.pickItem",
         "QUICKCOMMAND_11": "praise the sun!",
         "RADIAL_0": "key.drop",
-        "disableGarbageCollectorMessage": "false",
         "QUICKCOMMAND_10": "thank you!",
         "RADIAL_1": "key.chat",
         "RADIAL_6": "key.gamma_utils.gamma_toggle",
@@ -169,7 +168,7 @@
         "showServerPluginMissingMessageAlways": "true",
         "crosshairScale": "1.0",
         "hideGUI": "false",
-        "vrEnabled": "false",
+        "vrEnabled": "true",
         "walkUpBlocks": "true",
         "seatedFreeMove": "false",
         "updateType": "RELEASE",

diff --git a/lib/src/main/jni/egl_bridge.c b/lib/src/main/jni/egl_bridge.c
@@ -603,7 +603,6 @@ void pojav_openGLOnUnload() {
 }
 
 void pojavTerminate() {
-    return;
 }
 
 
@@ -736,6 +735,9 @@ int pojavInit() {
                       "libvulkan_freedreno.so", NULL, NULL);
     adrenotools_set_turbo(true);
     printf("libvulkan: %p\n", libvulkan);
+    if(!libvulkan) {
+        printf("Could not load libvulkan: %s\n", dlerror());
+    }
     char *vulkanPtrString;
 
     asprintf(&vulkanPtrString, "%p", libvulkan);
@@ -762,6 +764,14 @@ int pojavInit() {
     }
 }
 
+void pojavSetWindowHint(int hint, int value) {
+    // Stub
+}
+
+void pojavPumpEvents(void* window) {
+    // Stub
+}
+
 int32_t stride;
 void pojavSwapBuffers() {
     return;

diff --git a/lib/src/main/jni/input_bridge_v3.c b/lib/src/main/jni/input_bridge_v3.c
@@ -132,6 +132,43 @@ void sendData(int type, int i1, int i2, int i3, int i4) {
     );
 }
 
+/** Setup the amount of event that will get pumped into each window */
+void pojavComputeEventTarget() {
+    // Stub
+}
+
+/** Apply index offsets after events have been pumped */
+void pojavRewindEvents() {
+    // Stub
+}
+
+JNIEXPORT void JNICALL
+Java_org_lwjgl_glfw_GLFW_nglfwGetCursorPos(JNIEnv *env, __attribute__((unused)) jclass clazz, __attribute__((unused)) jlong window, jobject xpos,
+                                           jobject ypos) {
+    // Stub
+}
+
+JNIEXPORT void JNICALL JavaCritical_org_lwjgl_glfw_GLFW_nglfwGetCursorPosA(__attribute__((unused)) jlong window, jint lengthx, jdouble* xpos, jint lengthy, jdouble* ypos) {
+    // Stub
+}
+
+JNIEXPORT void JNICALL
+Java_org_lwjgl_glfw_GLFW_nglfwGetCursorPosA(JNIEnv *env, __attribute__((unused)) jclass clazz, __attribute__((unused)) jlong window,
+                                            jdoubleArray xpos, jdoubleArray ypos) {
+    // Stub
+}
+
+JNIEXPORT void JNICALL JavaCritical_org_lwjgl_glfw_GLFW_glfwSetCursorPos(__attribute__((unused)) jlong window, jdouble xpos,
+                                                                         jdouble ypos) {
+    // Stub
+}
+
+JNIEXPORT void JNICALL
+Java_org_lwjgl_glfw_GLFW_glfwSetCursorPos(__attribute__((unused)) JNIEnv *env, __attribute__((unused)) jclass clazz, __attribute__((unused)) jlong window, jdouble xpos,
+                                          jdouble ypos) {
+    // Stub
+}
+
 void closeGLFWWindow() {
     /*
     jclass glfwClazz = (*runtimeJNIEnvPtr_JRE)->FindClass(runtimeJNIEnvPtr_JRE, "org/lwjgl/glfw/GLFW");

diff --git a/lib/src/main/jniLibs/arm64-v8a/libbacktrace.so b/lib/src/main/jniLibs/arm64-v8a/libbacktrace.so
diff --git a/lib/src/main/jniLibs/arm64-v8a/libcutils.so b/lib/src/main/jniLibs/arm64-v8a/libcutils.so
diff --git a/lib/src/main/jniLibs/arm64-v8a/libhardware.so b/lib/src/main/jniLibs/arm64-v8a/libhardware.so
diff --git a/lib/src/main/jniLibs/arm64-v8a/liblog.so b/lib/src/main/jniLibs/arm64-v8a/liblog.so
diff --git a/lib/src/main/jniLibs/arm64-v8a/liblwjgl.so b/lib/src/main/jniLibs/arm64-v8a/liblwjgl.so
diff --git a/lib/src/main/jniLibs/arm64-v8a/liblwjgl_nanovg.so b/lib/src/main/jniLibs/arm64-v8a/liblwjgl_nanovg.so
diff --git a/lib/src/main/jniLibs/arm64-v8a/liblwjgl_opengl.so b/lib/src/main/jniLibs/arm64-v8a/liblwjgl_opengl.so
diff --git a/lib/src/main/jniLibs/arm64-v8a/liblwjgl_stb.so b/lib/src/main/jniLibs/arm64-v8a/liblwjgl_stb.so
diff --git a/lib/src/main/jniLibs/arm64-v8a/liblwjgl_tinyfd.so b/lib/src/main/jniLibs/arm64-v8a/liblwjgl_tinyfd.so
diff --git a/lib/src/main/jniLibs/arm64-v8a/libnativewindow.so b/lib/src/main/jniLibs/arm64-v8a/libnativewindow.so
diff --git a/lib/src/main/jniLibs/arm64-v8a/libsync.so b/lib/src/main/jniLibs/arm64-v8a/libsync.so