Fixes Destroy calls on Transforms and fixes comparisons of Transforms with GameObjects

Author: Alexander Seeck

Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/BoundingBox/BoundingBox.cs

@@ -80,7 +80,7 @@ private enum CardinalAxisType
         }
 
         /// <summary>
-        /// This enum is used interally to define how an object's bounds are calculated in order to fit the boundingbox
+        /// This enum is used internally to define how an object's bounds are calculated in order to fit the boundingbox
         /// to it.
         /// </summary>
         private enum BoundsCalculationMethod
@@ -297,7 +297,7 @@ public bool IsActive
         private HandleType currentHandleType;
         #endregion Private Properties
 
-        #region Monobehaviour Methods
+        #region MonoBehaviour Methods
         private void Start()
         {
             targetObject = this.gameObject;
@@ -327,7 +327,7 @@ private void Update()
 
             UpdateRigHandles();
         }
-        #endregion Monobehaviour Methods
+        #endregion MonoBehaviour Methods
 
         #region Private Methods
         private void CreateRig()
@@ -362,7 +362,7 @@ private void DestroyRig()
             {
                 for (var i = 0; i < balls.Count; i++)
                 {
-                    Destroy(balls[i]);
+                    Destroy(balls[i].gameObject);
                 }
 
                 balls.Clear();
@@ -372,7 +372,7 @@ private void DestroyRig()
             {
                 for (int i = 0; i < links.Count; i++)
                 {
-                    Destroy(links[i]);
+                    Destroy(links[i].gameObject);
                 }
 
                 links.Clear();
@@ -382,15 +382,15 @@ private void DestroyRig()
             {
                 for (var i = 0; i < corners.Count; i++)
                 {
-                    Destroy(corners[i]);
+                    Destroy(corners[i].gameObject);
                 }
 
                 corners.Clear();
             }
 
             if (rigRoot != null)
             {
-                Destroy(rigRoot);
+                Destroy(rigRoot.gameObject);
             }
         }
 
@@ -496,7 +496,7 @@ private void ScaleByHandle(Vector3 newHandlePosition)
             targetObject.transform.localScale = newScale;
         }
 
-        private Vector3 GetRotationAxis(GameObject handle)
+        private Vector3 GetRotationAxis(Transform handle)
         {
             for (int i = 0; i < balls.Count; ++i)
             {
@@ -926,10 +926,10 @@ private void ResetHandleVisibility()
             SetHiddenHandles();
         }
 
-        private void ShowOneHandle(GameObject handle)
+        private void ShowOneHandle(Transform handle)
         {
             //turn off all balls
-            if (balls != null)
+            if (ballRenderers != null)
             {
                 for (int i = 0; i < ballRenderers.Count; ++i)
                 {
@@ -938,7 +938,7 @@ private void ShowOneHandle(GameObject handle)
             }
 
             //turn off all corners
-            if (corners != null)
+            if (cornerRenderers != null)
             {
                 for (int i = 0; i < cornerRenderers.Count; ++i)
                 {
@@ -1043,7 +1043,7 @@ private void UpdateRigHandles()
             }
         }
 
-        private HandleType GetHandleType(GameObject handle)
+        private HandleType GetHandleType(Transform handle)
         {
             for (int i = 0; i < balls.Count; ++i)
             {
@@ -1201,15 +1201,16 @@ public void OnInputDown(InputEventData eventData)
                         currentInputSource = eventData.InputSource;
                         currentPointer = pointer;
                         grabbedHandle = grabbedCollider.gameObject;
-                        currentHandleType = GetHandleType(grabbedHandle);
-                        currentRotationAxis = GetRotationAxis(grabbedHandle);
+                        Transform grabbedHandleTransform = grabbedHandle.transform;
+                        currentHandleType = GetHandleType(grabbedHandleTransform);
+                        currentRotationAxis = GetRotationAxis(grabbedHandleTransform);
                         currentPointer.TryGetPointingRay(out initialGrabRay);
                         initialGrabMag = distance;
                         initialGrabbedPosition = grabbedHandle.transform.position;
                         initialGrabbedCentroid = targetObject.transform.position;
                         initialScale = targetObject.transform.localScale;
                         pointer.TryGetPointerPosition(out initialGrabPoint);
-                        ShowOneHandle(grabbedHandle);
+                        ShowOneHandle(grabbedHandleTransform);
                         initialGazePoint = Vector3.zero;
                     }
                 }