Add UnknownControllerState from CommonUsages

Author: lawwong

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

@@ -120,7 +120,7 @@ protected override void UpdateNewConnectedInputDevice(IVRModuleDeviceStateRW sta
                     updateFunc = UpdateWaveCRControllerState;
                     break;
                 default:
-                    updateFunc = null;
+                    updateFunc = UpdateUnknownControllerState;
                     break;
             }
 
@@ -176,6 +176,48 @@ private void UpdateControllerState(IVRModuleDeviceStateRW state, InputDevice dev
             }
         }
 
+        private void UpdateUnknownControllerState(IVRModuleDeviceStateRW state, InputDevice device)
+        {
+            bool primaryButton = GetDeviceFeatureValueOrDefault(device, CommonUsages.primaryButton);
+            bool primaryTouch = GetDeviceFeatureValueOrDefault(device, CommonUsages.primaryTouch);
+            bool secondaryButton = GetDeviceFeatureValueOrDefault(device, CommonUsages.secondaryButton);
+            bool secondaryTouch = GetDeviceFeatureValueOrDefault(device, CommonUsages.secondaryTouch);
+            bool gripButton = GetDeviceFeatureValueOrDefault(device, CommonUsages.gripButton);
+            bool triggerButton = GetDeviceFeatureValueOrDefault(device, CommonUsages.triggerButton);
+            bool menuButton = GetDeviceFeatureValueOrDefault(device, CommonUsages.menuButton);
+            bool primary2DAxisClick = GetDeviceFeatureValueOrDefault(device, CommonUsages.primary2DAxisClick);
+            bool primary2DAxisTouch = GetDeviceFeatureValueOrDefault(device, CommonUsages.primary2DAxisTouch);
+            bool secondary2DAxisClick = GetDeviceFeatureValueOrDefault(device, CommonUsages.secondary2DAxisClick);
+            bool secondary2DAxisTouch = GetDeviceFeatureValueOrDefault(device, CommonUsages.secondary2DAxisTouch);
+
+            float triggerValue = GetDeviceFeatureValueOrDefault(device, CommonUsages.trigger);
+            float gripValue = GetDeviceFeatureValueOrDefault(device, CommonUsages.grip);
+
+            Vector2 primary2DAxisValue = GetDeviceFeatureValueOrDefault(device, CommonUsages.primary2DAxis);
+            Vector2 secondary2DAxisValue = GetDeviceFeatureValueOrDefault(device, CommonUsages.secondary2DAxis);
+
+            state.SetButtonPress(VRModuleRawButton.A, primaryButton);
+            state.SetButtonPress(VRModuleRawButton.ApplicationMenu, secondaryButton | menuButton);
+            state.SetButtonPress(VRModuleRawButton.Trigger, triggerButton);
+            state.SetButtonPress(VRModuleRawButton.Grip, gripButton);
+            state.SetButtonPress(VRModuleRawButton.Touchpad, primary2DAxisClick);
+            state.SetButtonPress(VRModuleRawButton.Joystick, secondary2DAxisClick);
+
+            state.SetButtonTouch(VRModuleRawButton.A, primaryTouch);
+            state.SetButtonTouch(VRModuleRawButton.ApplicationMenu, secondaryTouch | menuButton);
+            state.SetButtonTouch(VRModuleRawButton.Trigger, triggerButton);
+            state.SetButtonTouch(VRModuleRawButton.Grip, gripButton);
+            state.SetButtonTouch(VRModuleRawButton.Touchpad, primary2DAxisTouch);
+            state.SetButtonTouch(VRModuleRawButton.Joystick, secondary2DAxisTouch);
+            
+            state.SetAxisValue(VRModuleRawAxis.Trigger, triggerValue);
+            state.SetAxisValue(VRModuleRawAxis.CapSenseGrip, gripValue);
+            state.SetAxisValue(VRModuleRawAxis.TouchpadX, primary2DAxisValue.x);
+            state.SetAxisValue(VRModuleRawAxis.TouchpadY, primary2DAxisValue.y);
+            state.SetAxisValue(VRModuleRawAxis.JoystickX, secondary2DAxisValue.x);
+            state.SetAxisValue(VRModuleRawAxis.JoystickY, secondary2DAxisValue.y);
+        }
+
         private void UpdateViveControllerState(IVRModuleDeviceStateRW state, InputDevice device)
         {
             bool menuButton = GetDeviceFeatureValueOrDefault(device, CommonUsages.menuButton);

Assets/HTC.UnityPlugin/VRModule/Submodules/ViveHandTrackingSubmodule.cs

@@ -71,7 +71,7 @@ private IEnumerator StartDetectionCoroutine()
                             retryCount = RETRY_COUNT;
                             lastResultFrame = -1;
                             isStarted = true;
-                            Debug.Log(LOG_PREFIX + "StartGestureDetection");
+                            Debug.Log(LOG_PREFIX + "Detection started");
                             break;
                         case GestureFailure.Camera:
                             --retryCount;
@@ -121,7 +121,7 @@ protected override void OnUpdateDeviceConnectionAndPoses()
 
             if (resultFrame < 0)
             {
-                Debug.Log("[ViveHandTrackingSubmodule] Detection stopped!");
+                Debug.Log(LOG_PREFIX + "Detection stopped");
                 isStarted = false;
                 return;
             }

Assets/HTC.UnityPlugin/VRModule/VRModuleBase.cs

@@ -386,6 +386,7 @@ protected static void SetupKnownDeviceModel(IVRModuleDeviceStateRW deviceState)
                 }
 
                 deviceState.deviceModel = VRModuleDeviceModel.Unknown;
+                deviceState.input2DType = VRModuleInput2DType.Unknown;
             }
 
             public static bool AxisToPress(bool previousPressedState, float currentAxisValue, float setThreshold, float unsetThreshold)