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 authored Dec 4, 2023
1 parent 13cc7c4 commit f1a7d39
Showing 1 changed file with 38 additions and 19 deletions.
57 changes: 38 additions & 19 deletions QCXR.patch
Original file line number Diff line number Diff line change
@@ -1,13 +1,33 @@
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
<+>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 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 {
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
+
Expand Down Expand Up @@ -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;
+
Expand All @@ -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
+
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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 @@
}
},
Expand Down Expand Up @@ -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 @@
},
{
Expand Down Expand Up @@ -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",
Expand All @@ -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'))
Expand Down

0 comments on commit f1a7d39

Please sign in to comment.