From 9a6729b9ab7ac9442fb22bba16aafd61cabbcf75 Mon Sep 17 00:00:00 2001 From: The Judge <53906078+thejudge156@users.noreply.github.com> Date: Fri, 8 Dec 2023 20:18:22 -0800 Subject: [PATCH] Add files via upload --- QCXR.patch | 55 ++++++++++++++++++++---------------------------------- 1 file changed, 20 insertions(+), 35 deletions(-) diff --git a/QCXR.patch b/QCXR.patch index f742210..2ff5188 100644 --- a/QCXR.patch +++ b/QCXR.patch @@ -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 { @@ -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; @@ -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()); @@ -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( @@ -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()); @@ -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; @@ -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); @@ -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; @@ -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; + @@ -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; + @@ -324,21 +324,6 @@ 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 @@ -346,8 +331,8 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP =================================================================== 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 + @@ -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": { @@ -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 @@ } }, @@ -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 @@ }, { @@ -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", @@ -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'))