Merge Prep

QuestCraftPlusPlus · Sep 5, 2024 · 52a54a3 · 52a54a3
1 parent f88f506
commit 52a54a3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/common/src/main/java/org/vivecraft/client_vr/render/helpers/VRPassHelper.java b/common/src/main/java/org/vivecraft/client_vr/render/helpers/VRPassHelper.java
@@ -204,8 +204,7 @@ public static void renderSingleView(RenderPass eye, DeltaTracker.Timer timer, bo
             mc.getProfiler().pop();
 
             VRShaders.ViewportInfo.setSafe(0.0f, 0.0f,  dataHolder.vrRenderer.framebufferEye0.viewWidth, dataHolder.vrRenderer.framebufferEye0.viewHeight);
-            ((RenderTargetExtension) rendertarget).vivecraft$blitToScreen(0, dataHolder.vrRenderer.framebufferEye0.viewWidth, dataHolder.vrRenderer.framebufferEye0.viewHeight, 0, false, 0.0f,  0.0f, true);
-            ProgramManager.glUseProgram(0);
+            ((RenderTargetExtension) rendertarget).vivecraft$blitFovReduction(VRShaders.gsrShader, dataHolder.vrRenderer.framebufferEye0.viewWidth, dataHolder.vrRenderer.framebufferEye0.viewHeight);            ProgramManager.glUseProgram(0);
             checkGLError("post overlay" + eye);
         }
 

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -64,10 +64,10 @@ dependencies {
     include(implementation('com.electronwill.night-config:toml:3.6.6'))
     include(implementation('com.electronwill.night-config:core:3.6.6'))
 
-    include(implementation("org.lwjgl:lwjgl-openvr:3.3.2"))
-    // include(implementation("org.lwjgl:lwjgl-openvr:3.3.1:natives-linux"))
-    // include(implementation("org.lwjgl:lwjgl-openvr:3.3.1:natives-macos"))
-    // include(implementation("org.lwjgl:lwjgl-openvr:3.3.1:natives-windows"))
+    include(implementation("org.lwjgl:lwjgl-openvr:3.3.3"))
+    // include(implementation("org.lwjgl:lwjgl-openvr:3.3.3:natives-linux"))
+    // include(implementation("org.lwjgl:lwjgl-openvr:3.3.3:natives-macos"))
+    // include(implementation("org.lwjgl:lwjgl-openvr:3.3.3:natives-windows"))
 
 }