Add ViveUltimateTracker support

Author: ChengNan

Assets/HTC.UnityPlugin/VRModule/VRModuleBase.cs

@@ -36,6 +36,7 @@ protected enum DefaultModuleOrder
 
             private static readonly Regex s_viveRgx = new Regex("^.*(vive|htc).*$", REGEX_OPTIONS);
             private static readonly Regex s_viveCosmosRgx = new Regex("^.*(cosmos).*$", REGEX_OPTIONS);
+            private static readonly Regex s_viveUltRgx = new Regex("^.*ultimate.*$", REGEX_OPTIONS);
             private static readonly Regex s_focus3Rgx = new Regex("focus[\\s_\\-]*3", REGEX_OPTIONS);
             private static readonly Regex s_ver3Rgx = new Regex("^.*3.0.*$", REGEX_OPTIONS);
             private static readonly Regex s_oculusRgx = new Regex("^.*(oculus|quest).*$", REGEX_OPTIONS);
@@ -71,7 +72,7 @@ private struct WVRCtrlProfile
                 // WVR_CR_Right_001
                 new WVRCtrlProfile { reg = new Regex("cr.+right", REGEX_OPTIONS), model = VRModuleDeviceModel.ViveFocus3ControllerRight, input2D = VRModuleInput2DType.JoystickOnly },
                 // Wave Tracker0 HTC-211012-Tracker0, Wave Tracker1 HTC-211012-Tracker1
-                new WVRCtrlProfile { reg = new Regex("^.*(tracker).*$", REGEX_OPTIONS), model = VRModuleDeviceModel.ViveWristTracker, input2D = VRModuleInput2DType.None },
+                new WVRCtrlProfile { reg = new Regex("^.*(tracker[0|1]).*$", REGEX_OPTIONS), model = VRModuleDeviceModel.ViveWristTracker, input2D = VRModuleInput2DType.None },
             };
 
             public bool isActivated { get; private set; }
@@ -214,7 +215,11 @@ protected static void SetupKnownDeviceModel(IVRModuleDeviceStateRW deviceState)
                             }
                             return;
                         case VRModuleDeviceClass.GenericTracker:
-                            if (s_ver3Rgx.IsMatch(deviceState.modelNumber))
+                            if (s_viveUltRgx.IsMatch(deviceState.renderModelName))
+                            {
+                                deviceState.deviceModel = VRModuleDeviceModel.ViveUltimateTracker;
+                            }
+                            else if (s_ver3Rgx.IsMatch(deviceState.modelNumber))
                             {
                                 deviceState.deviceModel = VRModuleDeviceModel.ViveTracker3;
                             }

Assets/HTC.UnityPlugin/VRModule/VRModuleDeviceState.cs

@@ -75,6 +75,7 @@ public enum VRModuleDeviceModel
         ViveWristTracker,
         OculusTouchProLeft,
         OculusTouchProRight,
+        ViveUltimateTracker,
     }
 
     public enum VRModuleRawButton

Assets/HTC.UnityPlugin/ViveInputUtility/Resources/Models/ObjModelViveUltimateTracker.fbx

@@ -0,0 +1,109 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6734541192188514468
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2268688005838436399}
+  m_Layer: 0
+  m_Name: VIUModelViveUltimateTracker
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2268688005838436399
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6734541192188514468}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7999427570738900244}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &3060504019060524558
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 2268688005838436399}
+    m_Modifications:
+    - target: {fileID: -4216859302048453862, guid: 610c6a4504338614eb8afbb41a153004,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 610c6a4504338614eb8afbb41a153004,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 610c6a4504338614eb8afbb41a153004,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 610c6a4504338614eb8afbb41a153004,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 610c6a4504338614eb8afbb41a153004,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 610c6a4504338614eb8afbb41a153004,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 610c6a4504338614eb8afbb41a153004,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 610c6a4504338614eb8afbb41a153004,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 610c6a4504338614eb8afbb41a153004,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 610c6a4504338614eb8afbb41a153004,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: 610c6a4504338614eb8afbb41a153004,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -927199367670048503, guid: 610c6a4504338614eb8afbb41a153004,
+        type: 3}
+      propertyPath: m_Name
+      value: ObjModelViveUltimateTracker
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 610c6a4504338614eb8afbb41a153004, type: 3}
+--- !u!4 &7999427570738900244 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 610c6a4504338614eb8afbb41a153004,
+    type: 3}
+  m_PrefabInstance: {fileID: 3060504019060524558}
+  m_PrefabAsset: {fileID: 0}

Assets/HTC.UnityPlugin/ViveInputUtility/Resources/Models/ObjModelViveUltimateTracker.fbx.meta

@@ -250,6 +250,7 @@ public enum OverrideModelEnum
             OculusQuest2ControllerLeft = VRModuleDeviceModel.OculusQuest2ControllerLeft,
             OculusQuest2ControllerRight = VRModuleDeviceModel.OculusQuest2ControllerRight,
             ViveWristTracker = VRModuleDeviceModel.ViveWristTracker,
+            ViveUltimateTracker = VRModuleDeviceModel.ViveUltimateTracker,
         }
 
         [SerializeField]