WebXRControllerModel optimizations

Author: De-Panther

Packages/webxr-interactions/Runtime/InputSystem/WebXRControllerModel.cs

@@ -169,7 +169,8 @@ public UpdateType updateType
     bool m_RotationBound;
     bool m_PositionBound;
     bool m_TrackingStateBound;
-    private bool visualActionsInit;
+    private bool visualActionsBound;
+    private bool visualActionsUpdated;
     bool m_IsFirstUpdate = true;
 
     private Transform xrControllerOldModel;
@@ -180,14 +181,15 @@ void BindActions()
       BindPosition();
       BindRotation();
       BindTrackingState();
-      InitVisualActions();
+      BindVisualActions();
     }
 
     void UnbindActions()
     {
       UnbindPosition();
       UnbindRotation();
       UnbindTrackingState();
+      UnbindVisualActions();
     }
 
     void BindPosition()
@@ -232,9 +234,9 @@ void BindTrackingState()
       m_TrackingStateBound = true;
     }
 
-    void InitVisualActions()
+    void BindVisualActions()
     {
-      if (visualActionsInit)
+      if (visualActionsBound)
         return;
 
       buttonActions = new InputAction[6];
@@ -248,7 +250,18 @@ void InitVisualActions()
       axisActions[0] = touchpadActionProperty.action;
       axisActions[1] = thumbstickActionProperty.action;
 
-      visualActionsInit = true;
+      for (int i = 0; i < buttonActions.Length; i++)
+      {
+        buttonActions[i].performed += OnVisualActionsPerformed;
+        buttonActions[i].canceled += OnVisualActionsCanceled;
+      }
+      for (int i = 0; i < axisActions.Length; i++)
+      {
+        axisActions[i].performed += OnVisualActionsPerformed;
+        axisActions[i].canceled += OnVisualActionsCanceled;
+      }
+
+      visualActionsBound = true;
     }
 
     void UnbindPosition()
@@ -290,6 +303,25 @@ void UnbindTrackingState()
       m_TrackingStateBound = false;
     }
 
+    void UnbindVisualActions()
+    {
+      if (!visualActionsBound)
+        return;
+
+      for (int i = 0; i < buttonActions.Length; i++)
+      {
+        buttonActions[i].performed -= OnVisualActionsPerformed;
+        buttonActions[i].canceled -= OnVisualActionsCanceled;
+      }
+      for (int i = 0; i < axisActions.Length; i++)
+      {
+        axisActions[i].performed -= OnVisualActionsPerformed;
+        axisActions[i].canceled -= OnVisualActionsCanceled;
+      }
+
+      visualActionsBound = false;
+    }
+
     void OnPositionPerformed(InputAction.CallbackContext context)
     {
       m_CurrentPosition = context.ReadValue<Vector3>();
@@ -328,6 +360,16 @@ void OnTrackingStateCanceled(InputAction.CallbackContext context)
       }
     }
 
+    void OnVisualActionsPerformed(InputAction.CallbackContext context)
+    {
+      visualActionsUpdated = true;
+    }
+
+    void OnVisualActionsCanceled(InputAction.CallbackContext context)
+    {
+      visualActionsUpdated = true;
+    }
+
     private void Awake()
     {
       inputProfileLoader = rigOrigin.GetComponent<InputProfileLoader>();
@@ -472,7 +514,7 @@ protected virtual void OnBeforeRender()
     protected virtual void PerformUpdate()
     {
       SetLocalTransform(m_CurrentPosition, m_CurrentRotation);
-      if (loadedModel && m_CurrentTrackingState != TrackingStates.None)
+      if (loadedModel && visualActionsUpdated)
       {
         UpdateModelInput();
       }
@@ -513,6 +555,11 @@ protected virtual void SetLocalTransform(Vector3 newPosition, Quaternion newRota
 
     private void UpdateModelInput()
     {
+      if (m_CurrentTrackingState == TrackingStates.None)
+      {
+        return;
+      }
+      visualActionsUpdated = false;
       for (int i = 0; i < 6; i++)
       {
         inputProfileModel.SetButtonValue(i, buttonActions[i].ReadValue<float>());