Merge pull request #4735 from johnppella/prerelease/2.0.0.rc2_stabilization_Bug4702

Fix: Slate scroll with hand not working with GGV on Hololens 1 and Motion Controllers in VR #4702

Author: Julia Schwarz

Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Slate/HandInteractionPanZoom.cs

@@ -12,7 +12,7 @@
 
 namespace Microsoft.MixedReality.Toolkit.Input
 {
-    public class HandInteractionPanZoom : BaseFocusHandler, IMixedRealityTouchHandler, IMixedRealityInputHandler, IMixedRealitySourceStateHandler
+    public class HandInteractionPanZoom : BaseFocusHandler, IMixedRealityTouchHandler, IMixedRealityPointerHandler, IMixedRealitySourceStateHandler
     {
         /// <summary>
         /// Internal data stored for each hand or pointer.
@@ -31,8 +31,10 @@ protected class HandPanData
             public Vector2 touchingInitialUV = Vector2.zero;
             public Vector2 touchingUVOffset = Vector2.zero;
             public Vector2 touchingUVTotalOffset = Vector2.zero;
+            public Vector3 initialProjectedOffset = Vector3.zero;
             public IMixedRealityInputSource touchingSource = null;
             public IMixedRealityController currentController = null;
+            public IMixedRealityPointer currentPointer = null;
         }
 
         #region Serialized Fields
@@ -162,11 +164,6 @@ private void Update()
             {
                 if (touchActive)
                 {
-                    if (affordancesVisible == false)
-                    {
-                        SetAffordancesActive(true);
-                    }
-
                     foreach (uint key in handDataMap.Keys)
                     {
                         if (true == UpdateHandTouchingPoint(key))
@@ -207,13 +204,27 @@ private void Update()
 
 
         #region Private Methods
+        private bool TryGetMRControllerRayPoint(HandPanData data, out Vector3 rayPoint)
+        {
+           
+            if (data.currentPointer != null && data.currentController != null && data.currentController.IsPositionAvailable)
+            {
+                rayPoint = data.touchingInitialPt + (SnapFingerToQuad(data.currentPointer.Position) - data.initialProjectedOffset);
+                return true;
+            }
+          
+            rayPoint = Vector3.zero;
+            return false;
+        }
+
         private bool UpdateHandTouchingPoint(uint sourceId)
         {
             Vector3 tryHandPoint = Vector3.zero;
             bool tryGetSucceeded = false;
             if (handDataMap.ContainsKey(sourceId) == true)
             {
                 HandPanData data = handDataMap[sourceId];
+
                 if (data.IsActive == true)
                 {
                     if (data.IsSourceNear == true)
@@ -224,6 +235,11 @@ private bool UpdateHandTouchingPoint(uint sourceId)
                     {
                         tryGetSucceeded = TryGetHandPositionFromController(data.currentController, TrackedHandJoint.Palm, out tryHandPoint);
                     }
+                    if (!tryGetSucceeded)
+                    {
+                        tryGetSucceeded = TryGetMRControllerRayPoint(data, out tryHandPoint);
+                    }
+
                     if (tryGetSucceeded == true)
                     {
                         tryHandPoint = SnapFingerToQuad(tryHandPoint);
@@ -240,7 +256,7 @@ private bool UpdateHandTouchingPoint(uint sourceId)
         }
         private bool TryGetHandRayPoint(IMixedRealityController controller, out Vector3 handRayPoint)
         {
-            if (controller != null &&
+           if (controller != null &&
                 controller.InputSource != null &&
                 controller.InputSource.Pointers != null &&
                 controller.InputSource.Pointers.Length > 0 &&
@@ -444,7 +460,6 @@ private void SetAffordancesActive(bool active)
             {
                 rightPoint.SetActive(affordancesVisible);
             }
-
         }
         private Vector3 GetContactForHand(Handedness hand)
         {
@@ -593,13 +608,17 @@ private Vector3 SnapFingerToQuad(Vector3 pointToSnap)
 
             return Vector3.ProjectOnPlane(pointToSnap - planePoint, planeNormal) + planePoint;
         }
-        private void SetHandDataFromController(IMixedRealityController controller, bool isNear)
+
+
+        private void SetHandDataFromController(IMixedRealityController controller, IMixedRealityPointer pointer, bool isNear)
         {
             HandPanData data = new HandPanData();
             data.IsSourceNear = isNear;
             data.IsActive = true;
             data.touchingSource = controller.InputSource;
             data.currentController = controller;
+            data.currentPointer = pointer;
+
             if (isNear == true)
             {
                 if (TryGetHandPositionFromController(data.currentController, TrackedHandJoint.IndexTip, out Vector3 touchPosition) == true)
@@ -609,7 +628,7 @@ private void SetHandDataFromController(IMixedRealityController controller, bool
                     data.touchingPoint = data.touchingInitialPt;
                 }
             }
-            else
+            else//is far
             {
                 if (TryGetHandRayPoint(controller, out Vector3 handRayPt) == true)
                 {
@@ -623,6 +642,13 @@ private void SetHandDataFromController(IMixedRealityController controller, bool
                 }
             }
 
+            //store value in case of MRController
+            if (data.currentPointer != null)
+            {
+                Vector3 pt = data.currentPointer.Position;
+                data.initialProjectedOffset = SnapFingerToQuad(pt);
+            }
+
             data.touchingQuadCoord = GetUVFromPoint(data.touchingPoint);
             data.touchingInitialUV = data.touchingQuadCoord;
             data.touchingUVTotalOffset = totalUVOffset;
@@ -646,6 +672,8 @@ private void SetHandDataFromController(IMixedRealityController controller, bool
                 previousContactRatio = 1.0f;
             }
 
+            SetAffordancesActive(isNear);
+
             StartTouch(data.touchingSource.SourceId);
         }
         private bool TryGetHandPositionFromController(IMixedRealityController controller, TrackedHandJoint joint, out Vector3 position)
@@ -772,7 +800,7 @@ public override void OnFocusExit(FocusEventData eventData)
         public void OnTouchStarted(HandTrackingInputEventData eventData)
         {
             EndTouch(eventData.SourceId);
-            SetHandDataFromController(eventData.Controller, true);
+            SetHandDataFromController(eventData.Controller, null, true);
             eventData.Use();
         }
         public void OnTouchCompleted(HandTrackingInputEventData eventData)
@@ -788,29 +816,32 @@ public void OnTouchUpdated(HandTrackingInputEventData eventData) { }
         /// <summary>
         /// The Input Event handlers receive Hand Ray events.
         /// </summary>
-        public void OnInputDown(InputEventData eventData)
+        public void OnPointerDown(MixedRealityPointerEventData eventData)
         {
+            SetAffordancesActive(false);
             EndTouch(eventData.SourceId);
-            SetHandDataFromController(eventData.InputSource.Pointers[0].Controller, false);
+            SetHandDataFromController(eventData.Pointer.Controller, eventData.Pointer,  false);
             eventData.Use();
         }
-        public void OnInputUp(InputEventData eventData)
+        public void OnPointerUp(MixedRealityPointerEventData eventData)
         {
             EndTouch(eventData.SourceId);
             eventData.Use();
-        }
-        public void OnPositionInputChanged(InputEventData<Vector2> eventData) { }
-        public void OnInputPressed(InputEventData<float> eventData) { }
+        }    
         #endregion IMixedRealityInputHandler Methods
 
-
         #region IMixedRealitySourceStateHandler Methods
-        public void OnSourceDetected(SourceStateEventData eventData) { }
         public void OnSourceLost(SourceStateEventData eventData)
         {
             EndTouch(eventData.SourceId);
             eventData.Use();
         }
         #endregion IMixedRealitySourceStateHandler Methods
+
+        #region Unused Methods
+        public void OnSourceDetected(SourceStateEventData eventData) { }   
+        public void OnPointerDragged(MixedRealityPointerEventData eventData) { }
+        public void OnPointerClicked(MixedRealityPointerEventData eventData) { }
+        #endregion Unused Methods
     }
 }