Merge pull request #3511 from Microsoft/mrtk_release

mrtk release -> mrtk development

Author: David Kline

Assets/MixedRealityToolkit.Examples/Demos/Diagnostics/Scripts/DiagnosticsDemoControls.cs

@@ -19,7 +19,7 @@ private async void Start()
 
             await new WaitUntil(() => MixedRealityToolkit.DiagnosticsSystem != null);
 
-            // Turn on the diagnotic visualizations for this demo.
+            // Turn on the diagnostic visualizations for this demo.
             MixedRealityToolkit.DiagnosticsSystem.ShowDiagnostics = true;
         }
 

Assets/MixedRealityToolkit.Examples/Demos/Utilities/InspectorFields/Inspectors/InspectorFieldsExampleInspector.cs

@@ -41,7 +41,7 @@ public override void OnInspectorGUI()
 
             serializedObject.ApplyModifiedProperties();
 
-            // to apply during runtime - only needed for monobehaviors
+            // to apply during runtime - only needed for MonoBehaviours
             InspectorGenericFields<InspectorFieldsExample>.LoadSettings(example, example.Settings);
         }
     }

Assets/MixedRealityToolkit.Examples/Demos/Utilities/InspectorFields/Scripts/InspectorFieldsExample.cs

@@ -11,7 +11,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Utilities.InspectorFields
     /// Example of using InspectorFields attributes in a class to create custom inspectors
     /// This is on approach for building complex inspectors that need to be customized or the need to overcome lack of polymorphism support
     /// They provide a way to create one inspector for multiple classes
-    /// Example: Create a monobehavior or scriptable object with a custom inspector.
+    /// Example: Create a MonoBehaviour or scriptable object with a custom inspector.
     /// The functionality or settings can be changed by assigning a custom script to the object
     /// Use InspectorFields to render the custom properties inside the custom script in the inspector
     /// When the app launches, copy the properties to the new instance of the script

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityController.cs

@@ -414,14 +414,37 @@ private void UpdateTriggerData(InteractionSourceState interactionSourceState, Mi
                     break;
                 case DeviceInputType.Select:
                     {
+                        bool selectPressed = interactionSourceState.selectPressed;
+
+                        // BEGIN WORKAROUND: Unity issue #1033526
+                        // See https://issuetracker.unity3d.com/issues/hololens-interactionsourcestate-dot-selectpressed-is-false-when-air-tap-and-hold
+                        // Bug was discovered May 2018 and still exists as of today Feb 2019 in version 2018.3.4f1, timeline for fix is unknown
+                        // The bug only affects the development workflow via Holographic Remoting or Simulation
+                        if (interactionSourceState.source.kind == InteractionSourceKind.Hand)
+                        {
+                            Debug.Assert(!(UnityEngine.XR.WSA.HolographicRemoting.ConnectionState == UnityEngine.XR.WSA.HolographicStreamerConnectionState.Connected
+                                           && interactionSourceState.selectPressed),
+                                         "Unity issue #1033526 seems to have been resolved. Please remove this ugly workaround!");
+
+                            // This workaround is safe as long as all these assumptions hold:
+                            Debug.Assert(!interactionSourceState.source.supportsGrasp);
+                            Debug.Assert(!interactionSourceState.source.supportsMenu);
+                            Debug.Assert(!interactionSourceState.source.supportsPointing);
+                            Debug.Assert(!interactionSourceState.source.supportsThumbstick);
+                            Debug.Assert(!interactionSourceState.source.supportsTouchpad);
+
+                            selectPressed = interactionSourceState.anyPressed;
+                        }
+                        // END WORKAROUND: Unity issue #1033526
+
                         // Update the interaction data source
-                        interactionMapping.BoolData = interactionSourceState.selectPressed;
+                        interactionMapping.BoolData = selectPressed;
 
                         // If our value changed raise it.
                         if (interactionMapping.Changed)
                         {
                             // Raise input system Event if it enabled
-                            if (interactionSourceState.selectPressed)
+                            if (selectPressed)
                             {
                                 MixedRealityToolkit.InputSystem?.RaiseOnInputDown(InputSource, ControllerHandedness, interactionMapping.MixedRealityInputAction);
                             }

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealitySpatialMeshObserver.cs

@@ -21,7 +21,8 @@ namespace Microsoft.MixedReality.Toolkit.Providers.WindowsMixedReality
 {
     [MixedRealityDataProvider(
         typeof(IMixedRealitySpatialAwarenessSystem),
-        SupportedPlatforms.WindowsUniversal)]
+        SupportedPlatforms.WindowsUniversal,
+        "Profiles/DefaultMixedRealitySpatialAwarenessMeshObserverProfile.asset", "MixedRealityToolkit.SDK")]
     public class WindowsMixedRealitySpatialMeshObserver : BaseSpatialObserver, IMixedRealitySpatialAwarenessMeshObserver
     {
         /// <summary>

Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/ManipulationHandler.cs

@@ -88,7 +88,7 @@ private enum State
         private GazeHandHelper gazeHandHelper;
         #endregion
 
-        #region Monobehaviour Functions
+        #region MonoBehaviour Functions
         private void Awake()
         {
             gazeHandHelper = new GazeHandHelper();
@@ -110,7 +110,7 @@ private void Update()
                 UpdateStateMachine();
             }
         }
-        #endregion Monobehaviour Functions
+        #endregion MonoBehaviour Functions
 
         #region Private Methods
         private void SetManipulationMode(TwoHandedManipulation mode)

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

@@ -23,7 +23,7 @@ namespace Microsoft.MixedReality.Toolkit.SDK.UX.Interactable
 {
     /// <summary>
     /// Uses input and action data to declare a set of states
-    /// Maintains a collection of themes that react to state changes and provide scensory feedback
+    /// Maintains a collection of themes that react to state changes and provide sensory feedback
     /// Passes state information and input data on to receivers that detect patterns and does stuff.
     /// </summary>
 
@@ -76,7 +76,7 @@ public class Interactable : MonoBehaviour, IMixedRealityFocusHandler, IMixedReal
         /// </summary>
         public bool FocusEnabled { get { return !IsGlobal; } set { IsGlobal = !value; } }
 
-        // list of profiles can match themes with gameObjects
+        // list of profiles can match themes with GameObjects
         public List<InteractableProfileItem> Profiles = new List<InteractableProfileItem>();
         // Base onclick event
         public UnityEvent OnClick;
@@ -117,10 +117,10 @@ public class Interactable : MonoBehaviour, IMixedRealityFocusHandler, IMixedReal
         protected State lastState;
         protected bool wasDisabled = false;
 
-        // cache of current dimenion
+        // cache of current dimension
         protected int dimensionIndex = 0;
 
-        // allows for switching colliders without firing a lose focus imediately
+        // allows for switching colliders without firing a lose focus immediately
         // for advanced controls like drop-downs
         protected float rollOffTime = 0.25f;
         protected float rollOffTimer = 0.25f;
@@ -782,7 +782,7 @@ public void SetDimensionIndex(int index)
         }
 
         /// <summary>
-        /// internal deminsion cycling
+        /// internal dimension cycling
         /// </summary>
         protected void IncreaseDimensionIndex()
         {
@@ -975,7 +975,7 @@ public void OnSpeechKeywordRecognized(SpeechEventData eventData)
 
         /// <summary>
         /// Setup voice commands from component VoiceCommand input field
-        /// Supports toggles using a comma to seperate keywords, no spaces please
+        /// Supports toggles using a comma to separate keywords, no spaces please
         /// </summary>
         protected void SetupVoiceCommand()
         {

Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Layout/ButtonBackgroundSize.cs

@@ -9,7 +9,7 @@ namespace Microsoft.MixedReality.Toolkit.SDK.UX.Interactable.Layout
 {
     /// <summary>
     /// The base layout component for a button or UI elements - easily build UI with Unity Primitives.
-    /// Helps to create consistancy by using values that scale to a designer's 2D layout program.
+    /// Helps to create consistency by using values that scale to a designer's 2D layout program.
     /// Based on a ratio of 2048 pixels for 1 meter of surface area.
     /// 
     /// Use case:
@@ -24,7 +24,7 @@ public class ButtonBackgroundSize : MonoBehaviour
     {
         /// <summary>
         /// A scale factor for button layouts, default is based on 2048 pixels to 1 meter.
-        /// Similar to values used in designer and 2D art programs and helps create consistancy across teams.
+        /// Similar to values used in designer and 2D art programs and helps create consistency across teams.
         /// </summary>
         [Tooltip("A pixel to Unity unit conversion, Default: 2048x2048 pixels covers a 1x1 Unity Unit or default primitive size")]
         [SerializeField]

Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Layout/ButtonBackgroundSizeOffset.cs

@@ -90,7 +90,7 @@ public Vector3 GetSOffset()
         }
 
         /// <summary>
-        /// Set the size based on the Achor's size and the buffers
+        /// Set the size based on the Anchor's size and the buffers
         /// </summary>
         private void UpdateSize()
         {

Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Layout/ButtonBorder.cs

@@ -80,13 +80,29 @@ public class ButtonBorder : MonoBehaviour
         [SerializeField]
         private bool OnlyInEditMode = true;
 
+        private Vector3 scale;
+        private Vector3 startPosition;
+        private Vector3 weighDirection;
+        private Vector3 localPosition;
+        private Vector3 anchorTransformLocalPosition;
+        private Vector3 anchorTransformLocalScale;
+
         /// <summary>
         /// Set the size and position
         /// </summary>
         private void UpdateSize()
         {
-            Vector3 weighDireciton = new Vector3(Mathf.Abs(Alignment.x), Mathf.Abs(Alignment.y), Mathf.Abs(Alignment.z));
-            Vector3 scale = weighDireciton * (Weight / BasePixelScale);// Vector3.Scale(Alignment, Scale) + Offset / BasePixelScale;
+            // Vector3 weighDireciton = new Vector3(Mathf.Abs(Alignment.x), Mathf.Abs(Alignment.y), Mathf.Abs(Alignment.z));
+            // Vector3 scale = weighDireciton * (Weight / BasePixelScale);// Vector3.Scale(Alignment, Scale) + Offset / BasePixelScale;
+
+            weighDirection.x = Mathf.Abs(Alignment.x);
+            weighDirection.y = Mathf.Abs(Alignment.y);
+            weighDirection.z = Mathf.Abs(Alignment.z);
+
+            scale.x = weighDirection.x * (Weight / BasePixelScale);
+            scale.y = weighDirection.y * (Weight / BasePixelScale);
+            scale.z = weighDirection.z * (Weight / BasePixelScale);
+
             float size = ((Weight * 2) / BasePixelScale);
             if (scale.x > scale.y)
             {
@@ -100,14 +116,24 @@ private void UpdateSize()
 
             transform.localScale = scale;
 
-            Vector3 startPosition = AnchorTransform.localPosition;
+            anchorTransformLocalPosition = AnchorTransform.localPosition;
+            anchorTransformLocalScale = AnchorTransform.localScale;
+
+            startPosition = anchorTransformLocalPosition;
 
             if (AnchorTransform != this.transform)
             {
-                startPosition = AnchorTransform.localPosition + (Vector3.Scale(AnchorTransform.localScale * 0.5f, Alignment));
+                // startPosition = AnchorTransform.localPosition + (Vector3.Scale(AnchorTransform.localScale * 0.5f, Alignment));
+                startPosition.x = anchorTransformLocalPosition.x + ((anchorTransformLocalScale.x * 0.5f) * Alignment.x);
+                startPosition.y = anchorTransformLocalPosition.y + ((anchorTransformLocalScale.y * 0.5f) * Alignment.y);
+                startPosition.z = anchorTransformLocalPosition.z + ((anchorTransformLocalScale.z * 0.5f) * Alignment.z);
             }
 
-            transform.localPosition = startPosition + (Alignment * Weight * 0.5f / BasePixelScale) + (PositionOffset / BasePixelScale);
+            // transform.localPosition = startPosition + (Alignment * Weight * 0.5f / BasePixelScale) + (PositionOffset / BasePixelScale);
+            localPosition.x = startPosition.x + (Alignment.x * Weight * 0.5f / BasePixelScale) + (PositionOffset.x / BasePixelScale);
+            localPosition.y = startPosition.y + (Alignment.y * Weight * 0.5f / BasePixelScale) + (PositionOffset.y / BasePixelScale);
+            localPosition.z = startPosition.z + (Alignment.z * Weight * 0.5f / BasePixelScale) + (PositionOffset.z / BasePixelScale);
+            transform.localPosition = localPosition;
         }
 
         // Update is called once per frame