Clean-up ControllerFinder's element logic until it's designed correctly for vNext

Author: keveleigh

Assets/MixedRealityToolkit-SDK/Features/Utilities/Solvers/ControllerFinder.cs

@@ -15,15 +15,6 @@ namespace Microsoft.MixedReality.Toolkit.SDK.Utilities.Solvers
     /// </summary>
     public abstract class ControllerFinder : MonoBehaviour, IMixedRealitySourceStateHandler
     {
-        //[SerializeField]
-        //private ControllerElement trackedControllerElement = ControllerElement.PointingPose;
-
-        //public ControllerElement TrackedControllerElement
-        //{
-        //    get { return trackedControllerElement; }
-        //    set { trackedControllerElement = value; }
-        //}
-
         [SerializeField]
         private Handedness handedness = Handedness.None;
 
@@ -41,8 +32,6 @@ public Handedness Handedness
             }
         }
 
-        //public Transform ElementTransform { get; private set; }
-
         protected Transform ControllerTransform;
 
         private IMixedRealityDeviceManager BaseDeviceManager => baseDeviceManager ?? (baseDeviceManager = MixedRealityManager.Instance.GetManager<IMixedRealityDeviceManager>());
@@ -111,30 +100,22 @@ protected virtual void TryAndAddControllerTransform()
 
         protected virtual void AddControllerTransform(IMixedRealityController newController)
         {
-            if (newController.ControllerHandedness == handedness && !newController.Transform.Equals(ControllerTransform))
+            if (newController.ControllerHandedness == handedness && newController.Transform != null && !newController.Transform.Equals(ControllerTransform))
             {
-                //Transform elementTransform;
-                //if (!newController.TryGetElement(trackedControllerElement, out elementTransform))
-                //{
-                //    Debug.LogError("Unable to find element of type " + trackedControllerElement + " under controller " + newController.ControllerParent.name + "; not attaching.");
-                //    return;
-                //}
-
                 ControllerTransform = newController.Transform;
 
-                //// Update ElementTransform for consumption
-                //ElementTransform = elementTransform;
-
                 OnControllerFound();
             }
         }
 
         protected virtual void RemoveControllerTransform()
         {
-            OnControllerLost();
+            if (ControllerTransform != null)
+            {
+                OnControllerLost();
 
-            ControllerTransform = null;
-            //ElementTransform = null;
+                ControllerTransform = null;
+            }
         }
 
         protected virtual void RefreshControllerTransform()