Adding ability to change handedness in ControllerFinder, instead of destroying/instantiating

Author: keveleigh

Assets/HoloToolkit/Input/Scripts/Focus/SimpleSinglePointerSelector.cs

@@ -39,6 +39,8 @@ public class SimpleSinglePointerSelector : MonoBehaviour, ISourceStateHandler, I
         [SerializeField]
         private GameObject linePointerPrefab;
 
+        private PointerLine instantiatedPointerLine;
+
         #endregion
 
         #region Data
@@ -301,30 +303,39 @@ private void AttachInputSourcePointer(IInputSource inputSource, uint sourceId)
             inputSourcePointer.ExtentOverride = null;
             inputSourcePointer.PrioritizedLayerMasksOverride = null;
 
-            if (inputSourcePointer.PointerRay != null)
+            InteractionInputSource interactionInputSource = inputSource as InteractionInputSource;
+
+            if (interactionInputSource == null)
             {
-                Destroy(inputSourcePointer.PointerRay.gameObject);
+                return;
             }
 
-            if (inputSource is InteractionInputSource && linePointerPrefab != null)
+            if (linePointerPrefab == null)
+            {
+                return;
+            }
+
+            if (instantiatedPointerLine == null)
+            {
+                instantiatedPointerLine = Instantiate(linePointerPrefab).GetComponent<PointerLine>();
+            }
+
+            inputSourcePointer.PointerRay = instantiatedPointerLine;
+
+            Handedness handedness;
+            if (interactionInputSource.TryGetHandedness(sourceId, out handedness))
             {
-                inputSourcePointer.PointerRay = Instantiate(linePointerPrefab).GetComponent<PointerLine>();
-                inputSourcePointer.PointerRay.ExtentOverride = Cursor.DefaultCursorDistance;
-                Handedness handedness;
-                if (((InteractionInputSource)inputSource).TryGetHandedness(sourceId, out handedness))
-                {
 #if UNITY_WSA && UNITY_2017_2_OR_NEWER
-                    inputSourcePointer.PointerRay.Handedness = (InteractionSourceHandedness)handedness;
+                instantiatedPointerLine.ChangeHandedness((InteractionSourceHandedness)handedness);
 #endif
-                }
             }
         }
 
         private void DetachInputSourcePointer()
         {
-            if (inputSourcePointer.PointerRay != null)
+            if (instantiatedPointerLine != null)
             {
-                Destroy(inputSourcePointer.PointerRay.gameObject);
+                Destroy(instantiatedPointerLine.gameObject);
             }
         }
 

Assets/HoloToolkit/Input/Scripts/Utilities/ControllerFinder.cs

@@ -90,6 +90,18 @@ protected virtual void OnDestroy()
 #endif
         }
 
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
+        public void ChangeHandedness(InteractionSourceHandedness newHandedness)
+        {
+            if (newHandedness != handedness)
+            {
+                RemoveControllerTransform(ControllerInfo);
+                handedness = newHandedness;
+                CheckModelAlreadyLoaded();
+            }
+        }
+#endif
+
         protected virtual void AddControllerTransform(MotionControllerInfo newController)
         {
 #if UNITY_WSA && UNITY_2017_2_OR_NEWER