Merge pull request #7096 from thalbern/user/bethalha/bc_examples

Added AppBar support for BoundsControl and fixed configuration bugs

Author: thalbern

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

@@ -24,7 +24,8 @@ namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl
     public class BoundsControl : MonoBehaviour,
         IMixedRealitySourceStateHandler,
         IMixedRealityFocusChangedHandler,
-        IMixedRealityFocusHandler
+        IMixedRealityFocusHandler,
+        IBoundsTargetProvider
     {
         #region Serialized Fields and Properties
         [SerializeField]
@@ -57,7 +58,6 @@ public GameObject Target
 
         [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.")]
         [SerializeField]
-        [FormerlySerializedAs("BoxColliderToUse")]
         private BoxCollider boundsOverride = null;
 
         /// <summary>
@@ -131,7 +131,11 @@ public BoundsControlActivationType BoundsControlActivation
         /// <summary>
         /// Check to draw a tether point from the handles to the hand when manipulating.
         /// </summary>
-        public bool DrawTetherWhenManipulating => drawTetherWhenManipulating;
+        public bool DrawTetherWhenManipulating
+        {
+            get => drawTetherWhenManipulating;
+            set => drawTetherWhenManipulating = value;
+        }
 
         [SerializeField]
         [Tooltip("Add a Collider here if you do not want the handle colliders to interact with another object's collider.")]
@@ -140,7 +144,11 @@ public BoundsControlActivationType BoundsControlActivation
         /// <summary>
         /// Add a Collider here if you do not want the handle colliders to interact with another object's collider.
         /// </summary>
-        public Collider HandlesIgnoreCollider => handlesIgnoreCollider;
+        public Collider HandlesIgnoreCollider
+        {
+            get => handlesIgnoreCollider;
+            set => handlesIgnoreCollider = value;
+        }
 
         [SerializeField]
         [Tooltip("Flatten bounds in the specified axis or flatten the smallest one if 'auto' is selected")]
@@ -207,46 +215,71 @@ public Vector3 BoxPadding
         /// <summary>
         /// Bounds control box display configuration section.
         /// </summary>
-        public BoxDisplayConfiguration BoxDisplayConfiguration => boxDisplayConfiguration;
+        public BoxDisplayConfiguration BoxDisplayConfiguration
+        {
+            get => boxDisplayConfiguration;
+            set => boxDisplayConfiguration = value;
+        }
 
         [SerializeField]
         [Tooltip("This section defines the links / lines that are drawn between the corners of the control.")]
         private LinksConfiguration linksConfiguration;
         /// <summary>
         /// This section defines the links / lines that are drawn between the corners of the control.
         /// </summary>
-        public LinksConfiguration LinksConfiguration => linksConfiguration;
+        public LinksConfiguration LinksConfiguration
+        {
+            get => linksConfiguration;
+            set => linksConfiguration = value;
+        }
 
         [SerializeField]
         [Tooltip("Configuration of the scale handles.")]
         private ScaleHandlesConfiguration scaleHandlesConfiguration;
         /// <summary>
         /// Configuration of the scale handles.
         /// </summary>
-        public ScaleHandlesConfiguration ScaleHandlesConfiguration => scaleHandlesConfiguration;
+        public ScaleHandlesConfiguration ScaleHandlesConfiguration
+        {
+            get => scaleHandlesConfiguration;
+            set => scaleHandlesConfiguration = value;
+        }
 
         [SerializeField]
         [Tooltip("Configuration of the rotation handles.")]
         private RotationHandlesConfiguration rotationHandlesConfiguration;
         /// <summary>
         /// Configuration of the rotation handles.
         /// </summary>
-        public RotationHandlesConfiguration RotationHandles => rotationHandlesConfiguration;
+        public RotationHandlesConfiguration RotationHandles
+        {
+            get => rotationHandlesConfiguration;
+            set => rotationHandlesConfiguration = value;
+        }
 
         [SerializeField]
         [Tooltip("Configuration for Proximity Effect to scale handles or change materials on proximity.")]
         private ProximityEffectConfiguration handleProximityEffectConfiguration;
         /// <summary>
         /// Configuration for Proximity Effect to scale handles or change materials on proximity.
         /// </summary>
-        public ProximityEffectConfiguration HandleProximityEffectConfiguration => handleProximityEffectConfiguration;
+        public ProximityEffectConfiguration HandleProximityEffectConfiguration
+        {
+            get => handleProximityEffectConfiguration;
+            set => handleProximityEffectConfiguration = value;
+        }
 
         [Header("Debug")]
         [Tooltip("Debug only. Component used to display debug messages.")]
+        private TextMesh debugText;
         /// <summary>
         /// Component used to display debug messages.
         /// </summary>
-        public TextMesh debugText;
+        public TextMesh DebugText
+        {
+            get => debugText;
+            set => debugText = value;
+        }
 
         [SerializeField]
         [Tooltip("Determines whether to hide GameObjects (i.e handles, links etc) created and managed by this component in the editor")]
@@ -275,31 +308,47 @@ public bool HideElementsInInspector
         /// <summary>
         /// Event that gets fired when interaction with a rotation handle starts.
         /// </summary>
-        public UnityEvent RotateStarted => rotateStarted;
+        public UnityEvent RotateStarted
+        {
+            get => rotateStarted;
+            set => rotateStarted = value;
+        }
 
         [SerializeField]
         [Tooltip("Event that gets fired when interaction with a rotation handle stops.")]
         private UnityEvent rotateStopped = new UnityEvent();
         /// <summary>
         /// Event that gets fired when interaction with a rotation handle stops.
         /// </summary>
-        public UnityEvent RotateStopped => rotateStopped;
+        public UnityEvent RotateStopped
+        {
+            get => rotateStopped;
+            set => rotateStopped = value;
+        }
 
         [SerializeField]
         [Tooltip("Event that gets fired when interaction with a scale handle starts.")]
         private UnityEvent scaleStarted = new UnityEvent();
         /// <summary>
         /// Event that gets fired when interaction with a scale handle starts.
         /// </summary>
-        public UnityEvent ScaleStarted => scaleStarted;
+        public UnityEvent ScaleStarted
+        {
+            get => scaleStarted;
+            set => scaleStarted = value;
+        }
 
         [SerializeField]
         [Tooltip("Event that gets fired when interaction with a scale handle stops.")]
         private UnityEvent scaleStopped = new UnityEvent();
         /// <summary>
         /// Event that gets fired when interaction with a scale handle stops.
         /// </summary>
-        public UnityEvent ScaleStopped => scaleStopped;
+        public UnityEvent ScaleStopped
+        {
+            get => scaleStopped;
+            set => scaleStopped = value;
+        }
 
         #endregion Serialized Fields
 
@@ -405,6 +454,21 @@ public bool Active
 
         #endregion Public Properties
 
+        #region Private Properties
+        private bool IsInitialized
+        {
+            get
+            {
+                return scaleHandles != null &&
+                    rotationHandles != null &&
+                    boxDisplay != null &&
+                    links != null &&
+                    proximityEffect != null;
+            }
+        }
+
+        #endregion
+
         #region Public Methods
 
         /// <summary>
@@ -429,6 +493,11 @@ public void UnhighlightWires()
         /// </summary>
         public void CreateRig()
         {
+            if (!IsInitialized)
+            {
+                return;
+            }
+
             DestroyRig();
             InitializeRigRoot();
             InitializeDataStructures();
@@ -784,9 +853,6 @@ private void UpdateBounds()
                 }
             }
         }
- 
-        
-
         private bool DoesActivationMatchFocus(FocusEventData eventData)
         {
             switch (activation)
@@ -856,6 +922,11 @@ private void DestroyRig()
 
         private void UpdateRigVisibilityInInspector()
         {
+            if (!IsInitialized)
+            {
+                return;
+            }
+
             HideFlags desiredFlags = hideElementsInInspector ? HideFlags.HideInHierarchy | HideFlags.HideInInspector : HideFlags.None;
             scaleHandles.UpdateVisibilityInInspector(desiredFlags);
             links.UpdateVisibilityInInspector(desiredFlags);
@@ -1107,7 +1178,7 @@ private void SetHighlighted(Transform activeHandle)
 
         private void ResetVisuals()
         {
-            if (currentPointer != null)
+            if (currentPointer != null || !IsInitialized)
             {
                 return;
             }

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

@@ -1,4 +1,6 @@
-
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
 namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControlTypes
 {
     /// <summary>

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

@@ -1,8 +1,8 @@
-using Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControlTypes;
-using System;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
 
+using Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControlTypes;
 using UnityEngine;
-using UnityEngine.Events;
 
 namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl
 {

Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/Configuration/BoxDisplayConfiguration.cs

@@ -1,4 +1,7 @@
-using UnityEngine;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using UnityEngine;
 using UnityEngine.Events;
 
 namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl

Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/Configuration/HandlesBaseConfiguration.cs

@@ -1,4 +1,7 @@
-using UnityEngine;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using UnityEngine;
 using UnityEngine.Events;
 
 namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl

Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/Configuration/LinksConfiguration.cs

@@ -1,4 +1,6 @@
-
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
 using Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControlTypes;
 using UnityEngine;
 using UnityEngine.Events;

Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/Configuration/RotationHandlesConfiguration.cs

@@ -1,4 +1,7 @@
-using Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControlTypes;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControlTypes;
 using UnityEngine;
 
 namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl

Assets/MixedRealityToolkit.SDK/Experimental/Features/UX/BoundsControl/Visuals/Configuration/ScaleHandlesConfiguration.cs

@@ -1,4 +1,6 @@
-
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
 using UnityEngine;
 
 namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl

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

@@ -1,9 +1,10 @@
-using Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControlTypes;
-using Microsoft.MixedReality.Toolkit.Utilities;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControlTypes;
 using System;
 using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.Events;
 
 namespace Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControl
 {

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

@@ -1,4 +1,6 @@
-
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
 using Microsoft.MixedReality.Toolkit.Experimental.UI.BoundsControlTypes;
 using System.Collections.Generic;
 using UnityEngine;
@@ -134,7 +136,7 @@ internal void Flatten(ref int[] flattenedHandles)
         internal void CreateLinks(RotationHandles rotationHandles, Transform parent, Vector3 currentBoundsExtents)
         {
             // create links
-            if (links != null)
+            if (links != null && config.ShowWireFrame)
             {
                 GameObject link;
                 Vector3 linkDimensions = GetLinkDimensions(currentBoundsExtents);