Skip to content
This repository has been archived by the owner on May 20, 2024. It is now read-only.

Commit

Permalink
Add files via upload
Browse files Browse the repository at this point in the history
  • Loading branch information
@thejudge156
thejudge156 authored Dec 9, 2023
1 parent 83ee41c commit 9a6729b
Showing 1 changed file with 20 additions and 35 deletions.
55 changes: 20 additions & 35 deletions QCXR.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
===================================================================
diff --git a/common/src/main/java/org/vivecraft/client_vr/provider/VRRenderer.java b/common/src/main/java/org/vivecraft/client_vr/provider/VRRenderer.java
--- a/common/src/main/java/org/vivecraft/client_vr/provider/VRRenderer.java (revision 96ffbcea670be83bcdc6879eff3b84624f356c22)
+++ b/common/src/main/java/org/vivecraft/client_vr/provider/VRRenderer.java (revision 365683eeb455912787d681f08782003766e1f7da)
+++ b/common/src/main/java/org/vivecraft/client_vr/provider/VRRenderer.java (revision b3defa4707ba5ffdddf8260ff6a280ac4facc2ad)
@@ -700,6 +700,8 @@

try {
Expand All @@ -24,7 +24,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
===================================================================
diff --git a/common/src/main/java/org/vivecraft/client_vr/provider/openvr_lwjgl/OpenVRStereoRenderer.java b/common/src/main/java/org/vivecraft/client_vr/provider/openvr_lwjgl/OpenVRStereoRenderer.java
--- a/common/src/main/java/org/vivecraft/client_vr/provider/openvr_lwjgl/OpenVRStereoRenderer.java (revision 96ffbcea670be83bcdc6879eff3b84624f356c22)
+++ b/common/src/main/java/org/vivecraft/client_vr/provider/openvr_lwjgl/OpenVRStereoRenderer.java (revision 365683eeb455912787d681f08782003766e1f7da)
+++ b/common/src/main/java/org/vivecraft/client_vr/provider/openvr_lwjgl/OpenVRStereoRenderer.java (revision b3defa4707ba5ffdddf8260ff6a280ac4facc2ad)
@@ -7,10 +7,8 @@
import net.minecraft.util.Tuple;
import org.joml.Matrix4f;
Expand Down Expand Up @@ -93,7 +93,7 @@ diff --git a/common/src/main/java/org/vivecraft/client_vr/provider/openvr_lwjgl/
+ VLoader.getQueueIndex(),
+ lwidth,
+ lheight,
+ 37,
+ 43,
+ 1
+ );
+ this.openvr.texType0.handle(leftData.address());
Expand All @@ -117,7 +117,7 @@ diff --git a/common/src/main/java/org/vivecraft/client_vr/provider/openvr_lwjgl/
RenderSystem.texParameter(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR);
RenderSystem.texParameter(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_LINEAR);
- GlStateManager._texImage2D(GL11.GL_TEXTURE_2D, 0, GL11.GL_RGBA8, lwidth, lheight, 0, GL11.GL_RGBA, GL11.GL_INT, null);
+ GlStateManager._texImage2D(GL11.GL_TEXTURE_2D, 0, GL21.GL_RGBA, lwidth, lheight, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, null);
+ GlStateManager._texImage2D(GL11.GL_TEXTURE_2D, 0, GL21.GL_RGBA8, lwidth, lheight, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, null);
RenderSystem.bindTexture(i);
- this.openvr.texType1.handle(this.RightEyeTextureId);
+ VRVulkanTextureData rightData = VRVulkanTextureData.calloc().set(
Expand All @@ -129,7 +129,7 @@ diff --git a/common/src/main/java/org/vivecraft/client_vr/provider/openvr_lwjgl/
+ VLoader.getQueueIndex(),
+ lwidth,
+ lheight,
+ 37,
+ 43,
+ 1
+ );
+ this.openvr.texType1.handle(rightData.address());
Expand All @@ -155,7 +155,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
===================================================================
diff --git a/common/src/main/java/org/vivecraft/client_vr/render/VRShaders.java b/common/src/main/java/org/vivecraft/client_vr/render/VRShaders.java
--- a/common/src/main/java/org/vivecraft/client_vr/render/VRShaders.java (revision 96ffbcea670be83bcdc6879eff3b84624f356c22)
+++ b/common/src/main/java/org/vivecraft/client_vr/render/VRShaders.java (revision 365683eeb455912787d681f08782003766e1f7da)
+++ b/common/src/main/java/org/vivecraft/client_vr/render/VRShaders.java (revision b3defa4707ba5ffdddf8260ff6a280ac4facc2ad)
@@ -34,6 +34,8 @@
public static AbstractUniform _Overlay_time;
public static AbstractUniform _Overlay_BlackAlpha;
Expand Down Expand Up @@ -185,7 +185,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
===================================================================
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
--- a/common/src/main/java/org/vivecraft/client_vr/render/helpers/VRPassHelper.java (revision 96ffbcea670be83bcdc6879eff3b84624f356c22)
+++ b/common/src/main/java/org/vivecraft/client_vr/render/helpers/VRPassHelper.java (revision 365683eeb455912787d681f08782003766e1f7da)
+++ b/common/src/main/java/org/vivecraft/client_vr/render/helpers/VRPassHelper.java (revision b3defa4707ba5ffdddf8260ff6a280ac4facc2ad)
@@ -189,6 +189,11 @@
ProgramManager.glUseProgram(0);
checkGLError("post overlay" + eye);
Expand All @@ -205,7 +205,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
===================================================================
diff --git a/common/src/main/java/org/vivecraft/client_vr/settings/VRSettings.java b/common/src/main/java/org/vivecraft/client_vr/settings/VRSettings.java
--- a/common/src/main/java/org/vivecraft/client_vr/settings/VRSettings.java (revision 96ffbcea670be83bcdc6879eff3b84624f356c22)
+++ b/common/src/main/java/org/vivecraft/client_vr/settings/VRSettings.java (revision 365683eeb455912787d681f08782003766e1f7da)
+++ b/common/src/main/java/org/vivecraft/client_vr/settings/VRSettings.java (revision b3defa4707ba5ffdddf8260ff6a280ac4facc2ad)
@@ -437,11 +437,11 @@
@SettingField(VrOptions.CHAT_MESSAGE_STENCIL)
public boolean showChatMessageStencil = true;
Expand All @@ -228,8 +228,8 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
===================================================================
diff --git a/common/src/main/java/org/vivecraft/mixin/client_vr/OpenVRMixin.java b/common/src/main/java/org/vivecraft/mixin/client_vr/OpenVRMixin.java
new file mode 100644
--- /dev/null (revision 365683eeb455912787d681f08782003766e1f7da)
+++ b/common/src/main/java/org/vivecraft/mixin/client_vr/OpenVRMixin.java (revision 365683eeb455912787d681f08782003766e1f7da)
--- /dev/null (revision b3defa4707ba5ffdddf8260ff6a280ac4facc2ad)
+++ b/common/src/main/java/org/vivecraft/mixin/client_vr/OpenVRMixin.java (revision b3defa4707ba5ffdddf8260ff6a280ac4facc2ad)
@@ -0,0 +1,68 @@
+package org.vivecraft.mixin.client_vr;
+
Expand Down Expand Up @@ -306,8 +306,8 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
===================================================================
diff --git a/common/src/main/java/org/vivecraft/utils/VLoader.java b/common/src/main/java/org/vivecraft/utils/VLoader.java
new file mode 100644
--- /dev/null (revision 365683eeb455912787d681f08782003766e1f7da)
+++ b/common/src/main/java/org/vivecraft/utils/VLoader.java (revision 365683eeb455912787d681f08782003766e1f7da)
--- /dev/null (revision b3defa4707ba5ffdddf8260ff6a280ac4facc2ad)
+++ b/common/src/main/java/org/vivecraft/utils/VLoader.java (revision b3defa4707ba5ffdddf8260ff6a280ac4facc2ad)
@@ -0,0 +1,15 @@
+package org.vivecraft.utils;
+
Expand All @@ -324,30 +324,15 @@ new file mode 100644
+ public static native long getQueue();
+ public static native int getQueueIndex();
+}
Index: common/src/main/resources/assets/minecraft/shaders/core/fovreduction.vsh
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/common/src/main/resources/assets/minecraft/shaders/core/fovreduction.vsh b/common/src/main/resources/assets/minecraft/shaders/core/fovreduction.vsh
--- a/common/src/main/resources/assets/minecraft/shaders/core/fovreduction.vsh (revision 96ffbcea670be83bcdc6879eff3b84624f356c22)
+++ b/common/src/main/resources/assets/minecraft/shaders/core/fovreduction.vsh (revision 365683eeb455912787d681f08782003766e1f7da)
@@ -7,5 +7,5 @@
out vec2 texCoordinates;
void main() {
gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);
- texCoordinates = UV0;
+ texCoordinates = vec2(UV0.s, 1.0 - UV0.t);
}
Index: common/src/main/resources/assets/minecraft/shaders/core/gsr.fsh
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/common/src/main/resources/assets/minecraft/shaders/core/gsr.fsh b/common/src/main/resources/assets/minecraft/shaders/core/gsr.fsh
new file mode 100644
--- /dev/null (revision 365683eeb455912787d681f08782003766e1f7da)
+++ b/common/src/main/resources/assets/minecraft/shaders/core/gsr.fsh (revision 365683eeb455912787d681f08782003766e1f7da)
--- /dev/null (revision b3defa4707ba5ffdddf8260ff6a280ac4facc2ad)
+++ b/common/src/main/resources/assets/minecraft/shaders/core/gsr.fsh (revision b3defa4707ba5ffdddf8260ff6a280ac4facc2ad)
@@ -0,0 +1,142 @@
+#version 460 core
+
Expand Down Expand Up @@ -498,8 +483,8 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
===================================================================
diff --git a/common/src/main/resources/assets/minecraft/shaders/core/gsr.json b/common/src/main/resources/assets/minecraft/shaders/core/gsr.json
new file mode 100644
--- /dev/null (revision 365683eeb455912787d681f08782003766e1f7da)
+++ b/common/src/main/resources/assets/minecraft/shaders/core/gsr.json (revision 365683eeb455912787d681f08782003766e1f7da)
--- /dev/null (revision b3defa4707ba5ffdddf8260ff6a280ac4facc2ad)
+++ b/common/src/main/resources/assets/minecraft/shaders/core/gsr.json (revision b3defa4707ba5ffdddf8260ff6a280ac4facc2ad)
@@ -0,0 +1,35 @@
+{
+ "blend": {
Expand Down Expand Up @@ -543,7 +528,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
===================================================================
diff --git a/common/src/main/resources/assets/vivecraft/input/oculus_defaults.json b/common/src/main/resources/assets/vivecraft/input/oculus_defaults.json
--- a/common/src/main/resources/assets/vivecraft/input/oculus_defaults.json (revision 96ffbcea670be83bcdc6879eff3b84624f356c22)
+++ b/common/src/main/resources/assets/vivecraft/input/oculus_defaults.json (revision 365683eeb455912787d681f08782003766e1f7da)
+++ b/common/src/main/resources/assets/vivecraft/input/oculus_defaults.json (revision b3defa4707ba5ffdddf8260ff6a280ac4facc2ad)
@@ -142,7 +142,7 @@
}
},
Expand Down Expand Up @@ -662,7 +647,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
===================================================================
diff --git a/common/src/main/resources/assets/vivecraft/input/vive_defaults.json b/common/src/main/resources/assets/vivecraft/input/vive_defaults.json
--- a/common/src/main/resources/assets/vivecraft/input/vive_defaults.json (revision 96ffbcea670be83bcdc6879eff3b84624f356c22)
+++ b/common/src/main/resources/assets/vivecraft/input/vive_defaults.json (revision 365683eeb455912787d681f08782003766e1f7da)
+++ b/common/src/main/resources/assets/vivecraft/input/vive_defaults.json (revision b3defa4707ba5ffdddf8260ff6a280ac4facc2ad)
@@ -146,15 +146,12 @@
},
{
Expand Down Expand Up @@ -900,7 +885,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
===================================================================
diff --git a/common/src/main/resources/vivecraft.mixins.json b/common/src/main/resources/vivecraft.mixins.json
--- a/common/src/main/resources/vivecraft.mixins.json (revision 96ffbcea670be83bcdc6879eff3b84624f356c22)
+++ b/common/src/main/resources/vivecraft.mixins.json (revision 365683eeb455912787d681f08782003766e1f7da)
+++ b/common/src/main/resources/vivecraft.mixins.json (revision b3defa4707ba5ffdddf8260ff6a280ac4facc2ad)
@@ -73,7 +73,8 @@
"client_vr.world.entity.projectile.FireworkRocketEntityVRMixin",
"client_vr.world.level.block.DoorBlockVRMixin",
Expand All @@ -918,7 +903,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
===================================================================
diff --git a/fabric/build.gradle b/fabric/build.gradle
--- a/fabric/build.gradle (revision 96ffbcea670be83bcdc6879eff3b84624f356c22)
+++ b/fabric/build.gradle (revision 365683eeb455912787d681f08782003766e1f7da)
+++ b/fabric/build.gradle (revision b3defa4707ba5ffdddf8260ff6a280ac4facc2ad)
@@ -74,10 +74,10 @@
include(implementation('com.electronwill.night-config:toml:3.6.6'))
include(implementation('com.electronwill.night-config:core:3.6.6'))
Expand Down

0 comments on commit 9a6729b

Please sign in to comment.