Merge remote-tracking branch 'upstream/mrtk_development' into feature/ux_refactor

Author: MenelvagorMilsom

.github/write-good.yml

@@ -0,0 +1,3 @@
+writeGood: false
+alex: false
+spellchecker: true

.gitignore

@@ -67,6 +67,7 @@ Assets/TextMesh Pro/
 Assets/StreamingAssets/GltfModels/
 Assets/StreamingAssets/GltfModels.meta
 Assets/StreamingAssets.meta
+Assets/MixedRealityToolkit.Generated/*
 
 /mrtk_log_mostRecentET.csv
 

Assets/MixedRealityToolkit.Examples/AssemblyInfo.cs

@@ -0,0 +1,10 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using System.Reflection;
+
+[assembly: AssemblyVersion("2.2.0.0")]
+[assembly: AssemblyFileVersion("2.2.0.0")]
+
+[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
+[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

…ctables/Scripts/HideAfterEnabled.cs.meta …ityToolkit.Examples/AssemblyInfo.cs.metaAssets/MixedRealityToolkit.Examples/Demos/UX/Interactables/Scripts/HideAfterEnabled.cs.meta renamed to Assets/MixedRealityToolkit.Examples/AssemblyInfo.cs.meta Assets/MixedRealityToolkit.Examples/Demos/UX/Interactables/Scripts/HideAfterEnabled.cs.meta renamed to Assets/MixedRealityToolkit.Examples/AssemblyInfo.cs.meta

@@ -8,6 +8,7 @@
 namespace Microsoft.MixedReality.Toolkit.Examples.Demos
 {
     [RequireComponent(typeof(AudioLoFiEffect))]
+    [AddComponentMenu("Scripts/MRTK/Examples/LoFiFilterSelection")]
     public class LoFiFilterSelection : MonoBehaviour, IMixedRealityPointerHandler
     {
         [Tooltip("Material used when the emitter is set to Narrow Band Telephony")]

Assets/MixedRealityToolkit.Examples/Demos/Audio/Scripts/LoFiFilterSelection.cs

@@ -3,15 +3,14 @@
 
 using Microsoft.MixedReality.Toolkit.Boundary;
 using System.Collections.Generic;
-using Microsoft.MixedReality.Toolkit.Utilities;
 using UnityEngine;
-using UnityBoundary = UnityEngine.Experimental.XR.Boundary;
 
 namespace Microsoft.MixedReality.Toolkit.Examples.Demos
 {
     /// <summary>
     /// Demo class to show different ways of using the boundary system and visualizing the data.
     /// </summary>
+    [AddComponentMenu("Scripts/MRTK/Examples/BoundaryVisualizationDemo")]
     public class BoundaryVisualizationDemo : MonoBehaviour, IMixedRealityBoundaryHandler
     {
         private GameObject markerParent;
@@ -32,20 +31,6 @@ public class BoundaryVisualizationDemo : MonoBehaviour, IMixedRealityBoundaryHan
         [SerializeField]
         private bool showBoundaryCeiling = true;
 
-        private IMixedRealityBoundarySystem boundarySystem = null;
-
-        private IMixedRealityBoundarySystem BoundarySystem
-        {
-            get
-            {
-                if (boundarySystem == null)
-                {
-                    MixedRealityServiceRegistry.TryGetService<IMixedRealityBoundarySystem>(out boundarySystem);
-                }
-                return boundarySystem;
-            }
-        }
-
         #region MonoBehaviour Implementation
 
         private void Awake()
@@ -57,7 +42,7 @@ private void Awake()
 
         private void Start()
         {
-            if (BoundarySystem != null)
+            if (CoreServices.BoundarySystem != null)
             {
                 if (markers.Count == 0)
                 {
@@ -68,24 +53,25 @@ private void Start()
 
         private void Update()
         {
-            if (BoundarySystem != null)
+            if (CoreServices.BoundarySystem != null)
             {
-                BoundarySystem.ShowFloor = showFloor;
-                BoundarySystem.ShowPlayArea = showPlayArea;
-                BoundarySystem.ShowTrackedArea = showTrackedArea;
-                BoundarySystem.ShowBoundaryWalls = showBoundaryWalls;
-                BoundarySystem.ShowBoundaryCeiling = showBoundaryCeiling;
+                var boundarySystem = CoreServices.BoundarySystem;
+                boundarySystem.ShowFloor = showFloor;
+                boundarySystem.ShowPlayArea = showPlayArea;
+                boundarySystem.ShowTrackedArea = showTrackedArea;
+                boundarySystem.ShowBoundaryWalls = showBoundaryWalls;
+                boundarySystem.ShowBoundaryCeiling = showBoundaryCeiling;
             }
         }
 
         private void OnEnable()
         {
-            BoundarySystem?.RegisterHandler<IMixedRealityBoundaryHandler>(this);
+            CoreServices.BoundarySystem?.RegisterHandler<IMixedRealityBoundaryHandler>(this);
         }
 
         private void OnDisable()
         {
-            BoundarySystem?.UnregisterHandler<IMixedRealityBoundaryHandler>(this);
+            CoreServices.BoundarySystem?.UnregisterHandler<IMixedRealityBoundaryHandler>(this);
         }
 
         #endregion MonoBehaviour Implementation
@@ -112,24 +98,27 @@ private void AddMarkers()
             float widthRect;
             float heightRect;
 
-            if (BoundarySystem == null) { return; }
+            if (CoreServices.BoundarySystem == null)
+            {
+                return;
+            }
 
-            if (!BoundarySystem.TryGetRectangularBoundsParams(out centerRect, out angleRect, out widthRect, out heightRect))
+            if (!CoreServices.BoundarySystem.TryGetRectangularBoundsParams(out centerRect, out angleRect, out widthRect, out heightRect))
             {
                 // If we have no boundary manager or rectangular bounds we will show no indicators
                 return;
             }
 
             // Get the materials needed for marker display
-            GameObject playArea = BoundarySystem.GetPlayAreaVisualization();
+            GameObject playArea = CoreServices.BoundarySystem.GetPlayAreaVisualization();
             if (playArea == null)
             {
                 // Failed to get the play area visualization;
                 return;
             }
             Material playAreaMaterial = playArea.GetComponent<Renderer>().sharedMaterial;
 
-            GameObject trackedArea = BoundarySystem.GetTrackedAreaVisualization();
+            GameObject trackedArea = CoreServices.BoundarySystem.GetTrackedAreaVisualization();
             if (trackedArea == null)
             {
                 // Failed to get the tracked area visualization;
@@ -155,12 +144,12 @@ private void AddMarkers()
 
                     Material material = null;
                     // Check inscribed rectangle first
-                    if (BoundarySystem.Contains(position, UnityBoundary.Type.PlayArea))
+                    if (CoreServices.BoundarySystem.Contains(position, BoundaryType.PlayArea))
                     {
                         material = playAreaMaterial;
                     }
                     // Then check geometry
-                    else if (BoundarySystem.Contains(position, UnityBoundary.Type.TrackedArea))
+                    else if (CoreServices.BoundarySystem.Contains(position, BoundaryType.TrackedArea))
                     {
                         material = trackedAreaMaterial;
                     }

Assets/MixedRealityToolkit.Examples/Demos/Boundary/Scripts/BoundaryVisualizationDemo.cs

@@ -6,6 +6,7 @@
 
 namespace Microsoft.MixedReality.Toolkit.Examples.Demos.EyeTracking
 {
+    [AddComponentMenu("Scripts/MRTK/Examples/ColorTap")]
     public class ColorTap : MonoBehaviour, IMixedRealityFocusHandler, IMixedRealityPointerHandler
     {
         [SerializeField]

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/DemoBasicSetup/Scripts/ColorTap.cs

@@ -10,34 +10,19 @@ namespace Microsoft.MixedReality.Toolkit.Examples.Demos.EyeTracking
     /// Sample for allowing the game object that this script is attached to follow the user's eye gaze
     /// at a given distance of "DefaultDistanceInMeters". 
     /// </summary>
+    [AddComponentMenu("Scripts/MRTK/Examples/FollowEyeGazeGazeProvider")]
     public class FollowEyeGazeGazeProvider : MonoBehaviour
     {
         [Tooltip("Display the game object along the eye gaze ray at a default distance (in meters).")]
         [SerializeField]
         private float defaultDistanceInMeters = 2f;
 
-        private IMixedRealityInputSystem inputSystem = null;
-
-        /// <summary>
-        /// The active instance of the input system.
-        /// </summary>
-        private IMixedRealityInputSystem InputSystem
-        {
-            get
-            {
-                if (inputSystem == null)
-                {
-                    MixedRealityServiceRegistry.TryGetService<IMixedRealityInputSystem>(out inputSystem);
-                }
-                return inputSystem;
-            }
-        }
-
         private void Update()
         {
-            if (InputSystem?.GazeProvider != null)
+            var gazeProvider = CoreServices.InputSystem?.GazeProvider;
+            if (gazeProvider != null)
             {
-                gameObject.transform.position = InputSystem.GazeProvider.GazeOrigin + InputSystem.GazeProvider.GazeDirection.normalized * defaultDistanceInMeters;
+                gameObject.transform.position = gazeProvider.GazeOrigin + gazeProvider.GazeDirection.normalized * defaultDistanceInMeters;
             }
         }
     }

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/DemoBasicSetup/Scripts/FollowEyeGazeGazeProvider.cs

@@ -131,7 +131,7 @@ protected IMixedRealityEyeSaccadeProvider EyeSaccadeProvider
             {
                 if (eyeSaccadeProvider == null)
                 {
-                    IMixedRealityEyeGazeDataProvider eyeGazeProvider = (InputSystem as IMixedRealityDataProviderAccess)?.GetDataProvider<IMixedRealityEyeGazeDataProvider>();
+                    IMixedRealityEyeGazeDataProvider eyeGazeProvider = (CoreServices.InputSystem as IMixedRealityDataProviderAccess)?.GetDataProvider<IMixedRealityEyeGazeDataProvider>();
                     eyeSaccadeProvider = eyeGazeProvider?.SaccadeProvider;
                 }
                 return eyeSaccadeProvider;
@@ -140,23 +140,6 @@ protected IMixedRealityEyeSaccadeProvider EyeSaccadeProvider
 
         #endregion
 
-        private IMixedRealityInputSystem inputSystem = null;
-
-        /// <summary>
-        /// The active instance of the input system.
-        /// </summary>
-        protected IMixedRealityInputSystem InputSystem
-        {
-            get
-            {
-                if (inputSystem == null)
-                {
-                    MixedRealityServiceRegistry.TryGetService<IMixedRealityInputSystem>(out inputSystem);
-                }
-                return inputSystem;
-            }
-        }
-
         public abstract void Initialize();
         public abstract float ComputePanSpeed(float cursorPosInOneDir, float maxSpeed, float minDistFromCenterForAutoPan);
         public abstract int ZoomDir(bool zoomIn);
@@ -591,7 +574,7 @@ void IMixedRealitySourceStateHandler.OnSourceDetected(SourceStateEventData event
 
         void IMixedRealitySourceStateHandler.OnSourceLost(SourceStateEventData eventData)
         {
-            foreach (var pointer in InputSystem.GazeProvider.GazeInputSource.Pointers)
+            foreach (var pointer in CoreServices.InputSystem.GazeProvider.GazeInputSource.Pointers)
             {
                 pointer.IsFocusLocked = false;
             }

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/DemoScrollPanZoom/Scripts/BaseClasses/PanZoomBase.cs

@@ -9,6 +9,7 @@ namespace Microsoft.MixedReality.Toolkit.Examples.Demos.EyeTracking
     /// This script allows to zoom into and pan the texture of a GameObject. 
     /// It also allows for scrolling by restricting panning to one direction.  
     /// </summary>
+    [AddComponentMenu("Scripts/MRTK/Examples/PanZoomBaseRectTransf")]
     public class PanZoomBaseRectTransf : PanZoomBase
     {
         internal RectTransform navRectTransf = null;
@@ -176,7 +177,7 @@ public override bool UpdateCursorPosInHitBox()
                     Vector3 halfsize = gameObject.transform.lossyScale / 2;
 
                     // Let's transform back to the origin: Translate & Rotate
-                    Vector3 transfHitPnt = InputSystem.EyeGazeProvider.HitPosition - center;
+                    Vector3 transfHitPnt = CoreServices.InputSystem.EyeGazeProvider.HitPosition - center;
 
                     // Rotate around the y axis
                     transfHitPnt = Quaternion.AngleAxis(-(gameObject.transform.rotation.eulerAngles.y - 180), Vector3.up) * transfHitPnt;