Merge pull request #6940 from thalbern/user/bethalha/bb_target

added possibility to set target of bounds control / bounding box in code

Author: keveleigh

Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/BoundsControl.cs

@@ -44,6 +44,15 @@ public GameObject Target
 
                 return targetObject;
             }
+
+            set
+            {
+                if (targetObject != value)
+                {
+                    targetObject = value;
+                    CreateRig();
+                }
+            }
         }
 
         [Tooltip("For complex objects, automatic bounds calculation may not behave as expected. Use an existing Box Collider (even on a child object) to manually determine bounds of bounds control.")]
@@ -880,7 +889,7 @@ private void InitializeRigRoot()
         {
             var rigRootObj = new GameObject(rigRootName);
             rigRoot = rigRootObj.transform;
-            rigRoot.parent = transform;
+            rigRoot.parent = Target.transform;
 
             var pH = rigRootObj.AddComponent<PointerHandler>();
             pH.OnPointerDown.AddListener(OnPointerDown);
@@ -1170,7 +1179,7 @@ private void UpdateVisuals()
                 // move rig into position and rotation
                 rigRoot.position = TargetBounds.bounds.center;
                 rigRoot.rotation = Target.transform.rotation;
-                rigRoot.parent = transform;
+                rigRoot.parent = Target.transform;
             }
         }
 

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

@@ -173,6 +173,15 @@ public GameObject Target
 
                 return targetObject;
             }
+
+            set
+            {
+                if (targetObject != value)
+                {
+                    targetObject = value;
+                    CreateRig();
+                }
+            }
         }
 
         [Tooltip("For complex objects, automatic bounds calculation may not behave as expected. Use an existing Box Collider (even on a child object) to manually determine bounds of Bounding Box.")]

Assets/MixedRealityToolkit.Tests/PlayModeTests/BoundingBoxTests.cs

@@ -37,14 +37,17 @@ public void ShutdownMrtk()
             PlayModeTestUtilities.TearDown();
         }
 
+        private readonly Vector3 boundingBoxStartCenter = Vector3.forward * 1.5f;
+        private readonly Vector3 boundingBoxStartScale = Vector3.one * 0.5f;
+
         /// <summary>
         /// Instantiates a bounding box at 0, 0, -1.5f
         /// box is at scale .5, .5, .5
         /// </summary>
         private BoundingBox InstantiateSceneAndDefaultBbox()
         {
             var cube = GameObject.CreatePrimitive(PrimitiveType.Cube);
-            cube.transform.position = Vector3.forward * 1.5f;
+            cube.transform.position = boundingBoxStartCenter;
             BoundingBox bbox = cube.AddComponent<BoundingBox>();
 
             MixedRealityPlayspace.PerformTransformation(
@@ -54,7 +57,7 @@ private BoundingBox InstantiateSceneAndDefaultBbox()
                 p.LookAt(cube.transform.position);
             });
 
-            bbox.transform.localScale *= 0.5f;
+            bbox.transform.localScale = boundingBoxStartScale;
             bbox.Active = true;
 
             return bbox;
@@ -327,6 +330,61 @@ public IEnumerator DisableObject()
             Assert.AreEqual(afterTransformScale, bbox.transform.localScale);
         }
 
+
+        /// <summary>
+        /// Tests setting a target in code that is a different gameobject than the gameobject the boundingbox component is attached to
+        /// </summary>
+        [UnityTest]
+        public IEnumerator SetTarget()
+        {
+            // create cube without control
+            var cube = GameObject.CreatePrimitive(PrimitiveType.Cube);
+            cube.transform.position = boundingBoxStartCenter;
+
+            MixedRealityPlayspace.PerformTransformation(
+            p =>
+            {
+                p.position = Vector3.zero;
+                p.LookAt(cube.transform.position);
+            });
+
+            cube.transform.localScale = boundingBoxStartScale;
+
+            // create another gameobject with boundscontrol attached 
+            var emptyGameObject = new GameObject("empty");
+            BoundingBox bbox = emptyGameObject.AddComponent<BoundingBox>();
+
+            // set target to cube
+            bbox.Target = cube;
+            bbox.Active = true;
+
+            // front right corner is corner 3
+            var frontRightCornerPos = cube.transform.Find("rigRoot/corner_3").position;
+
+            // grab corner and scale object
+            Vector3 initialHandPosition = new Vector3(0, 0, 0.5f);
+            int numSteps = 30;
+            var delta = new Vector3(0.1f, 0.1f, 0f);
+            TestHand hand = new TestHand(Handedness.Right);
+            yield return hand.Show(initialHandPosition);
+            yield return hand.SetGesture(ArticulatedHandPose.GestureId.OpenSteadyGrabPoint);
+            yield return hand.MoveTo(frontRightCornerPos, numSteps);
+            yield return hand.SetGesture(ArticulatedHandPose.GestureId.Pinch);
+            yield return hand.MoveTo(frontRightCornerPos + delta, numSteps);
+
+            var endBounds = cube.GetComponent<BoxCollider>().bounds;
+            Vector3 expectedCenter = new Vector3(0.033f, 0.033f, 1.467f);
+            Vector3 expectedSize = Vector3.one * .567f;
+            TestUtilities.AssertAboutEqual(endBounds.center, expectedCenter, "endBounds incorrect center");
+            TestUtilities.AssertAboutEqual(endBounds.size, expectedSize, "endBounds incorrect size");
+
+            Object.Destroy(emptyGameObject);
+            Object.Destroy(cube);
+            // Wait for a frame to give Unity a change to actually destroy the object
+            yield return null;
+
+        }
+
         /// <summary>
         /// Returns the AABB of the bounding box rig (corners, edges)
         /// that make up the bounding box by using the positions of the corners

Assets/MixedRealityToolkit.Tests/PlayModeTests/Experimental/BoundsControlTests.cs

@@ -333,6 +333,60 @@ public IEnumerator DisableObject()
             Assert.AreEqual(afterTransformScale, bbox.transform.localScale);
         }
 
+        /// <summary>
+        /// Tests setting a target in code that is a different gameobject than the gameobject the bounds control component is attached to
+        /// </summary>
+        [UnityTest]
+        public IEnumerator SetTarget()
+        {
+            // create cube without control
+            var cube = GameObject.CreatePrimitive(PrimitiveType.Cube);
+            cube.transform.position = boundsControlStartCenter;
+
+            MixedRealityPlayspace.PerformTransformation(
+            p =>
+            {
+                p.position = Vector3.zero;
+                p.LookAt(cube.transform.position);
+            });
+
+            cube.transform.localScale = boundsControlStartScale;
+
+            // create another gameobject with boundscontrol attached 
+            var emptyGameObject = new GameObject("empty");
+            BoundsControl bbox = emptyGameObject.AddComponent<BoundsControl>();
+
+            // set target to cube
+            bbox.Target = cube;
+            bbox.Active = true;
+
+            // front right corner is corner 3
+            var frontRightCornerPos = cube.transform.Find("rigRoot/corner_3").position;
+
+            // grab corner and scale object
+            Vector3 initialHandPosition = new Vector3(0, 0, 0.5f);
+            int numSteps = 30;
+            var delta = new Vector3(0.1f, 0.1f, 0f);
+            TestHand hand = new TestHand(Handedness.Right);
+            yield return hand.Show(initialHandPosition);
+            yield return hand.SetGesture(ArticulatedHandPose.GestureId.OpenSteadyGrabPoint);
+            yield return hand.MoveTo(frontRightCornerPos, numSteps);
+            yield return hand.SetGesture(ArticulatedHandPose.GestureId.Pinch);
+            yield return hand.MoveTo(frontRightCornerPos + delta, numSteps);
+
+            var endBounds = cube.GetComponent<BoxCollider>().bounds;
+            Vector3 expectedCenter = new Vector3(0.033f, 0.033f, 1.467f);
+            Vector3 expectedSize = Vector3.one * .567f;
+            TestUtilities.AssertAboutEqual(endBounds.center, expectedCenter, "endBounds incorrect center");
+            TestUtilities.AssertAboutEqual(endBounds.size, expectedSize, "endBounds incorrect size");
+
+            Object.Destroy(emptyGameObject);
+            Object.Destroy(cube);
+            // Wait for a frame to give Unity a change to actually destroy the object
+            yield return null;
+
+        }
+
         /// <summary>
         /// Returns the AABB of the bounds control rig (corners, edges)
         /// that make up the bounds control by using the positions of the corners