Avoid "Recursive UpdateModel call" warnings

lawwong · lawwong · commit 32c8499d96f0 · 2022-02-21T15:46:49.000+08:00
diff --git a/Assets/HTC.UnityPlugin/VRModule/Modules/OculusVRModule.cs b/Assets/HTC.UnityPlugin/VRModule/Modules/OculusVRModule.cs
@@ -824,20 +824,20 @@ public override void BeforeRenderUpdate()
                         break;
                 }
 
-                if (!prevState.isPoseValid)
-                {
-                    if (currState.isPoseValid)
-                    {
-                        Debug.Log("[VIU][OculusVRModule] " + currState.deviceModel + " pose valid.");
-                    }
-                }
-                else
-                {
-                    if (!currState.isPoseValid)
-                    {
-                        Debug.Log("[VIU][OculusVRModule] " + prevState.deviceModel + " pose invalid.");
-                    }
-                }
+                //if (!prevState.isPoseValid)
+                //{
+                //    if (currState.isPoseValid)
+                //    {
+                //        Debug.Log("[VIU][OculusVRModule] " + currState.deviceModel + " pose valid.");
+                //    }
+                //}
+                //else
+                //{
+                //    if (!currState.isPoseValid)
+                //    {
+                //        Debug.Log("[VIU][OculusVRModule] " + prevState.deviceModel + " pose invalid.");
+                //    }
+                //}
             }
 
             ProcessConnectedDeviceChanged();
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Misc/RenderModelHook.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Misc/RenderModelHook.cs
@@ -364,12 +364,12 @@ private void Awake()
 
         protected virtual void OnEnable()
         {
+            UpdateModel();
+
             VRModule.onActiveModuleChanged += OnActiveModuleChanged;
             VRModule.onControllerRoleChanged += UpdateModel;
             m_viveRole.onDeviceIndexChanged += OnDeviceIndexChanged;
             m_viveRole.onRoleChanged += UpdateModel;
-
-            UpdateModel();
         }
 
         protected virtual void OnDisable()

Original file line number	Diff line number	Diff line change
`@@ -364,12 +364,12 @@ private void Awake()`
`364`	`364`
`365`	`365`	`protected virtual void OnEnable()`
`366`	`366`	`{`
	`367`	`+ UpdateModel();`
	`368`	`+`
`367`	`369`	`VRModule.onActiveModuleChanged += OnActiveModuleChanged;`
`368`	`370`	`VRModule.onControllerRoleChanged += UpdateModel;`
`369`	`371`	`m_viveRole.onDeviceIndexChanged += OnDeviceIndexChanged;`
`370`	`372`	`m_viveRole.onRoleChanged += UpdateModel;`
`371`		`-`
`372`		`- UpdateModel();`
`373`	`373`	`}`
`374`	`374`
`375`	`375`	`protected virtual void OnDisable()`