Fixed cases where bounds control would aggressively remove other components (#10296)

* fixed cases where bounds control would aggressively remove other components

* slight revision

* removed bounds control's forced addition of the Near Interaction Grabbable, added editor scripts to support the new pattern where the bounds control does not own it's associated bounding box

Author: RogPodge

Assets/MRTK/SDK/Editor/Inspectors/UX/BoundsControl/BoundsControlInspector.cs

@@ -116,12 +116,33 @@ public override void OnInspectorGUI()
                 {
                     EditorGUI.BeginChangeCheck();
 
+                    // Initializes the target object of the bounds control to itself
                     EditorGUILayout.PropertyField(targetObject);
+                    if (targetObject.objectReferenceValue == null)
+                    {
+                        targetObject.objectReferenceValue = boundsControl.gameObject;
+                    }
+
+                    // Checks that the targetObject has a box collider that this bounds control can manage if bounds override was not supplied, otherwise, raises a warning and prompts the user to add one
+                    if (boundsOverride.objectReferenceValue == null)
+                    {
+                        GameObject boundsTargetObject = targetObject.objectReferenceValue as GameObject;
+                        if (boundsTargetObject != null && boundsTargetObject.GetComponent<BoxCollider>() == null)
+                        {
+                            EditorGUILayout.HelpBox("No Box Collider assigned to the TargetObject and no Bounds Override assigned, add a Box Collider to enable proper interaction with the Bounds Control", MessageType.Warning);
+
+                           if (GUILayout.Button("Add Box Collider to Target Object"))
+                           {
+                                boundsTargetObject.AddComponent<BoxCollider>();
+                           }
+                        }
+                    }
 
                     EditorGUILayout.Space();
                     EditorGUILayout.LabelField(new GUIContent("Behavior"), EditorStyles.boldLabel);
                     EditorGUILayout.PropertyField(activationType);
                     EditorGUILayout.PropertyField(boundsOverride);
+
                     EditorGUILayout.PropertyField(boundsCalculationMethod);
                     EditorGUILayout.PropertyField(controlPadding);
                     EditorGUILayout.PropertyField(flattenAxis);

Assets/MRTK/SDK/Features/UX/Scripts/BoundsControl/BoundsControl.cs

@@ -836,13 +836,7 @@ private void DetermineTargetBounds()
             }
             else
             {
-                // first remove old collider if there is any so we don't accumulate any 
-                // box padding on consecutive calls of this method
-                if (TargetBounds != null)
-                {
-                    Destroy(TargetBounds);
-                }
-                TargetBounds = Target.AddComponent<BoxCollider>();
+                TargetBounds = Target.EnsureComponent<BoxCollider>();
                 Bounds bounds = GetTargetBounds();
 
                 TargetBounds.center = bounds.center;
@@ -862,8 +856,6 @@ private void DetermineTargetBounds()
             }
 
             TargetBounds.size += Vector3.Scale(boxPadding, scale);
-
-            TargetBounds.EnsureComponent<NearInteractionGrabbable>();
         }
 
         private readonly List<Transform> childTransforms = new List<Transform>();
@@ -1096,27 +1088,12 @@ private void DropController()
 
         private void DestroyRig()
         {
-            if (boundsOverride == null)
+            // If we have previously logged an initial bounds size,
+            // reset the boundsOverride BoxCollider to the initial size.
+            // This is because the CalculateBoxPadding
+            if (initialBoundsOverrideSize.HasValue)
             {
-                Destroy(TargetBounds);
-            }
-            else
-            {
-                // If we have previously logged an initial bounds size,
-                // reset the boundsOverride BoxCollider to the initial size.
-                // This is because the CalculateBoxPadding
-                if (initialBoundsOverrideSize.HasValue)
-                {
-                    boundsOverride.size = initialBoundsOverrideSize.Value;
-                }
-
-                if (TargetBounds != null)
-                {
-                    if (TargetBounds.gameObject.GetComponent<NearInteractionGrabbable>())
-                    {
-                        Destroy(TargetBounds.gameObject.GetComponent<NearInteractionGrabbable>());
-                    }
-                }
+                boundsOverride.size = initialBoundsOverrideSize.Value;
             }
 
             // todo: move this out?
@@ -1127,7 +1104,6 @@ private void DestroyRig()
                 Destroy(rigRoot.gameObject);
                 rigRoot = null;
             }
-
         }
 
         private void UpdateRigVisibilityInInspector()