Openxr 1.21.4

build.gradle

@@ -22,10 +22,8 @@ subprojects {
     dependencies {
         minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
         mappings loom.layered() {
-            // The following line declares the mojmap mappings, you may use other mappings as well
+            // The following line declares the mojmap mappings
             officialMojangMappings()
-            // The following line declares the yarn mappings you may select this one as well.
-            // "net.fabricmc:yarn:1.18.2+build.4:v2"
             // parchment mappings as backup
             parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip")
         }
@@ -34,6 +32,13 @@ subprojects {
         implementation("org.lwjgl:lwjgl-openvr:${rootProject.lwjgl_version}:natives-macos")
         implementation("org.lwjgl:lwjgl-openvr:${rootProject.lwjgl_version}:natives-windows")
 
+        // Use custom OpenXR lib for Android and GLES bindings
+        //implementation("QuestCraftPlusPlus:lwjgl3:${rootProject.lwjgl_version}:lwjgl-openxr-${rootProject.lwjgl_version}")
+
+        implementation("org.lwjgl:lwjgl-openxr:${rootProject.lwjgl_version}")
+        implementation("org.lwjgl:lwjgl-openxr:${rootProject.lwjgl_version}:natives-linux")
+        implementation("org.lwjgl:lwjgl-openxr:${rootProject.lwjgl_version}:natives-windows")
+
         // for OSC tracker support
         implementation("com.illposed.osc:javaosc-core:0.9")
     }
@@ -155,17 +160,16 @@ allprojects {
         exclusiveContent {
             forRepository {
                 ivy {
-                    name = "Discord"
-                    url = "https://cdn.discordapp.com/attachments/"
+                    name = "GitHub"
+                    url = "https://github.com/"
                     patternLayout {
-                        artifact '/[organisation]/[module]/[revision].[ext]'
+                        artifact '/[organisation]/[module]/releases/download/[revision]/[classifier].jar'
                     }
                     metadataSources { artifact() }
                 }
             }
             filter {
-                // discords are always just numbers
-                includeGroupByRegex "^\\d*\$"
+
             }
         }
     }

common/build.gradle

@@ -45,7 +45,7 @@ dependencies {
     compileOnly('com.electronwill.night-config:toml:3.6.6')
 
     //LaunchPopup
-    implementation 'com.github.Vivecraft:LaunchPopup:1.1.1'
+    implementation 'Vivecraft:LaunchPopup:1.1.1:LaunchPopup-1.1.1'
 }
 // extract the LaunchPopup classes
 jar {

common/src/main/java/org/vivecraft/client_vr/VRData.java

@@ -74,7 +74,7 @@ public VRData(Vec3 origin, float walkMul, float worldScale, float rotation) {
         Vector3f scaleOffset = new Vector3f(scaledPos.x - hmd_raw.x, 0.0F, scaledPos.z - hmd_raw.z);
 
         // headset
-        this.hmd = new VRDevicePose(this, mcVR.hmdRotation, scaledPos, mcVR.getHmdVector());
+        this.hmd = new VRDevicePose(this, mcVR.getEyeRotation(RenderPass.CENTER), scaledPos, mcVR.getHmdVector());
 
         this.eye0 = new VRDevicePose(this,
             mcVR.getEyeRotation(RenderPass.LEFT),

common/src/main/java/org/vivecraft/client_vr/VRState.java

@@ -12,6 +12,7 @@
 import org.vivecraft.client_vr.menuworlds.MenuWorldRenderer;
 import org.vivecraft.client_vr.provider.nullvr.NullVR;
 import org.vivecraft.client_vr.provider.openvr_lwjgl.MCOpenVR;
+import org.vivecraft.client_vr.provider.openxr.MCOpenXR;
 import org.vivecraft.client_vr.render.RenderConfigException;
 import org.vivecraft.client_vr.settings.VRSettings;
 import org.vivecraft.client_xr.render_pass.RenderPassManager;
@@ -51,11 +52,13 @@ public static void initializeVR() {
             }
 
             ClientDataHolderVR dh = ClientDataHolderVR.getInstance();
-            if (dh.vrSettings.stereoProviderPluginID == VRSettings.VRProvider.OPENVR) {
-                dh.vr = new MCOpenVR(Minecraft.getInstance(), dh);
-            } else {
-                dh.vr = new NullVR(Minecraft.getInstance(), dh);
-            }
+            Minecraft instance = Minecraft.getInstance();
+            dh.vr = switch (dh.vrSettings.stereoProviderPluginID) {
+                case OPENVR -> new MCOpenVR(instance, dh);
+                case OPENXR -> new MCOpenXR(instance, dh);
+                default -> new NullVR(instance, dh);
+            };
+
             if (!dh.vr.init()) {
                 throw new RenderConfigException(Component.translatable("vivecraft.messages.vriniterror"),
                     Component.translatable("vivecraft.messages.rendersetupfailed", dh.vr.initStatus, dh.vr.getName()));
@@ -66,7 +69,7 @@ public static void initializeVR() {
             // everything related to VR is created now
             VR_INITIALIZED = true;
 
-            dh.vrRenderer.setupRenderConfiguration();
+            dh.vrRenderer.setupRenderConfiguration(false); //For openXR, setup but don't render yet
             RenderPassManager.setVanillaRenderPass();
 
             dh.vrPlayer = new VRPlayer();

common/src/main/java/org/vivecraft/client_vr/VRTextureTarget.java

@@ -1,7 +1,10 @@
 package org.vivecraft.client_vr;
 
 import com.mojang.blaze3d.pipeline.RenderTarget;
+import com.mojang.blaze3d.platform.GlStateManager;
+import com.mojang.blaze3d.platform.TextureUtil;
 import com.mojang.blaze3d.systems.RenderSystem;
+import org.lwjgl.opengl.GL30;
 import org.vivecraft.client.Xplat;
 import org.vivecraft.client.extensions.RenderTargetExtension;
 
@@ -36,6 +39,31 @@ public VRTextureTarget(
         this.setClearColor(0, 0, 0, 0);
     }
 
+    public VRTextureTarget(String name, int width, int height, int colorId, int index) {
+        super(false);
+        this.name = name;
+        RenderSystem.assertOnRenderThreadOrInit();
+        this.resize(width, height);
+
+        // free the old one when setting a new one
+        if (this.colorTextureId != -1) {
+            TextureUtil.releaseTextureId(this.colorTextureId);
+        }
+        this.colorTextureId = colorId;
+
+        GlStateManager._glBindFramebuffer(GL30.GL_FRAMEBUFFER, this.frameBufferId);
+        // unset the old GL_COLOR_ATTACHMENT0
+        GlStateManager._glFramebufferTexture2D(GL30.GL_FRAMEBUFFER, GL30.GL_COLOR_ATTACHMENT0, GL30.GL_TEXTURE_2D, 0,
+            0);
+        GL30.glFramebufferTextureLayer(GL30.GL_FRAMEBUFFER, GL30.GL_COLOR_ATTACHMENT0, colorId, 0, index);
+
+        // unbind the framebuffer
+        this.unbindRead();
+        this.unbindWrite();
+
+        this.setClearColor(0, 0, 0, 0);
+    }
+
     @Override
     public String toString() {
         return """

common/src/main/java/org/vivecraft/client_vr/gameplay/screenhandlers/GuiHandler.java

@@ -548,7 +548,7 @@ public static Vec3 applyGUIModelView(RenderPass currentPass, Matrix4f poseMatrix
                         direction = DH.vrPlayer.vrdata_world_render.getController(0).getDirection();
                         guirot = guirot.mul(DH.vr.getAimRotation(0), guirot);
                     } else {
-                        guirot = guirot.mul(DH.vr.hmdRotation, guirot);
+                        guirot = guirot.mul(DH.vr.getEyeRotation(RenderPass.CENTER), guirot);
                     }
 
                     guipos = new Vec3(

common/src/main/java/org/vivecraft/client_vr/gui/GuiRadial.java

@@ -7,7 +7,7 @@
 import net.minecraft.network.chat.Component;
 import org.vivecraft.client.gui.framework.TwoHandedScreen;
 import org.vivecraft.client_vr.provider.MCVR;
-import org.vivecraft.client_vr.provider.openvr_lwjgl.VRInputAction;
+import org.vivecraft.client_vr.provider.control.VRInputAction;
 
 public class GuiRadial extends TwoHandedScreen {
     private boolean isShift = false;

common/src/main/java/org/vivecraft/client_vr/provider/ActionParams.java

@@ -1,6 +1,6 @@
 package org.vivecraft.client_vr.provider;
 
-import org.vivecraft.client_vr.provider.openvr_lwjgl.control.VRInputActionSet;
+import org.vivecraft.client_vr.provider.control.VRInputActionSet;
 
 /**
  * holds the parameters for a VR action key