Merge pull request #3550 from keveleigh/bounding-box-fix

Fix bounding box creation issues

Author: David Kline

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

@@ -220,18 +220,6 @@ public bool ShowRotateHandles
         private float cornerRadius = 0.03f;
         #endregion Serialized Fields
 
-        #region Constants
-        private const int LeftTopBack = 0;
-        private const int LeftTopFront = 1;
-        private const int LeftBottomFront = 2;
-        private const int LeftBottomBack = 3;
-        private const int RightTopBack = 4;
-        private const int RightTopFront = 5;
-        private const int RightBottonFront = 6;
-        private const int RightBottomBack = 7;
-        private const int CORNER_COUNT = 8;
-        #endregion Constants
-
         #region Private Properties
         private bool isActive = false;
         /// <summary>
@@ -268,7 +256,7 @@ public bool IsActive
         private Transform rigRoot;
         private BoxCollider cachedTargetCollider;
         private Vector3[] boundsCorners;
-        private Vector3 currentBoundsSize;
+        private Vector3 currentBoundsExtents;
         private BoundsCalculationMethod boundsMethod;
         private HandleMoveType handleMoveType = HandleMoveType.Point;
         private List<Transform> links;
@@ -710,12 +698,11 @@ private Bounds GetTargetBounds()
                 }
             }
 
-            //Renderer bounds is local. Requires transform to global coord system.
+            //Renderer bounds is local. Requires transform to global coordinate system.
             Renderer[] childRenderers = targetObject.GetComponentsInChildren<Renderer>();
             if (childRenderers.Length > 0)
             {
                 bounds = childRenderers[0].bounds;
-                var _corners = new Vector3[CORNER_COUNT];
 
                 for (int i = 0; i < childRenderers.Length; ++i)
                 {
@@ -724,7 +711,7 @@ private Bounds GetTargetBounds()
 
                 GetCornerPositionsFromBounds(bounds, ref boundsCorners);
 
-                for (int cornerIndex = 0; cornerIndex < _corners.Length; ++cornerIndex)
+                for (int cornerIndex = 0; cornerIndex < boundsCorners.Length; ++cornerIndex)
                 {
                     GameObject cube = GameObject.CreatePrimitive(PrimitiveType.Cube);
                     cube.name = cornerIndex.ToString();
@@ -850,14 +837,14 @@ private void CalculateEdgeCenters()
             if (boundsCorners != null && edgeCenters != null)
             {
                 edgeCenters[0] = (boundsCorners[0] + boundsCorners[1]) * 0.5f;
-                edgeCenters[1] = (boundsCorners[1] + boundsCorners[2]) * 0.5f;
-                edgeCenters[2] = (boundsCorners[2] + boundsCorners[3]) * 0.5f;
-                edgeCenters[3] = (boundsCorners[3] + boundsCorners[0]) * 0.5f;
+                edgeCenters[1] = (boundsCorners[0] + boundsCorners[2]) * 0.5f;
+                edgeCenters[2] = (boundsCorners[3] + boundsCorners[2]) * 0.5f;
+                edgeCenters[3] = (boundsCorners[3] + boundsCorners[1]) * 0.5f;
 
                 edgeCenters[4] = (boundsCorners[4] + boundsCorners[5]) * 0.5f;
-                edgeCenters[5] = (boundsCorners[5] + boundsCorners[6]) * 0.5f;
-                edgeCenters[6] = (boundsCorners[6] + boundsCorners[7]) * 0.5f;
-                edgeCenters[7] = (boundsCorners[7] + boundsCorners[4]) * 0.5f;
+                edgeCenters[5] = (boundsCorners[4] + boundsCorners[6]) * 0.5f;
+                edgeCenters[6] = (boundsCorners[7] + boundsCorners[6]) * 0.5f;
+                edgeCenters[7] = (boundsCorners[7] + boundsCorners[5]) * 0.5f;
 
                 edgeCenters[8] = (boundsCorners[0] + boundsCorners[4]) * 0.5f;
                 edgeCenters[9] = (boundsCorners[1] + boundsCorners[5]) * 0.5f;
@@ -892,7 +879,7 @@ private Vector3 ClampScale(Vector3 scale, out bool clamped)
         private Vector3 GetLinkDimensions()
         {
             float linkLengthAdjustor = wireframeShape == WireframeType.Cubic ? 2.0f : 1.0f - (6.0f * linkRadius);
-            return (currentBoundsSize * linkLengthAdjustor) + new Vector3(linkRadius, linkRadius, linkRadius);
+            return (currentBoundsExtents * linkLengthAdjustor) + new Vector3(linkRadius, linkRadius, linkRadius);
         }
 
         private void ResetHandleVisibility()
@@ -957,50 +944,36 @@ private void ShowOneHandle(Transform handle)
 
         private void UpdateBounds()
         {
-            Vector3 boundsSize = Vector3.zero;
-            Vector3 centroid = Vector3.zero;
-
-            //store current rotation then zero out the rotation so that the bounds
-            //are computed when the object is in its 'axis aligned orientation'.
-            Quaternion currentRotation = targetObject.transform.rotation;
-            targetObject.transform.rotation = Quaternion.identity;
-
             if (cachedTargetCollider != null)
             {
-                Bounds colliderBounds = cachedTargetCollider.bounds;
-                boundsSize = colliderBounds.extents;
-                centroid = colliderBounds.center;
-            }
-
-            //after bounds are computed, restore rotation...
-            targetObject.transform.rotation = currentRotation;
-
-            if (boundsSize != Vector3.zero)
-            {
-                if (flattenAxis == FlattenModeType.FlattenAuto)
-                {
-                    float min = Mathf.Min(boundsSize.x, Mathf.Min(boundsSize.y, boundsSize.z));
-                    flattenAxis = min.Equals(boundsSize.x) ? FlattenModeType.FlattenX : (min.Equals(boundsSize.y) ? FlattenModeType.FlattenY : FlattenModeType.FlattenZ);
-                }
+                // Store current rotation then zero out the rotation so that the bounds
+                // are computed when the object is in its 'axis aligned orientation'.
+                Quaternion currentRotation = targetObject.transform.rotation;
+                targetObject.transform.rotation = Quaternion.identity;
+                Physics.SyncTransforms(); // Update collider bounds
 
-                boundsSize.x = flattenAxis == FlattenModeType.FlattenX ? 0.0f : boundsSize.x;
-                boundsSize.y = flattenAxis == FlattenModeType.FlattenY ? 0.0f : boundsSize.y;
-                boundsSize.z = flattenAxis == FlattenModeType.FlattenZ ? 0.0f : boundsSize.z;
+                Vector3 boundsExtents = cachedTargetCollider.bounds.extents;
 
-                currentBoundsSize = boundsSize;
-                boundsCentroid = centroid;
+                // After bounds are computed, restore rotation...
+                targetObject.transform.rotation = currentRotation;
+                Physics.SyncTransforms();
 
-                boundsCorners[0] = centroid - new Vector3(centroid.x - currentBoundsSize.x, centroid.y - currentBoundsSize.y, centroid.z - currentBoundsSize.z);
-                boundsCorners[1] = centroid - new Vector3(centroid.x + currentBoundsSize.x, centroid.y - currentBoundsSize.y, centroid.z - currentBoundsSize.z);
-                boundsCorners[2] = centroid - new Vector3(centroid.x + currentBoundsSize.x, centroid.y + currentBoundsSize.y, centroid.z - currentBoundsSize.z);
-                boundsCorners[3] = centroid - new Vector3(centroid.x - currentBoundsSize.x, centroid.y + currentBoundsSize.y, centroid.z - currentBoundsSize.z);
+                if (boundsExtents != Vector3.zero)
+                {
+                    if (flattenAxis == FlattenModeType.FlattenAuto)
+                    {
+                        float min = Mathf.Min(boundsExtents.x, Mathf.Min(boundsExtents.y, boundsExtents.z));
+                        flattenAxis = min.Equals(boundsExtents.x) ? FlattenModeType.FlattenX : (min.Equals(boundsExtents.y) ? FlattenModeType.FlattenY : FlattenModeType.FlattenZ);
+                    }
 
-                boundsCorners[4] = centroid - new Vector3(centroid.x - currentBoundsSize.x, centroid.y - currentBoundsSize.y, centroid.z + currentBoundsSize.z);
-                boundsCorners[5] = centroid - new Vector3(centroid.x + currentBoundsSize.x, centroid.y - currentBoundsSize.y, centroid.z + currentBoundsSize.z);
-                boundsCorners[6] = centroid - new Vector3(centroid.x + currentBoundsSize.x, centroid.y + currentBoundsSize.y, centroid.z + currentBoundsSize.z);
-                boundsCorners[7] = centroid - new Vector3(centroid.x - currentBoundsSize.x, centroid.y + currentBoundsSize.y, centroid.z + currentBoundsSize.z);
+                    boundsExtents.x = flattenAxis == FlattenModeType.FlattenX ? 0.0f : boundsExtents.x;
+                    boundsExtents.y = flattenAxis == FlattenModeType.FlattenY ? 0.0f : boundsExtents.y;
+                    boundsExtents.z = flattenAxis == FlattenModeType.FlattenZ ? 0.0f : boundsExtents.z;
+                    currentBoundsExtents = boundsExtents;
 
-                CalculateEdgeCenters();
+                    GetCornerPositionsFromBounds(new Bounds(Vector3.zero, boundsExtents * 2.0f), ref boundsCorners);
+                    CalculateEdgeCenters();
+                }
             }
         }
 
@@ -1148,28 +1121,22 @@ private void SetHiddenHandles()
 
         private void GetCornerPositionsFromBounds(Bounds bounds, ref Vector3[] positions)
         {
-            Vector3 center = bounds.center;
-            Vector3 extents = bounds.extents;
-            float leftEdge = center.x - extents.x;
-            float rightEdge = center.x + extents.x;
-            float bottomEdge = center.y - extents.y;
-            float topEdge = center.y + extents.y;
-            float frontEdge = center.z - extents.z;
-            float backEdge = center.z + extents.z;
-
-            if (positions == null || positions.Length != CORNER_COUNT)
-            {
-                positions = new Vector3[CORNER_COUNT];
-            }
-
-            positions[LeftBottomFront] = new Vector3(leftEdge, bottomEdge, frontEdge);
-            positions[LeftBottomBack] = new Vector3(leftEdge, bottomEdge, backEdge);
-            positions[LeftTopFront] = new Vector3(leftEdge, topEdge, frontEdge);
-            positions[LeftTopBack] = new Vector3(leftEdge, topEdge, backEdge);
-            positions[RightBottonFront] = new Vector3(rightEdge, bottomEdge, frontEdge);
-            positions[RightBottomBack] = new Vector3(rightEdge, bottomEdge, backEdge);
-            positions[RightTopFront] = new Vector3(rightEdge, topEdge, frontEdge);
-            positions[RightTopBack] = new Vector3(rightEdge, topEdge, backEdge);
+            int numCorners = 1 << 3;
+            if (positions == null || positions.Length != numCorners)
+            {
+                positions = new Vector3[numCorners];
+            }
+
+            // Permutate all axes using minCorner and maxCorner.
+            Vector3 minCorner = bounds.center - bounds.extents;
+            Vector3 maxCorner = bounds.center + bounds.extents;
+            for (int c = 0; c < numCorners; c++)
+            {
+                positions[c] = new Vector3(
+                    (c & (1 << 0)) == 0 ? minCorner[0] : maxCorner[0],
+                    (c & (1 << 1)) == 0 ? minCorner[1] : maxCorner[1],
+                    (c & (1 << 2)) == 0 ? minCorner[2] : maxCorner[2]);
+            }
         }
 
         private static Vector3 PointToRay(Vector3 origin, Vector3 end, Vector3 closestPoint)