more openxr fixes

BasisVR · Mar 4, 2025 · 55f1c9f · 55f1c9f
1 parent 6907bbb
commit 55f1c9f
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/Basis/Packages/com.basis.framework/Device Management/BasisDeviceManagement.cs b/Basis/Packages/com.basis.framework/Device Management/BasisDeviceManagement.cs
@@ -313,6 +313,15 @@ public static void ShowTrackers()
         public void SetCameraRenderState(bool state)
         {
             BasisLocalCameraDriver.Instance.CameraData.allowXRRendering = state;
+            if (state)
+            {
+                BasisLocalCameraDriver.Instance.Camera.stereoTargetEye = StereoTargetEyeMask.Both;
+            }
+            else
+            {
+                BasisLocalCameraDriver.Instance.Camera.stereoTargetEye = StereoTargetEyeMask.None;
+            }
+            BasisDebug.Log("Stero Set To " + BasisLocalCameraDriver.Instance.Camera.stereoTargetEye);
         }
         public static void ShowTrackersAsync()
         {

diff --git a/...ckages/com.basis.framework/Device Management/Devices/OpenVR/BasisOpenVRInputController.cs b/...ckages/com.basis.framework/Device Management/Devices/OpenVR/BasisOpenVRInputController.cs
@@ -1,7 +1,6 @@
 using Basis.Scripts.BasisSdk.Players;
 using Basis.Scripts.Device_Management.Devices.OpenVR.Structs;
 using Basis.Scripts.TransformBinders.BoneControl;
-using System.Threading.Tasks;
 using Unity.Mathematics;
 using UnityEngine;
 using Valve.VR;

diff --git a/...ckages/com.basis.framework/Device Management/Devices/OpenXR/BasisOpenXRControllerInput.cs b/...ckages/com.basis.framework/Device Management/Devices/OpenXR/BasisOpenXRControllerInput.cs
@@ -1,7 +1,7 @@
 using Basis.Scripts.BasisSdk.Players;
 using Basis.Scripts.Device_Management.Devices.OpenXR;
 using Basis.Scripts.TransformBinders.BoneControl;
-using System;
+using Unity.Mathematics;
 using UnityEngine;
 using UnityEngine.InputSystem;
 using static BasisBaseMuscleDriver;
@@ -152,7 +152,17 @@ public override void DoPollData()
             {
                 InputState.Trigger = Trigger.action.ReadValue<float>();
             }
+            if (hasRoleAssigned)
+            {
+                if (Control.HasTracked != BasisHasTracked.HasNoTracker)
+                {
+                    // Apply position offset using math.mul for quaternion-vector multiplication
+                    Control.IncomingData.position = FinalPosition - math.mul(FinalRotation, AvatarPositionOffset * BasisLocalPlayer.Instance.CurrentHeight.EyeRatioAvatarToAvatarDefaultScale);
 
+                    // Apply rotation offset using math.mul for quaternion multiplication
+                    Control.IncomingData.rotation = math.mul(FinalRotation, Quaternion.Euler(AvatarRotationOffset));
+                }
+            }
             CalculateFingerCurls();
             UpdatePlayerControl();
         }

diff --git a/Basis/Packages/com.basis.framework/Device Management/Devices/OpenXR/BasisOpenXRManagement.cs b/Basis/Packages/com.basis.framework/Device Management/Devices/OpenXR/BasisOpenXRManagement.cs
@@ -9,7 +9,7 @@
 namespace Basis.Scripts.Device_Management.Devices.UnityInputSystem
 {
     [Serializable]
-    public class BasisUnityInputManagement : BasisBaseTypeManagement
+    public class BasisOpenXRManagement : BasisBaseTypeManagement
     {
         public List<InputDevice> inputDevices = new List<InputDevice>();
         public Dictionary<string, InputDevice> TypicalDevices = new Dictionary<string, InputDevice>();
@@ -86,7 +86,7 @@ private void CreatePhysicalTrackedDevice(InputDevice device, string uniqueID)
             var basisXRInput = gameObject.AddComponent<BasisOpenXRControllerInput>();
             basisXRInput.ClassName = nameof(BasisOpenXRControllerInput);
             bool state = GetControllerOrHMD(device, out BasisBoneTrackedRole BasisBoneTrackedRole);
-            basisXRInput.Initialize(device, uniqueID, device.name + BasisBoneTrackedRole.ToString(), nameof(BasisUnityInputManagement), state, BasisBoneTrackedRole);
+            basisXRInput.Initialize(device, uniqueID, device.name + BasisBoneTrackedRole.ToString(), nameof(BasisOpenXRManagement), state, BasisBoneTrackedRole);
             BasisDeviceManagement.Instance.TryAdd(basisXRInput);
         }
 
@@ -144,7 +144,7 @@ public override void StartSDK()
 
         public override string Type()
         {
-            return "UnityInputLoader";
+            return "OpenXRLoader";
         }
     }
 }
diff --git a/Basis/Packages/com.basis.framework/Drivers/BasisLocalCameraDriver.cs b/Basis/Packages/com.basis.framework/Drivers/BasisLocalCameraDriver.cs
@@ -7,7 +7,6 @@
 using UnityEngine;
 using UnityEngine.Rendering;
 using UnityEngine.Rendering.Universal;
-using UnityEngine.UI;
 using UnityEngine.XR;
 using Vector3 = UnityEngine.Vector3;
 using BattlePhaze.SettingsManager;