From 13cc7c4a1ab3ad792d6496115a498759c8688b31 Mon Sep 17 00:00:00 2001 From: The Judge <53906078+thejudge156@users.noreply.github.com> Date: Sun, 3 Dec 2023 22:08:22 -0800 Subject: [PATCH] Add files via upload --- QCXR.patch | 76 +++++++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/QCXR.patch b/QCXR.patch index 7b54fb7..363c1fa 100644 --- a/QCXR.patch +++ b/QCXR.patch @@ -6,9 +6,9 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== 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 3fe6e1cc49cf792c874d61fc083ad4beb1c40fa9) -@@ -700,6 +700,8 @@ +--- 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) +@@ -704,6 +704,8 @@ try { minecraft.mainRenderTarget = this.framebufferVrRender; @@ -23,11 +23,11 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== 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 3fe6e1cc49cf792c874d61fc083ad4beb1c40fa9) +--- 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) @@ -7,10 +7,8 @@ + import net.minecraft.network.chat.TextComponent; import net.minecraft.util.Tuple; - import org.joml.Matrix4f; import org.lwjgl.opengl.GL11; -import org.lwjgl.openvr.HiddenAreaMesh; -import org.lwjgl.openvr.HmdMatrix44; @@ -154,8 +154,8 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== 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 3fe6e1cc49cf792c874d61fc083ad4beb1c40fa9) +--- 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) @@ -34,6 +34,8 @@ public static AbstractUniform _Overlay_time; public static AbstractUniform _Overlay_BlackAlpha; @@ -184,8 +184,8 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== 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 3fe6e1cc49cf792c874d61fc083ad4beb1c40fa9) +--- 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) @@ -189,6 +189,11 @@ ProgramManager.glUseProgram(0); checkGLError("post overlay" + eye); @@ -204,8 +204,8 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== 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 3fe6e1cc49cf792c874d61fc083ad4beb1c40fa9) +--- 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) @@ -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 3fe6e1cc49cf792c874d61fc083ad4beb1c40fa9) -+++ b/common/src/main/java/org/vivecraft/mixin/client_vr/OpenVRMixin.java (revision 3fe6e1cc49cf792c874d61fc083ad4beb1c40fa9) +--- /dev/null (revision 8b5f737e1cb910350e68057454ee70d05532b641) ++++ b/common/src/main/java/org/vivecraft/mixin/client_vr/OpenVRMixin.java (revision 8b5f737e1cb910350e68057454ee70d05532b641) @@ -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 3fe6e1cc49cf792c874d61fc083ad4beb1c40fa9) -+++ b/common/src/main/java/org/vivecraft/utils/VLoader.java (revision 3fe6e1cc49cf792c874d61fc083ad4beb1c40fa9) +--- /dev/null (revision 8b5f737e1cb910350e68057454ee70d05532b641) ++++ b/common/src/main/java/org/vivecraft/utils/VLoader.java (revision 8b5f737e1cb910350e68057454ee70d05532b641) @@ -0,0 +1,15 @@ +package org.vivecraft.utils; + @@ -331,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 3fe6e1cc49cf792c874d61fc083ad4beb1c40fa9) -+++ b/common/src/main/resources/assets/minecraft/shaders/core/gsr.fsh (revision 3fe6e1cc49cf792c874d61fc083ad4beb1c40fa9) +--- /dev/null (revision 8b5f737e1cb910350e68057454ee70d05532b641) ++++ b/common/src/main/resources/assets/minecraft/shaders/core/gsr.fsh (revision 8b5f737e1cb910350e68057454ee70d05532b641) @@ -0,0 +1,142 @@ +#version 460 core + @@ -483,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 3fe6e1cc49cf792c874d61fc083ad4beb1c40fa9) -+++ b/common/src/main/resources/assets/minecraft/shaders/core/gsr.json (revision 3fe6e1cc49cf792c874d61fc083ad4beb1c40fa9) +--- /dev/null (revision 8b5f737e1cb910350e68057454ee70d05532b641) ++++ b/common/src/main/resources/assets/minecraft/shaders/core/gsr.json (revision 8b5f737e1cb910350e68057454ee70d05532b641) @@ -0,0 +1,35 @@ +{ + "blend": { @@ -527,8 +527,8 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== 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 3fe6e1cc49cf792c874d61fc083ad4beb1c40fa9) +--- 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) @@ -142,7 +142,7 @@ } }, @@ -646,8 +646,8 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== 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 3fe6e1cc49cf792c874d61fc083ad4beb1c40fa9) +--- 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) @@ -146,15 +146,12 @@ }, { @@ -884,14 +884,14 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== 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 3fe6e1cc49cf792c874d61fc083ad4beb1c40fa9) -@@ -73,7 +73,8 @@ +--- a/common/src/main/resources/vivecraft.mixins.json (revision 13f2f5122fdc2179a5dba6dfbab9eaf70c7e6190) ++++ b/common/src/main/resources/vivecraft.mixins.json (revision 8b5f737e1cb910350e68057454ee70d05532b641) +@@ -70,7 +70,8 @@ + "client_vr.world.PotionItemVRMixin", + "client_vr.world.entity.player.PlayerVRMixin", "client_vr.world.entity.projectile.FireworkRocketEntityVRMixin", - "client_vr.world.level.block.DoorBlockVRMixin", - "client_vr.world.level.block.FenceGateBlockVRMixin", -- "client_vr.world.level.block.TrapDoorBlockVRMixin" -+ "client_vr.world.level.block.TrapDoorBlockVRMixin", +- "client_vr.world.level.biome.BiomeAccessor" ++ "client_vr.world.level.biome.BiomeAccessor", + "client_vr.OpenVRMixin" ], "minVersion": "0.8.4", @@ -902,16 +902,16 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/fabric/build.gradle b/fabric/build.gradle ---- a/fabric/build.gradle (revision 96ffbcea670be83bcdc6879eff3b84624f356c22) -+++ b/fabric/build.gradle (revision 3fe6e1cc49cf792c874d61fc083ad4beb1c40fa9) -@@ -74,10 +74,10 @@ +--- a/fabric/build.gradle (revision 13f2f5122fdc2179a5dba6dfbab9eaf70c7e6190) ++++ b/fabric/build.gradle (revision 8b5f737e1cb910350e68057454ee70d05532b641) +@@ -79,10 +79,10 @@ 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.1")) -- 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.2.2")) +- include(implementation("org.lwjgl:lwjgl-openvr:3.2.2:natives-linux")) +- include(implementation("org.lwjgl:lwjgl-openvr:3.2.2:natives-macos")) +- include(implementation("org.lwjgl:lwjgl-openvr:3.2.2:natives-windows")) + 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"))