Add back RoleChangedEvent, remove unused code

Author: lawwong

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

@@ -55,8 +55,6 @@ public override void CreateCamera(VRCameraHook hook)
         [RenderModelHook.CreatorPriorityAttirbute(0)]
         private class RenderModelCreator : RenderModelHook.DefaultRenderModelCreator
         {
-            private uint m_index = INVALID_DEVICE_INDEX;
-
             public override bool shouldActive { get { return s_moduleInstance == null ? false : s_moduleInstance.isActivated; } }
 
             public override void UpdateRenderModel()
@@ -97,20 +95,9 @@ public override void UpdateRenderModel()
                     }
                 }
                 else
-                {
-                    base.UpdateRenderModel();
-                }
-#else
-                base.UpdateRenderModel();
 #endif
-            }
-
-            public override void CleanUpRenderModel()
-            {
-                if (m_model != null)
                 {
-                    UnityEngine.Object.Destroy(m_model);
-                    m_model = null;
+                    base.UpdateRenderModel();
                 }
             }
         }
@@ -243,6 +230,7 @@ public override void BeforeRenderUpdate()
                 currState.isConnected = false;
             }
 
+            bool roleChanged = false;
             InputDevices.GetDevices(m_connectedDevices);
             foreach (InputDevice device in m_connectedDevices)
             {
@@ -261,10 +249,12 @@ public override void BeforeRenderUpdate()
                     if ((device.characteristics & InputDeviceCharacteristics.Left) > 0u)
                     {
                         m_leftHandedDeviceIndex = deviceIndex;
+                        roleChanged = true;
                     }
                     else if ((device.characteristics & InputDeviceCharacteristics.Right) > 0u)
                     {
                         m_rightHandedDeviceIndex = deviceIndex;
+                        roleChanged = true;
                     }
 
                     Debug.LogFormat("Device connected: {0} / {1} / {2} / {3} / {4} / {5} ({6})", deviceIndex, currState.deviceClass, currState.deviceModel, currState.modelNumber, currState.serialNumber, device.name, device.characteristics);
@@ -291,13 +281,24 @@ public override void BeforeRenderUpdate()
                 if (!currState.isConnected)
                 {
                     currState.Reset();
-                    if (deviceIndex == m_leftHandedDeviceIndex) { m_leftHandedDeviceIndex = VRModule.INVALID_DEVICE_INDEX; }
-                    else if (deviceIndex == m_rightHandedDeviceIndex) { m_rightHandedDeviceIndex = VRModule.INVALID_DEVICE_INDEX; }
+
+                    if (deviceIndex == m_leftHandedDeviceIndex)
+                    {
+                        m_leftHandedDeviceIndex = VRModule.INVALID_DEVICE_INDEX;
+                        roleChanged = true;
+                    }
+                    else if (deviceIndex == m_rightHandedDeviceIndex)
+                    {
+                        m_rightHandedDeviceIndex = VRModule.INVALID_DEVICE_INDEX;
+                        roleChanged = true;
+                    }
                 }
 
                 ++deviceIndex;
             }
 
+            if (roleChanged) { InvokeControllerRoleChangedEvent(); }
+
             ProcessConnectedDeviceChanged();
             ProcessDevicePoseChanged();
             ProcessDeviceInputChanged();
@@ -428,42 +429,6 @@ private void UpdateControllerState(IVRModuleDeviceStateRW state, InputDevice dev
             }
         }
 
-        private void UpdateHandHeldDeviceIndex()
-        {
-            uint leftHandedDeviceIndex = INVALID_DEVICE_INDEX;
-            InputDevice leftHandedDevice = InputDevices.GetDeviceAtXRNode(XRNode.LeftHand);
-            if (leftHandedDevice.isValid)
-            {
-                leftHandedDeviceIndex = GetDeviceIndex(GetDeviceUID(leftHandedDevice));
-            }
-
-            uint rightHandedDeviceIndex = INVALID_DEVICE_INDEX;
-            InputDevice rightHandedDevice = InputDevices.GetDeviceAtXRNode(XRNode.RightHand);
-            if (rightHandedDevice.isValid)
-            {
-                rightHandedDeviceIndex = GetDeviceIndex(GetDeviceUID(rightHandedDevice));
-            }
-
-            if (m_rightHandedDeviceIndex != rightHandedDeviceIndex || m_leftHandedDeviceIndex != leftHandedDeviceIndex)
-            {
-                InvokeControllerRoleChangedEvent();
-            }
-
-            m_leftHandedDeviceIndex = leftHandedDeviceIndex;
-            m_rightHandedDeviceIndex = rightHandedDeviceIndex;
-        }
-
-        private uint GetDeviceIndex(int uid)
-        {
-            uint index = 0;
-            if (m_deviceUidToIndex.TryGetValue(uid, out index))
-            {
-                return index;
-            }
-
-            return INVALID_DEVICE_INDEX;
-        }
-
         private bool TryGetDevice(uint index, out InputDevice deviceOut)
         {
             deviceOut = default;

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

@@ -238,6 +238,7 @@ protected virtual void OnEnable()
         {
             VRModule.onActiveModuleChanged += OnActiveModuleChanged;
             m_viveRole.onDeviceIndexChanged += OnDeviceIndexChanged;
+            m_viveRole.onRoleChanged += UpdateModel;
 
             UpdateModel();
         }
@@ -246,6 +247,7 @@ protected virtual void OnDisable()
         {
             VRModule.onActiveModuleChanged -= OnActiveModuleChanged;
             m_viveRole.onDeviceIndexChanged -= OnDeviceIndexChanged;
+            m_viveRole.onRoleChanged -= UpdateModel;
 
             UpdateModel();
         }