added standable to device matcher

BasisVR · Mar 4, 2025 · 4b879a6 · 4b879a6
1 parent b5aa4bf
commit 4b879a6
Show file tree

Hide file tree

Showing 4 changed files with 171 additions and 16 deletions.
diff --git a/Basis/Assets/XR/Settings/OpenXR Package Settings.asset b/Basis/Assets/XR/Settings/OpenXR Package Settings.asset
@@ -1020,13 +1020,15 @@ MonoBehaviour:
   m_Name: HandTracking Standalone
   m_EditorClassIdentifier: 
   m_enabled: 0
+  <failedInitialization>k__BackingField: 0
   nameUi: Hand Tracking Subsystem
   version: 0.0.1
   featureIdInternal: com.unity.openxr.feature.input.handtracking
   openxrExtensionStrings: XR_EXT_hand_tracking
   company: Unity
   priority: -100
   required: 0
+  m_ShouldBeRunning: 0
 --- !u!114 &1037941242733295319
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1164,13 +1166,15 @@ MonoBehaviour:
   m_Name: HandTracking Android
   m_EditorClassIdentifier: 
   m_enabled: 0
-  nameUi: 
-  version: 
-  featureIdInternal: 
-  openxrExtensionStrings: 
-  company: 
-  priority: 0
+  <failedInitialization>k__BackingField: 0
+  nameUi: Hand Tracking Subsystem
+  version: 0.0.1
+  featureIdInternal: com.unity.openxr.feature.input.handtracking
+  openxrExtensionStrings: XR_EXT_hand_tracking
+  company: Unity
+  priority: -100
   required: 0
+  m_ShouldBeRunning: 0
 --- !u!114 &2146913422818440268
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1205,11 +1209,12 @@ MonoBehaviour:
   m_Name: MetaHandTrackingAim Android
   m_EditorClassIdentifier: 
   m_enabled: 0
-  nameUi: 
-  version: 
-  featureIdInternal: 
-  openxrExtensionStrings: 
-  company: 
+  <failedInitialization>k__BackingField: 0
+  nameUi: Meta Hand Tracking Aim
+  version: 0.0.1
+  featureIdInternal: com.unity.openxr.feature.input.metahandtrackingaim
+  openxrExtensionStrings: XR_FB_hand_tracking_aim
+  company: Unity
   priority: 0
   required: 0
 --- !u!114 &2666689914590433523
@@ -1352,6 +1357,7 @@ MonoBehaviour:
   m_Name: MetaHandTrackingAim Standalone
   m_EditorClassIdentifier: 
   m_enabled: 0
+  <failedInitialization>k__BackingField: 0
   nameUi: Meta Hand Tracking Aim
   version: 0.0.1
   featureIdInternal: com.unity.openxr.feature.input.metahandtrackingaim
@@ -1412,8 +1418,6 @@ MonoBehaviour:
   m_Name: Standalone
   m_EditorClassIdentifier: 
   features:
-  - {fileID: 3999078036332178412}
-  - {fileID: 638815009775519648}
   - {fileID: -4823766194161132787}
   - {fileID: 1818262454267888816}
   - {fileID: 2776206606949624213}

diff --git a/Basis/Assets/XR/XRGeneralSettingsPerBuildTarget.asset b/Basis/Assets/XR/XRGeneralSettingsPerBuildTarget.asset
@@ -30,6 +30,7 @@ MonoBehaviour:
   m_AutomaticLoading: 0
   m_AutomaticRunning: 0
   m_Loaders:
+  - {fileID: 11400000, guid: 3bc3c9a960a936342a72833e45544032, type: 2}
   - {fileID: 11400000, guid: 7892f170cc4e84f4cbde6ca6d077400b, type: 2}
 --- !u!114 &11400000
 MonoBehaviour:

diff --git a/Basis/Packages/com.basis.sdk/Settings/Basis Devices Matcher.asset b/Basis/Packages/com.basis.sdk/Settings/Basis Devices Matcher.asset
@@ -319,6 +319,81 @@ MonoBehaviour:
     HasTrackedRole: 1
     TrackedRole: 19
     HasInteractVisual: 1
+  - DeviceID: '{standable}/rendermodels/Estimated/sfbePelvis'
+    VersionNumber: 1
+    matchableDeviceIds:
+    - '{standable}/rendermodels/Estimated/sfbePelvis'
+    HasRayCastSupport: 1
+    CanDisplayPhysicalTracker: 0
+    HasRayCastVisual: 1
+    HasRayCastRedical: 1
+    PositionRayCastOffset: {x: 0, y: 0, z: 0}
+    RotationRaycastOffset: {x: 0, y: 0, z: 0}
+    AvatarPositionOffset: {x: 0, y: 0, z: 0}
+    AvatarRotationOffset: {x: 0, y: 0, z: 0}
+    HasTrackedRole: 0
+    TrackedRole: 0
+    HasInteractVisual: 1
+  - DeviceID: '{standable}/rendermodels/Estimated/sfbeFoot'
+    VersionNumber: 1
+    matchableDeviceIds:
+    - '{standable}/rendermodels/Estimated/sfbeFoot'
+    HasRayCastSupport: 1
+    CanDisplayPhysicalTracker: 0
+    HasRayCastVisual: 1
+    HasRayCastRedical: 1
+    PositionRayCastOffset: {x: 0, y: 0, z: 0}
+    RotationRaycastOffset: {x: 0, y: 0, z: 0}
+    AvatarPositionOffset: {x: 0, y: 0, z: 0}
+    AvatarRotationOffset: {x: 0, y: 0, z: 0}
+    HasTrackedRole: 0
+    TrackedRole: 0
+    HasInteractVisual: 1
+  - DeviceID: '{standable}/rendermodels/Estimated/sfbeChest'
+    VersionNumber: 1
+    matchableDeviceIds:
+    - '{standable}/rendermodels/Estimated/sfbeChest'
+    HasRayCastSupport: 1
+    CanDisplayPhysicalTracker: 0
+    HasRayCastVisual: 1
+    HasRayCastRedical: 1
+    PositionRayCastOffset: {x: 0, y: 0, z: 0}
+    RotationRaycastOffset: {x: 0, y: 0, z: 0}
+    AvatarPositionOffset: {x: 0, y: 0, z: 0}
+    AvatarRotationOffset: {x: 0, y: 0, z: 0}
+    HasTrackedRole: 0
+    TrackedRole: 0
+    HasInteractVisual: 1
+  - DeviceID: '{standable}/rendermodels/Estimated/sfbeElbow'
+    VersionNumber: 1
+    matchableDeviceIds:
+    - '{standable}/rendermodels/Estimated/sfbeElbow'
+    HasRayCastSupport: 1
+    CanDisplayPhysicalTracker: 0
+    HasRayCastVisual: 1
+    HasRayCastRedical: 1
+    PositionRayCastOffset: {x: 0, y: 0, z: 0}
+    RotationRaycastOffset: {x: 0, y: 0, z: 0}
+    AvatarPositionOffset: {x: 0, y: 0, z: 0}
+    AvatarRotationOffset: {x: 0, y: 0, z: 0}
+    HasTrackedRole: 0
+    TrackedRole: 0
+    HasInteractVisual: 1
+  - DeviceID: '{standable}/rendermodels/Estimated/sfbeKnee'
+    VersionNumber: 1
+    matchableDeviceIds:
+    - '{standable}/rendermodels/Estimated/sfbeKnee'
+    HasRayCastSupport: 1
+    CanDisplayPhysicalTracker: 0
+    HasRayCastVisual: 1
+    HasRayCastRedical: 1
+    PositionRayCastOffset: {x: 0, y: 0, z: 0}
+    RotationRaycastOffset: {x: 0, y: 0, z: 0}
+    AvatarPositionOffset: {x: 0, y: 0, z: 0}
+    AvatarRotationOffset: {x: 0, y: 0, z: 0}
+    HasTrackedRole: 0
+    TrackedRole: 0
+    HasInteractVisual: 1
   BackedUpDevices:
   - DeviceID: vr_tracker_vive_3_0
     VersionNumber: 1
@@ -601,7 +676,7 @@ MonoBehaviour:
     matchableDeviceIds:
     - Left Hand OPENXR
     HasRayCastSupport: 1
-    CanDisplayPhysicalTracker: 0
+    CanDisplayPhysicalTracker: 1
     HasRayCastVisual: 1
     HasRayCastRedical: 1
     PositionRayCastOffset: {x: 0, y: 0, z: 0}
@@ -616,7 +691,7 @@ MonoBehaviour:
     matchableDeviceIds:
     - Right Hand OPENXR
     HasRayCastSupport: 1
-    CanDisplayPhysicalTracker: 0
+    CanDisplayPhysicalTracker: 1
     HasRayCastVisual: 1
     HasRayCastRedical: 1
     PositionRayCastOffset: {x: 0, y: 0, z: 0}
@@ -626,3 +701,78 @@ MonoBehaviour:
     HasTrackedRole: 1
     TrackedRole: 19
     HasInteractVisual: 1
+  - DeviceID: '{standable}/rendermodels/Estimated/sfbePelvis'
+    VersionNumber: 1
+    matchableDeviceIds:
+    - '{standable}/rendermodels/Estimated/sfbePelvis'
+    HasRayCastSupport: 1
+    CanDisplayPhysicalTracker: 0
+    HasRayCastVisual: 1
+    HasRayCastRedical: 1
+    PositionRayCastOffset: {x: 0, y: 0, z: 0}
+    RotationRaycastOffset: {x: 0, y: 0, z: 0}
+    AvatarPositionOffset: {x: 0, y: 0, z: 0}
+    AvatarRotationOffset: {x: 0, y: 0, z: 0}
+    HasTrackedRole: 0
+    TrackedRole: 0
+    HasInteractVisual: 1
+  - DeviceID: '{standable}/rendermodels/Estimated/sfbeFoot'
+    VersionNumber: 1
+    matchableDeviceIds:
+    - '{standable}/rendermodels/Estimated/sfbeFoot'
+    HasRayCastSupport: 1
+    CanDisplayPhysicalTracker: 0
+    HasRayCastVisual: 1
+    HasRayCastRedical: 1
+    PositionRayCastOffset: {x: 0, y: 0, z: 0}
+    RotationRaycastOffset: {x: 0, y: 0, z: 0}
+    AvatarPositionOffset: {x: 0, y: 0, z: 0}
+    AvatarRotationOffset: {x: 0, y: 0, z: 0}
+    HasTrackedRole: 0
+    TrackedRole: 0
+    HasInteractVisual: 1
+  - DeviceID: '{standable}/rendermodels/Estimated/sfbeChest'
+    VersionNumber: 1
+    matchableDeviceIds:
+    - '{standable}/rendermodels/Estimated/sfbeChest'
+    HasRayCastSupport: 1
+    CanDisplayPhysicalTracker: 0
+    HasRayCastVisual: 1
+    HasRayCastRedical: 1
+    PositionRayCastOffset: {x: 0, y: 0, z: 0}
+    RotationRaycastOffset: {x: 0, y: 0, z: 0}
+    AvatarPositionOffset: {x: 0, y: 0, z: 0}
+    AvatarRotationOffset: {x: 0, y: 0, z: 0}
+    HasTrackedRole: 0
+    TrackedRole: 0
+    HasInteractVisual: 1
+  - DeviceID: '{standable}/rendermodels/Estimated/sfbeElbow'
+    VersionNumber: 1
+    matchableDeviceIds:
+    - '{standable}/rendermodels/Estimated/sfbeElbow'
+    HasRayCastSupport: 1
+    CanDisplayPhysicalTracker: 0
+    HasRayCastVisual: 1
+    HasRayCastRedical: 1
+    PositionRayCastOffset: {x: 0, y: 0, z: 0}
+    RotationRaycastOffset: {x: 0, y: 0, z: 0}
+    AvatarPositionOffset: {x: 0, y: 0, z: 0}
+    AvatarRotationOffset: {x: 0, y: 0, z: 0}
+    HasTrackedRole: 0
+    TrackedRole: 0
+    HasInteractVisual: 1
+  - DeviceID: '{standable}/rendermodels/Estimated/sfbeKnee'
+    VersionNumber: 1
+    matchableDeviceIds:
+    - '{standable}/rendermodels/Estimated/sfbeKnee'
+    HasRayCastSupport: 1
+    CanDisplayPhysicalTracker: 0
+    HasRayCastVisual: 1
+    HasRayCastRedical: 1
+    PositionRayCastOffset: {x: 0, y: 0, z: 0}
+    RotationRaycastOffset: {x: 0, y: 0, z: 0}
+    AvatarPositionOffset: {x: 0, y: 0, z: 0}
+    AvatarRotationOffset: {x: 0, y: 0, z: 0}
+    HasTrackedRole: 0
+    TrackedRole: 0
+    HasInteractVisual: 1
diff --git a/Basis/Packages/com.basis.tests/Interactable/PlayerInteract.cs b/Basis/Packages/com.basis.tests/Interactable/PlayerInteract.cs
@@ -376,7 +376,7 @@ private void RemoveInput(string uid)
         }
         else
         {
-            BasisDebug.LogError("Interact Inputs has multiple inputs of the same UID. Please report this bug.");
+            BasisDebug.LogError($"Interact Inputs has multiple inputs of the same UID {uid}. Please report this bug.");
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -376,7 +376,7 @@ private void RemoveInput(string uid) @@
             }
             else
             {
-                BasisDebug.LogError("Interact Inputs has multiple inputs of the same UID. Please report this bug.");
+                BasisDebug.LogError($"Interact Inputs has multiple inputs of the same UID {uid}. Please report this bug.");
             }
         }
@@ Expand Down @@