Add VIVE Focus controller model name

* Update Finch and Chirp model name

Author: ChengNan Yang

Assets/HTC.UnityPlugin/VRModule/Modules/WaveVRModule.cs

@@ -247,6 +247,11 @@ private Transform FindWaveVRControllerActionsObjInChildren()
         private IVRModuleDeviceStateRW m_rightState;
         private IVRModuleDeviceStateRW m_leftState;
         private WaveVR_ControllerLoader.ControllerHand[] m_deviceHands = new WaveVR_ControllerLoader.ControllerHand[DEVICE_COUNT];
+        private static Dictionary<string, VRModuleDeviceModel> m_models = new Dictionary<string, VRModuleDeviceModel>
+        {
+            {"WVR_CONTROLLER_FINCH3DOF_2_0", VRModuleDeviceModel.ViveFocusFinch},
+            {"WVR_CONTROLLER_ASPEN_MI6_1", VRModuleDeviceModel.ViveFocusChirp}
+        };
 
         #region 6Dof Controller Simulation
 
@@ -280,12 +285,6 @@ static WaveVRModule()
             s_type2class[(int)WVR_DeviceType.WVR_DeviceType_Controller_Right] = VRModuleDeviceClass.Controller;
             s_type2class[(int)WVR_DeviceType.WVR_DeviceType_Controller_Left] = VRModuleDeviceClass.Controller;
 
-            s_type2model = new VRModuleDeviceModel[s_type2index.Length];
-            for (int i = 0; i < s_type2model.Length; ++i) { s_type2model[i] = VRModuleDeviceModel.Unknown; }
-            s_type2model[(int)WVR_DeviceType.WVR_DeviceType_HMD] = VRModuleDeviceModel.ViveFocusHMD;
-            s_type2model[(int)WVR_DeviceType.WVR_DeviceType_Controller_Right] = VRModuleDeviceModel.ViveFocusFinch;
-            s_type2model[(int)WVR_DeviceType.WVR_DeviceType_Controller_Left] = VRModuleDeviceModel.ViveFocusFinch;
-
             s_simulatedCtrlPosArray = new Vector3[s_type2index.Length];
         }
 
@@ -544,7 +543,7 @@ private IVRModuleDeviceStateRW UpdateDevicePose(uint deviceIndex, WaveVR.Device
                 {
                     currState.isConnected = true;
                     currState.deviceClass = s_type2class[(int)content.type];
-                    currState.deviceModel = s_type2model[(int)content.type];
+                    currState.deviceModel = QueryDeviceModel(s_type2class[(int)content.type]);
                     currState.serialNumber = content.type.ToString();
                     currState.modelNumber = content.type.ToString();
                     currState.renderModelName = content.type.ToString();
@@ -799,6 +798,30 @@ public override void TriggerViveControllerHaptic(uint deviceIndex, ushort durati
             }
         }
 
+        private VRModuleDeviceModel QueryDeviceModel(VRModuleDeviceClass device)
+        {
+            if (device.Equals(VRModuleDeviceClass.HMD))
+            {
+                return VRModuleDeviceModel.ViveFocusHMD;
+            }
+            else if (device.Equals(VRModuleDeviceClass.Controller))
+            {
+                VRModuleDeviceModel model;
+                if (m_models.TryGetValue(WaveVR_Utils.GetControllerName(WaveVR_Controller.EDeviceType.Dominant), out model))
+                {
+                    return model;
+                }
+                else
+                {
+                    return VRModuleDeviceModel.Unknown;
+                }
+            }
+            else
+            {
+                return VRModuleDeviceModel.Unknown;
+            }
+        }
+
 #if VIU_WAVEVR_3_1_0_OR_NEWER
         public override void TriggerHapticVibration(uint deviceIndex, float durationSeconds = 0.01f, float frequency = 85, float amplitude = 0.125f, float startSecondsFromNow = 0)
         {

Assets/HTC.UnityPlugin/VRModule/VRModuleBase.cs

@@ -333,8 +333,16 @@ protected static void SetupKnownDeviceModel(IVRModuleDeviceStateRW deviceState)
                             deviceState.deviceModel = VRModuleDeviceModel.ViveFocusHMD;
                             return;
                         case VRModuleDeviceClass.Controller:
-                            deviceState.input2DType = VRModuleInput2DType.TouchpadOnly;
-                            deviceState.deviceModel = VRModuleDeviceModel.ViveFocusChirp;
+                            if (deviceState.renderModelName.Equals("WVR_CONTROLLER_FINCH3DOF_2_0"))
+                            {
+                                deviceState.input2DType = VRModuleInput2DType.TouchpadOnly;
+                                deviceState.deviceModel = VRModuleDeviceModel.ViveFocusFinch;
+                            }
+                            else if (deviceState.renderModelName.Equals("WVR_CONTROLLER_ASPEN_MI6_1"))
+                            {
+                                deviceState.input2DType = VRModuleInput2DType.TouchpadOnly;
+                                deviceState.deviceModel = VRModuleDeviceModel.ViveFocusChirp;
+                            }
                             return;
                     }
                 }

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Misc/BasicGrabbable.cs

@@ -16,7 +16,7 @@ public class BasicGrabbable : GrabbableBase<BasicGrabbable.Grabber>
         , IColliderEventDragFixedUpdateHandler
         , IColliderEventDragUpdateHandler
         , IColliderEventDragEndHandler
-		, IColliderEventPressUpHandler
+        , IColliderEventPressUpHandler
     {
         [Serializable]
         public class UnityEventGrabbable : UnityEvent<BasicGrabbable> { }