Merge branch 'mrtk_development' into vNEXT-ControllerRendering

Author: StephenHodgson

Assets/MixedRealityToolkit-SDK/Features/Input/GazeProvider.cs

@@ -212,7 +212,7 @@ public override bool TryGetPointerRotation(out Quaternion rotation)
 
         #endregion IMixedRealityPointer Implementation
 
-        #region Monobehaiour Implementation
+        #region MonoBehaviour Implementation
 
         private void OnValidate()
         {
@@ -301,7 +301,7 @@ protected override void OnDisable()
             InputSystem.RaiseSourceLost(GazeInputSource);
         }
 
-        #endregion Monobehaiour Implementation
+        #endregion MonoBehaviour Implementation
 
         #region Utilities
 

Assets/MixedRealityToolkit-SDK/Features/Input/Handlers/BaseFocusHandler.cs

@@ -50,7 +50,7 @@ public virtual void OnBeforeFocusChange(FocusEventData eventData)
             // If we're the new target object
             // Add the pointer to the list of focusers
             // and update our hasFocus flag if focusing is enabled.
-            if (eventData.NewFocusedObject == this)
+            if (eventData.NewFocusedObject == gameObject)
             {
                 eventData.Pointer.FocusTarget = this;
                 Focusers.Add(eventData.Pointer);
@@ -62,7 +62,7 @@ public virtual void OnBeforeFocusChange(FocusEventData eventData)
             }
             // If we're the old focused target object
             // update our flag and remove the pointer from our list.
-            else if (eventData.OldFocusedObject == this)
+            else if (eventData.OldFocusedObject == gameObject)
             {
                 hasFocus = false;
 

Assets/MixedRealityToolkit-SDK/Features/Input/Handlers/BaseInputHandler.cs

@@ -23,7 +23,7 @@ public bool IsFocusRequired
             set { isFocusRequired = value; }
         }
 
-        #region Monobehaviour Implementation
+        #region MonoBehaviour Implementation
 
         protected override void OnEnable()
         {
@@ -41,6 +41,6 @@ protected override void OnDisable()
             }
         }
 
-        #endregion Monobehaviour Implementation
+        #endregion MonoBehaviour Implementation
     }
 }

Assets/MixedRealityToolkit-SDK/Features/Input/Handlers/DragAndDropHandler.cs

@@ -72,7 +72,7 @@ private enum RotationModeEnum
         private IMixedRealityPointer currentPointer;
         private IMixedRealityInputSource currentInputSource;
 
-        #region Monobehavior Implemetation
+        #region MonoBehaviour Implementation
 
         private void Start()
         {
@@ -100,7 +100,7 @@ private void OnDestroy()
             }
         }
 
-        #endregion Monobehavior Implemetation
+        #endregion MonoBehaviour Implementation
 
         #region IMixedRealityPointerHandler Implementation
 

Assets/MixedRealityToolkit-SDK/Features/Input/Handlers/SpeechInputHandler.cs

@@ -31,7 +31,7 @@ public class SpeechInputHandler : BaseInputHandler, IMixedRealitySpeechHandler
 
         private readonly Dictionary<string, UnityEvent> responses = new Dictionary<string, UnityEvent>();
 
-        #region Monobehaviour Implementation
+        #region MonoBehaviour Implementation
 
         private void Start()
         {
@@ -60,7 +60,7 @@ private void Start()
             }
         }
 
-        #endregion Monobehaviour Implementation
+        #endregion MonoBehaviour Implementation
 
         #region IMixedRealitySpeechHandler Implementation
 

Assets/MixedRealityToolkit-SDK/Features/Teleportation/MixedRealityTeleportManager.cs

@@ -24,6 +24,11 @@ public class MixedRealityTeleportManager : MixedRealityEventManager, IMixedReali
         private Vector3 targetPosition = Vector3.zero;
         private Vector3 targetRotation = Vector3.zero;
 
+        /// <summary>
+        /// only used to clean up event system when shutting down if this system created one.
+        /// </summary>
+        private GameObject eventSystemReference;
+
         #region IMixedRealityManager Implementation
 
         /// <inheritdoc />
@@ -54,7 +59,8 @@ private void InitializeInternal()
                 {
                     if (!MixedRealityManager.Instance.ActiveProfile.IsInputSystemEnabled)
                     {
-                        new GameObject("Event System").AddComponent<EventSystem>();
+                        eventSystemReference = new GameObject("Event System");
+                        eventSystemReference.AddComponent<EventSystem>();
                     }
                     else
                     {
@@ -72,6 +78,24 @@ private void InitializeInternal()
             teleportEventData = new TeleportEventData(EventSystem.current);
         }
 
+        /// <inheritdoc />
+        public override void Destroy()
+        {
+            base.Destroy();
+
+            if (eventSystemReference != null)
+            {
+                if (Application.isEditor)
+                {
+                    Object.DestroyImmediate(eventSystemReference);
+                }
+                else
+                {
+                    Object.Destroy(eventSystemReference);
+                }
+            }
+        }
+
         #endregion IMixedRealityManager Implementation
 
         #region IEventSystemManager Implementation

Assets/MixedRealityToolkit-SDK/Features/UX/Prefabs/Pointers/DefaultControllerPointer.prefab

@@ -395,7 +395,7 @@ MonoBehaviour:
   widthOffset: 0
   stepMode: 0
   lineStepCount: 16
-  lineMaterial: {fileID: 0}
+  lineMaterial: {fileID: 2100000, guid: 11727442de02c1d4b8d37a063c748aec, type: 2}
   roundedEdges: 1
   roundedCaps: 1
   lineRenderer: {fileID: 120690711267243118}

Assets/MixedRealityToolkit-SDK/Features/UX/Prefabs/Pointers/ParabolicPointer.prefab

@@ -143,7 +143,7 @@ MonoBehaviour:
   widthOffset: 0
   stepMode: 0
   lineStepCount: 256
-  lineMaterial: {fileID: 0}
+  lineMaterial: {fileID: 2100000, guid: 11727442de02c1d4b8d37a063c748aec, type: 2}
   roundedEdges: 1
   roundedCaps: 1
   lineRenderer: {fileID: 120827243805602862}

Assets/MixedRealityToolkit-SDK/Features/UX/Scripts/Cursors/CursorModifier.cs

@@ -220,13 +220,13 @@ void IMixedRealityFocusChangedHandler.OnFocusChanged(FocusEventData eventData) {
 
         #endregion IMixedRealityFocusChangedHandler Implementation
 
-        #region Monobehaviour Implementation
+        #region MonoBehaviour Implementation
 
         private void OnValidate()
         {
             Debug.Assert(HostTransform.GetComponent<Collider>() != null, $"A collider component is required on {hostTransform.gameObject.name} for the cursor modifier component on {gameObject.name} to function properly.");
         }
 
-        #endregion Monobehaviour Implementaiton
+        #endregion MonoBehaviour Implementaiton
     }
 }

Assets/MixedRealityToolkit-SDK/Features/UX/Scripts/Pointers/BaseControllerPointer.cs

@@ -111,7 +111,7 @@ public virtual void SetCursor(GameObject newCursor = null)
             }
         }
 
-        #region Monobehaviour Implementation
+        #region MonoBehaviour Implementation
 
         protected override void OnEnable()
         {
@@ -149,7 +149,7 @@ protected override void OnDisable()
             InputSystem.FocusProvider.UnregisterPointer(this);
         }
 
-        #endregion  Monobehaviour Implementation
+        #endregion  MonoBehaviour Implementation
 
         #region IMixedRealityPointer Implementation