Merge pull request #3475 from Microsoft/beta2-stabilization

David Kline · web-flow · commit 213c472fd62d · 2019-02-19T09:44:16.000-08:00
Beta2 stabilization -&gt; mrtk development
diff --git a/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/ManipulationHandler.cs b/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/ManipulationHandler.cs
@@ -57,6 +57,10 @@ private enum TwoHandedManipulation
         [Tooltip("Constrain rotation along an axis")]
         private RotationConstraintType constraintOnRotation = RotationConstraintType.None;
 
+        [SerializeField]
+        [Tooltip("Constrain movement")]
+        private MovementConstraintType constraintOnMovement = MovementConstraintType.None;
+
         [SerializeField]
         private HandMovementType handMoveType = HandMovementType.OneAndTwoHanded;
 
@@ -88,7 +92,7 @@ private enum State
         private void Awake()
         {
             gazeHandHelper = new GazeHandHelper();
-            m_moveLogic = new TwoHandMoveLogic();
+            m_moveLogic = new TwoHandMoveLogic(constraintOnMovement);
             m_rotateLogic = new TwoHandRotateLogic(constraintOnRotation);
             m_scaleLogic = new TwoHandScaleLogic();
         }
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/BaseControllerPointer.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/BaseControllerPointer.cs
@@ -139,14 +139,34 @@ protected override async void Start()
         {
             base.Start();
 
-            if (lateRegisterTeleport)
+            if (lateRegisterTeleport && MixedRealityToolkit.Instance.ActiveProfile.IsTeleportSystemEnabled)
             {
-                await new WaitUntil(() => MixedRealityToolkit.TeleportSystem != null);
+                if (MixedRealityToolkit.TeleportSystem == null)
+                {
+                    await new WaitUntil(() => MixedRealityToolkit.TeleportSystem != null);
+
+                    // We've been destroyed during the await.
+                    if (this == null)
+                    {
+                        return;
+                    }
+                }
+
                 lateRegisterTeleport = false;
                 MixedRealityToolkit.TeleportSystem.Register(gameObject);
             }
 
-            await WaitUntilInputSystemValid;
+            if (MixedRealityToolkit.InputSystem == null)
+            {
+                await WaitUntilInputSystemValid;
+            }
+
+            // We've been destroyed during the await.
+            if (this == null)
+            {
+                return;
+            }
+
             SetCursor();
         }
 
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/LinePointer.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/LinePointer.cs
@@ -150,7 +150,7 @@ public override void OnPreRaycast()
             for (int i = 0; i < Rays.Length; i++)
             {
                 Vector3 currentPoint = lineBase.GetUnClampedPoint(stepSize * (i + 1));
-                Rays[i] = new RayStep(lastPoint, currentPoint);
+                Rays[i].UpdateRayStep(ref lastPoint, ref currentPoint);
                 lastPoint = currentPoint;
             }
         }
diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/TeleportPointer.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/TeleportPointer.cs
@@ -146,7 +146,7 @@ public override void OnPreRaycast()
             for (int i = 0; i < Rays.Length; i++)
             {
                 Vector3 currentPoint = LineBase.GetUnClampedPoint(stepSize * (i + 1));
-                Rays[i] = new RayStep(lastPoint, currentPoint);
+                Rays[i].UpdateRayStep(ref lastPoint, ref currentPoint);
                 lastPoint = currentPoint;
             }
 
diff --git a/Assets/MixedRealityToolkit.Services/InputSystem/FocusProvider.cs b/Assets/MixedRealityToolkit.Services/InputSystem/FocusProvider.cs
@@ -252,9 +252,12 @@ public void UpdateFocusLockedHit()
                     pointerWasLocked = true;
                 }
 
-                // In case the focused object is moving, we need to update the focus point based on the object's new transform.
-                focusDetails.Point = focusDetails.Object.transform.TransformPoint(pointLocalSpace);
-                focusDetails.Normal = focusDetails.Object.transform.TransformDirection(normalLocalSpace);
+                if (focusDetails.Object != null && focusDetails.Object.transform != null)
+                {
+                    // In case the focused object is moving, we need to update the focus point based on the object's new transform.
+                    focusDetails.Point = focusDetails.Object.transform.TransformPoint(pointLocalSpace);
+                    focusDetails.Normal = focusDetails.Object.transform.TransformDirection(normalLocalSpace);
+                }
 
                 StartPoint = Pointer.Rays[0].Origin;
 
diff --git a/Assets/MixedRealityToolkit.Services/InputSystem/GazeProvider.cs b/Assets/MixedRealityToolkit.Services/InputSystem/GazeProvider.cs
@@ -199,7 +199,8 @@ public override void OnPreRaycast()
                     newGazeNormal = stabilizer.StableRay.direction;
                 }
 
-                Rays[0].UpdateRayStep(newGazeOrigin, newGazeOrigin + (newGazeNormal * pointerExtent));
+                Vector3 endPoint = newGazeOrigin + (newGazeNormal * pointerExtent);
+                Rays[0].UpdateRayStep(ref newGazeOrigin, ref endPoint);
 
                 gazeProvider.HitPosition = Rays[0].Origin + (gazeProvider.lastHitDistance * Rays[0].Direction);
             }
diff --git a/Assets/MixedRealityToolkit.Services/InputSystem/InputSystemGlobalListener.cs b/Assets/MixedRealityToolkit.Services/InputSystem/InputSystemGlobalListener.cs
@@ -28,7 +28,17 @@ protected virtual async void Start()
         {
             if (lateInitialize)
             {
-                await WaitUntilInputSystemValid;
+                if (MixedRealityToolkit.InputSystem == null)
+                {
+                    await WaitUntilInputSystemValid;
+                }
+
+                if (this == null)
+                {
+                    // We've been destroyed during the await.
+                    return;
+                }
+
                 lateInitialize = false;
                 MixedRealityToolkit.InputSystem.Register(gameObject);
             }
diff --git a/Assets/MixedRealityToolkit/Definitions/Physics/RayStep.cs b/Assets/MixedRealityToolkit/Definitions/Physics/RayStep.cs
@@ -31,7 +31,13 @@ public Vector3 GetPoint(float distance)
             return Vector3.MoveTowards(Origin, Terminus, distance);
         }
 
-        public void UpdateRayStep(Vector3 origin, Vector3 terminus)
+        /// <summary>
+        /// Update current raystep with new origin and terminus points. 
+        /// Pass by ref to avoid unnecessary struct copy into function since values will be copied anyways locally
+        /// </summary>
+        /// <param name="origin">beginning of raystep origin</param>
+        /// <param name="terminus">end of raystep</param>
+        public void UpdateRayStep(ref Vector3 origin, ref Vector3 terminus)
         {
             Origin = origin;
             Terminus = terminus;
diff --git a/Assets/MixedRealityToolkit/Definitions/Utilities/MovementConstraintType.cs b/Assets/MixedRealityToolkit/Definitions/Utilities/MovementConstraintType.cs
@@ -0,0 +1,11 @@
+﻿// 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.Core.Definitions.Utilities
+{
+    public enum MovementConstraintType
+    {
+        None,
+        FixDistanceFromHead
+    }
+}
diff --git a/Assets/MixedRealityToolkit/Definitions/Utilities/MovementConstraintType.cs.meta b/Assets/MixedRealityToolkit/Definitions/Utilities/MovementConstraintType.cs.meta
diff --git a/Assets/MixedRealityToolkit/Providers/BaseController.cs b/Assets/MixedRealityToolkit/Providers/BaseController.cs
@@ -99,44 +99,43 @@ public bool SetupConfiguration(Type controllerType)
                 var controllerMappings = MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.ControllerMappingProfile.MixedRealityControllerMappingProfiles;
 
                 // Have to test that a controller type has been registered in the profiles,
-                // else it's Unity Input manager mappings will not have been setup by the inspector
+                // else its Unity Input manager mappings will not have been set up by the inspector.
                 bool profileFound = false;
 
                 for (int i = 0; i < controllerMappings?.Length; i++)
                 {
-                    if (!profileFound && controllerMappings[i].ControllerType.Type == controllerType)
+                    if (controllerMappings[i].ControllerType.Type == controllerType)
                     {
                         profileFound = true;
-                    }
-
-                    // Assign any known interaction mappings.
-                    if (controllerMappings[i].ControllerType.Type == controllerType &&
-                        controllerMappings[i].Handedness == ControllerHandedness &&
-                        controllerMappings[i].Interactions.Length > 0)
-                    {
-                        MixedRealityInteractionMapping[] profileInteractions = controllerMappings[i].Interactions;
-                        MixedRealityInteractionMapping[] newInteractions = new MixedRealityInteractionMapping[profileInteractions.Length];
 
-                        for (int j = 0; j < profileInteractions.Length; j++)
+                        // If it is an exact match, assign interaction mappings.
+                        if (controllerMappings[i].Handedness == ControllerHandedness &&
+                            controllerMappings[i].Interactions.Length > 0)
                         {
-                            newInteractions[j] = new MixedRealityInteractionMapping(profileInteractions[j]);
-                        }
+                            MixedRealityInteractionMapping[] profileInteractions = controllerMappings[i].Interactions;
+                            MixedRealityInteractionMapping[] newInteractions = new MixedRealityInteractionMapping[profileInteractions.Length];
+
+                            for (int j = 0; j < profileInteractions.Length; j++)
+                            {
+                                newInteractions[j] = new MixedRealityInteractionMapping(profileInteractions[j]);
+                            }
 
-                        AssignControllerMappings(newInteractions);
-                        break;
+                            AssignControllerMappings(newInteractions);
+                            break;
+                        }
                     }
+                }
+
+                // If no controller mappings found, warn the user.  Does not stop the project from running.
+                if (Interactions == null || Interactions.Length < 1)
+                {
+                    SetupDefaultInteractions(ControllerHandedness);
 
-                    // If no controller mappings found, warn the user.  Does not stop the project from running.
+                    // We still don't have controller mappings, so this may be a custom controller. 
                     if (Interactions == null || Interactions.Length < 1)
                     {
-                        SetupDefaultInteractions(ControllerHandedness);
-
-                        // We still don't have controller mappings, so this may be a custom controller. 
-                        if (Interactions == null || Interactions.Length < 1)
-                        {
-                            Debug.LogWarning($"No Controller interaction mappings found for {controllerMappings[i].Description}.");
-                            return false;
-                        }
+                        Debug.LogWarning($"No Controller interaction mappings found for {controllerType}.");
+                        return false;
                     }
                 }
 
diff --git a/Assets/MixedRealityToolkit/Utilities/CameraCache.cs b/Assets/MixedRealityToolkit/Utilities/CameraCache.cs
@@ -66,7 +66,10 @@ public static Camera Main
         /// <param name="newMain">New main camera to cache</param>
         public static Camera Refresh(Camera newMain)
         {
-            Debug.Assert(newMain != null, "No camera with MainCamera tag found in scene.  Did you forget to tag your camera?");
+            if (newMain == null)
+            {
+                Debug.LogWarning("A null camera was passed into CameraCache.Refresh()");
+            }
             return cachedCamera = newMain;
         }
     }
diff --git a/Assets/MixedRealityToolkit/Utilities/Physics/TwoHandMoveLogic.cs b/Assets/MixedRealityToolkit/Utilities/Physics/TwoHandMoveLogic.cs
@@ -1,6 +1,7 @@
 ﻿// 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.Core.Definitions.Utilities;
 using UnityEngine;
 
 namespace Microsoft.MixedReality.Toolkit.Core.Utilities.Physics
@@ -17,9 +18,20 @@ namespace Microsoft.MixedReality.Toolkit.Core.Utilities.Physics
     public class TwoHandMoveLogic
     {
         private static readonly Vector3 offsetPosition = new Vector3(0, -0.2f, 0);
+        private readonly MovementConstraintType movementConstraint;
+
         private float handRefDistance;
         private float objRefDistance;
 
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="rotationConstraint"></param>
+        public TwoHandMoveLogic(MovementConstraintType _movementConstraint)
+        {
+            movementConstraint = _movementConstraint;
+        }
+
         /// <summary>
         /// The initial angle between the hand and the object
         /// </summary>
@@ -61,11 +73,17 @@ public Vector3 Update(Vector3 centroid, Vector3 manipulationObjectPosition)
             var targetDirection = Vector3.Normalize(gazeAngularOffset * newHandDirection);
             targetDirection = CameraCache.Main.transform.TransformDirection(targetDirection);
 
-            // Compute how far away the object should be based on the ratio of the current to original hand distance
-            var currentHandDistance = Vector3.Magnitude(newHandPosition - pivotPosition);
-            var distanceRatio = currentHandDistance / handRefDistance;
-            var distanceOffset = distanceRatio > 0 ? (distanceRatio - 1f) * DistanceScale : 0;
-            var targetDistance = objRefDistance + distanceOffset;
+            var targetDistance = objRefDistance;
+
+            if(movementConstraint != MovementConstraintType.FixDistanceFromHead)
+            {
+                // Compute how far away the object should be based on the ratio of the current to original hand distance
+                var currentHandDistance = Vector3.Magnitude(newHandPosition - pivotPosition);
+                var distanceRatio = currentHandDistance / handRefDistance;
+                var distanceOffset = distanceRatio > 0 ? (distanceRatio - 1f) * DistanceScale : 0;
+                targetDistance += distanceOffset;
+            }
+
             var newPosition = pivotPosition + (targetDirection * targetDistance);
             var newDistance = Vector3.Distance(newPosition, pivotPosition);
 

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ public override void OnPreRaycast()`
`150`	`150`	`for (int i = 0; i < Rays.Length; i++)`
`151`	`151`	`{`
`152`	`152`	`Vector3 currentPoint = lineBase.GetUnClampedPoint(stepSize * (i + 1));`
`153`		`- Rays[i] = new RayStep(lastPoint, currentPoint);`
	`153`	`+ Rays[i].UpdateRayStep(ref lastPoint, ref currentPoint);`
`154`	`154`	`lastPoint = currentPoint;`
`155`	`155`	`}`
`156`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ public override void OnPreRaycast()`
`146`	`146`	`for (int i = 0; i < Rays.Length; i++)`
`147`	`147`	`{`
`148`	`148`	`Vector3 currentPoint = LineBase.GetUnClampedPoint(stepSize * (i + 1));`
`149`		`- Rays[i] = new RayStep(lastPoint, currentPoint);`
	`149`	`+ Rays[i].UpdateRayStep(ref lastPoint, ref currentPoint);`
`150`	`150`	`lastPoint = currentPoint;`
`151`	`151`	`}`
`152`	`152`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,8 @@ public override void OnPreRaycast()`
`199`	`199`	`newGazeNormal = stabilizer.StableRay.direction;`
`200`	`200`	`}`
`201`	`201`
`202`		`- Rays[0].UpdateRayStep(newGazeOrigin, newGazeOrigin + (newGazeNormal * pointerExtent));`
	`202`	`+ Vector3 endPoint = newGazeOrigin + (newGazeNormal * pointerExtent);`
	`203`	`+ Rays[0].UpdateRayStep(ref newGazeOrigin, ref endPoint);`
`203`	`204`
`204`	`205`	`gazeProvider.HitPosition = Rays[0].Origin + (gazeProvider.lastHitDistance * Rays[0].Direction);`
`205`	`206`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,17 @@ protected virtual async void Start()`
`28`	`28`	`{`
`29`	`29`	`if (lateInitialize)`
`30`	`30`	`{`
`31`		`- await WaitUntilInputSystemValid;`
	`31`	`+ if (MixedRealityToolkit.InputSystem == null)`
	`32`	`+ {`
	`33`	`+ await WaitUntilInputSystemValid;`
	`34`	`+ }`
	`35`	`+`
	`36`	`+ if (this == null)`
	`37`	`+ {`
	`38`	`+ // We've been destroyed during the await.`
	`39`	`+ return;`
	`40`	`+ }`
	`41`	`+`
`32`	`42`	`lateInitialize = false;`
`33`	`43`	`MixedRealityToolkit.InputSystem.Register(gameObject);`
`34`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,13 @@ public Vector3 GetPoint(float distance)`
`31`	`31`	`return Vector3.MoveTowards(Origin, Terminus, distance);`
`32`	`32`	`}`
`33`	`33`
`34`		`- public void UpdateRayStep(Vector3 origin, Vector3 terminus)`
	`34`	`+ /// <summary>`
	`35`	`+ /// Update current raystep with new origin and terminus points.`
	`36`	`+ /// Pass by ref to avoid unnecessary struct copy into function since values will be copied anyways locally`
	`37`	`+ /// </summary>`
	`38`	`+ /// <param name="origin">beginning of raystep origin</param>`
	`39`	`+ /// <param name="terminus">end of raystep</param>`
	`40`	`+ public void UpdateRayStep(ref Vector3 origin, ref Vector3 terminus)`
`35`	`41`	`{`
`36`	`42`	`Origin = origin;`
`37`	`43`	`Terminus = terminus;`