From f1a7d3995a69e0d749646c1f674dcc8890a1762b Mon Sep 17 00:00:00 2001 From: The Judge <53906078+thejudge156@users.noreply.github.com> Date: Sun, 3 Dec 2023 22:20:18 -0800 Subject: [PATCH] Add files via upload --- QCXR.patch | 57 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 19 deletions(-) diff --git a/QCXR.patch b/QCXR.patch index 363c1fa..44121bf 100644 --- a/QCXR.patch +++ b/QCXR.patch @@ -1,5 +1,25 @@ Subject: [PATCH] QCXR --- +Index: build.gradle +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/build.gradle b/build.gradle +--- a/build.gradle (revision 13f2f5122fdc2179a5dba6dfbab9eaf70c7e6190) ++++ b/build.gradle (revision cafb62bc2c1da81fc265d542ae055dd9eeb3015c) +@@ -27,10 +27,7 @@ + mappings loom.officialMojangMappings() + // The following line declares the yarn mappings you may select this one as well. + // mappings "net.fabricmc:yarn:1.18.2+build.4:v2" +- implementation("org.lwjgl:lwjgl-openvr:3.2.2") +- implementation("org.lwjgl:lwjgl-openvr:3.2.2:natives-linux") +- implementation("org.lwjgl:lwjgl-openvr:3.2.2:natives-macos") +- implementation("org.lwjgl:lwjgl-openvr:3.2.2:natives-windows") ++ implementation("org.lwjgl:lwjgl-openvr:3.3.2") + } + + tasks.withType(JavaCompile) { Index: common/src/main/java/org/vivecraft/client_vr/provider/VRRenderer.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP @@ -7,7 +27,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 13f2f5122fdc2179a5dba6dfbab9eaf70c7e6190) -+++ b/common/src/main/java/org/vivecraft/client_vr/provider/VRRenderer.java (revision 8b5f737e1cb910350e68057454ee70d05532b641) ++++ b/common/src/main/java/org/vivecraft/client_vr/provider/VRRenderer.java (revision cafb62bc2c1da81fc265d542ae055dd9eeb3015c) @@ -704,6 +704,8 @@ try { @@ -24,7 +44,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 13f2f5122fdc2179a5dba6dfbab9eaf70c7e6190) -+++ b/common/src/main/java/org/vivecraft/client_vr/provider/openvr_lwjgl/OpenVRStereoRenderer.java (revision 8b5f737e1cb910350e68057454ee70d05532b641) ++++ b/common/src/main/java/org/vivecraft/client_vr/provider/openvr_lwjgl/OpenVRStereoRenderer.java (revision cafb62bc2c1da81fc265d542ae055dd9eeb3015c) @@ -7,10 +7,8 @@ import net.minecraft.network.chat.TextComponent; import net.minecraft.util.Tuple; @@ -155,7 +175,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 13f2f5122fdc2179a5dba6dfbab9eaf70c7e6190) -+++ b/common/src/main/java/org/vivecraft/client_vr/render/VRShaders.java (revision 8b5f737e1cb910350e68057454ee70d05532b641) ++++ b/common/src/main/java/org/vivecraft/client_vr/render/VRShaders.java (revision cafb62bc2c1da81fc265d542ae055dd9eeb3015c) @@ -34,6 +34,8 @@ public static AbstractUniform _Overlay_time; public static AbstractUniform _Overlay_BlackAlpha; @@ -185,7 +205,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 13f2f5122fdc2179a5dba6dfbab9eaf70c7e6190) -+++ b/common/src/main/java/org/vivecraft/client_vr/render/helpers/VRPassHelper.java (revision 8b5f737e1cb910350e68057454ee70d05532b641) ++++ b/common/src/main/java/org/vivecraft/client_vr/render/helpers/VRPassHelper.java (revision cafb62bc2c1da81fc265d542ae055dd9eeb3015c) @@ -189,6 +189,11 @@ ProgramManager.glUseProgram(0); checkGLError("post overlay" + eye); @@ -205,7 +225,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 13f2f5122fdc2179a5dba6dfbab9eaf70c7e6190) -+++ b/common/src/main/java/org/vivecraft/client_vr/settings/VRSettings.java (revision 8b5f737e1cb910350e68057454ee70d05532b641) ++++ b/common/src/main/java/org/vivecraft/client_vr/settings/VRSettings.java (revision cafb62bc2c1da81fc265d542ae055dd9eeb3015c) @@ -437,11 +437,11 @@ @SettingField(VrOptions.CHAT_MESSAGE_STENCIL) public boolean showChatMessageStencil = true; @@ -228,9 +248,9 @@ 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 8b5f737e1cb910350e68057454ee70d05532b641) -+++ b/common/src/main/java/org/vivecraft/mixin/client_vr/OpenVRMixin.java (revision 8b5f737e1cb910350e68057454ee70d05532b641) -@@ -0,0 +1,68 @@ +--- /dev/null (revision cafb62bc2c1da81fc265d542ae055dd9eeb3015c) ++++ b/common/src/main/java/org/vivecraft/mixin/client_vr/OpenVRMixin.java (revision cafb62bc2c1da81fc265d542ae055dd9eeb3015c) +@@ -0,0 +1,67 @@ +package org.vivecraft.mixin.client_vr; + +import org.lwjgl.openvr.OpenVR; @@ -261,7 +281,6 @@ new file mode 100644 + @Shadow @Nullable public static OpenVR.IVRInput VRInput; + @Shadow @Nullable public static OpenVR.IVRIOBuffer VRIOBuffer; + @Shadow @Nullable public static OpenVR.IVRSpatialAnchors VRSpatialAnchors; -+ @Shadow @Nullable public static OpenVR.IVRDebug VRDebug; + @Shadow @Nullable public static OpenVR.IVRNotifications VRNotifications; + @Shadow private static int token; + @@ -306,8 +325,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 8b5f737e1cb910350e68057454ee70d05532b641) -+++ b/common/src/main/java/org/vivecraft/utils/VLoader.java (revision 8b5f737e1cb910350e68057454ee70d05532b641) +--- /dev/null (revision cafb62bc2c1da81fc265d542ae055dd9eeb3015c) ++++ b/common/src/main/java/org/vivecraft/utils/VLoader.java (revision cafb62bc2c1da81fc265d542ae055dd9eeb3015c) @@ -0,0 +1,15 @@ +package org.vivecraft.utils; + @@ -331,8 +350,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 8b5f737e1cb910350e68057454ee70d05532b641) -+++ b/common/src/main/resources/assets/minecraft/shaders/core/gsr.fsh (revision 8b5f737e1cb910350e68057454ee70d05532b641) +--- /dev/null (revision cafb62bc2c1da81fc265d542ae055dd9eeb3015c) ++++ b/common/src/main/resources/assets/minecraft/shaders/core/gsr.fsh (revision cafb62bc2c1da81fc265d542ae055dd9eeb3015c) @@ -0,0 +1,142 @@ +#version 460 core + @@ -483,8 +502,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 8b5f737e1cb910350e68057454ee70d05532b641) -+++ b/common/src/main/resources/assets/minecraft/shaders/core/gsr.json (revision 8b5f737e1cb910350e68057454ee70d05532b641) +--- /dev/null (revision cafb62bc2c1da81fc265d542ae055dd9eeb3015c) ++++ b/common/src/main/resources/assets/minecraft/shaders/core/gsr.json (revision cafb62bc2c1da81fc265d542ae055dd9eeb3015c) @@ -0,0 +1,35 @@ +{ + "blend": { @@ -528,7 +547,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 13f2f5122fdc2179a5dba6dfbab9eaf70c7e6190) -+++ b/common/src/main/resources/assets/vivecraft/input/oculus_defaults.json (revision 8b5f737e1cb910350e68057454ee70d05532b641) ++++ b/common/src/main/resources/assets/vivecraft/input/oculus_defaults.json (revision cafb62bc2c1da81fc265d542ae055dd9eeb3015c) @@ -142,7 +142,7 @@ } }, @@ -647,7 +666,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 13f2f5122fdc2179a5dba6dfbab9eaf70c7e6190) -+++ b/common/src/main/resources/assets/vivecraft/input/vive_defaults.json (revision 8b5f737e1cb910350e68057454ee70d05532b641) ++++ b/common/src/main/resources/assets/vivecraft/input/vive_defaults.json (revision cafb62bc2c1da81fc265d542ae055dd9eeb3015c) @@ -146,15 +146,12 @@ }, { @@ -885,7 +904,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 13f2f5122fdc2179a5dba6dfbab9eaf70c7e6190) -+++ b/common/src/main/resources/vivecraft.mixins.json (revision 8b5f737e1cb910350e68057454ee70d05532b641) ++++ b/common/src/main/resources/vivecraft.mixins.json (revision cafb62bc2c1da81fc265d542ae055dd9eeb3015c) @@ -70,7 +70,8 @@ "client_vr.world.PotionItemVRMixin", "client_vr.world.entity.player.PlayerVRMixin", @@ -903,7 +922,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP =================================================================== diff --git a/fabric/build.gradle b/fabric/build.gradle --- a/fabric/build.gradle (revision 13f2f5122fdc2179a5dba6dfbab9eaf70c7e6190) -+++ b/fabric/build.gradle (revision 8b5f737e1cb910350e68057454ee70d05532b641) ++++ b/fabric/build.gradle (revision cafb62bc2c1da81fc265d542ae055dd9eeb3015c) @@ -79,10 +79,10 @@ include(implementation('com.electronwill.night-config:toml:3.6.6')) include(implementation('com.electronwill.night-config:core:3.6.6'))