changes for PR as well as removal of unused functions

Author: johnppella

Assets/MixedRealityToolkit.Examples/Demos/HandTracking/Script/HandInteractionPan.cs

@@ -44,7 +44,6 @@ private enum TouchType
     #endregion Serialized Fields
 
     #region Private Properties
-
     private List<Vector2> uvs = new List<Vector2>();
     private List<Vector2> uvsTouchStart = new List<Vector2>();
     private MeshFilter meshFilter;
@@ -60,40 +59,32 @@ private enum TouchType
     private Vector2 touchingUVTotalOffset;
     private List<IMixedRealityHandPanHandler> handlerInterfaces = new List<IMixedRealityHandPanHandler>();
     private IMixedRealityController currentController = null;
-    private IMixedRealityPointer currentPointer = null;
-
     private bool TouchActive
     {
         get
         {
             return touchingPoint != Vector3.zero;
         }
     }
-
     #endregion Private Properties
 
     #region MonoBehaviour Handlers
-
     private void Awake()
     {
         ValidityCheck();
     }
-
     private void Update()
     {
         if (isEnabled == false)
         {
             return;
         }
 
-        Vector3 tryHandPoint = Vector3.zero;
-        Vector3 tryRayTouchPoint = Vector3.zero;
-
         if (currentController != null)
         {
             if (touchType == TouchType.IndexFinger)
             {
-                if (true == TryGetHandPoint(currentController, out tryHandPoint))
+                if (true == TryGetHandPoint(currentController, TrackedHandJoint.IndexTip, out Vector3 tryHandPoint))
                 {
                     touchingPoint = SnapFingerToQuad(tryHandPoint);
                 }
@@ -104,10 +95,9 @@ private void Update()
             }
             else if (touchType == TouchType.HandRay)
             {
-                if (true == TryGetHandRayPoint(currentController, out tryRayTouchPoint))
+                if (true == TryGetHandPoint(currentController, TrackedHandJoint.Palm, out Vector3 tryHandPoint))
                 {
-                    
-                    touchingPoint = SnapFingerToQuad(tryRayTouchPoint);
+                    touchingPoint = SnapFingerToQuad(tryHandPoint);
                 }
                 else
                 {
@@ -133,15 +123,14 @@ private void Update()
         UpdateIdle();
         UpdateUVMapping();
     }
-
     #endregion MonoBehaviour Handlers
 
 
     #region Private Methods
-    private bool TryGetHandPoint(IMixedRealityController controller, out Vector3 handPoint)
+    private bool TryGetHandPoint(IMixedRealityController controller, TrackedHandJoint joint, out Vector3 handPoint)
     {
         Vector3 point = Vector3.zero;
-        if (true == HandJointUtils.TryGetJointPose(TrackedHandJoint.IndexTip, controller.ControllerHandedness, out MixedRealityPose pose))
+        if (true == HandJointUtils.TryGetJointPose(joint, controller.ControllerHandedness, out MixedRealityPose pose))
         {
             handPoint = pose.Position;
             return true;
@@ -150,35 +139,6 @@ private bool TryGetHandPoint(IMixedRealityController controller, out Vector3 han
         handPoint = point;
         return false;
     }
-    private bool TryGetHandRayPoint(IMixedRealityController controller, out Vector3 handRayPoint)
-    {
-        if (controller != null &&
-            controller.InputSource != null &&
-            controller.InputSource.Pointers != null &&
-            controller.InputSource.Pointers.Length > 0 &&
-            controller.InputSource.Pointers[0].Result != null )
-        {
-            handRayPoint = controller.InputSource.Pointers[0].Position;
-            return true;
-        }
-
-        handRayPoint = Vector3.zero;
-        return false;
-    }
-    private bool IsControllerInNearMode(IMixedRealityController controller)
-    {
-        if (controller != null &&
-            controller.InputSource != null &&
-            controller.InputSource.Pointers != null &&
-            controller.InputSource.Pointers.Length > 0)
-        {
-            if (controller.InputSource.Pointers[0].Result.RayStepIndex < 3 || touchType == TouchType.IndexFinger)
-            {
-                return true;
-            }
-        }
-        return false;
-    }
     private void ValidityCheck()
     {
         //check for box collider
@@ -340,51 +300,8 @@ private Vector3 SnapFingerToQuad(Vector3 pointToSnap)
 
         return Vector3.ProjectOnPlane(pointToSnap - planePoint, planeNormal) + planePoint;
     }
-    private bool FindRayCollision(Ray ray, out Vector3 collisionPt)
-    {
-        Vector3 point = mesh.vertices[0];
-        point = this.transform.TransformPoint(point);
-        Plane plane = new Plane(gameObject.transform.forward, point);
-        float enter = 0.0f;
-        if (true == plane.Raycast(ray, out enter))
-        {
-            collisionPt = ray.GetPoint(enter);
-            return true;
-        }
-        collisionPt = Vector3.zero;
-        return false;
-    }
-    private bool HasHandRayLeftObject()
-    {
-        if (currentController != null && currentController.InputSource != null &&
-            currentController.InputSource.Pointers != null &&
-            currentController.InputSource.Pointers.Length > 0 &&
-            currentController.InputSource.Pointers[0].Result != null && 
-            currentController.InputSource.Pointers[0].Result.RayStepIndex == 0)
-        {
-            //Hand Ray on No Object;
-            return true;
-        }
-        if (currentController != null && currentController.InputSource.Pointers[0].Result.CurrentPointerTarget != null)
-        {
-            if (currentController.InputSource.Pointers[0].Result.CurrentPointerTarget != this.gameObject)
-            {
-                //Hand Ray on a different object.;
-                return true;
-            }
-            else
-            {
-                //Hand Ray on this object.;
-                return false;
-            }
-        }
-
-        //Hand Ray invalid;
-        return false;
-    }
     private void DisconnectTouch()
     {
-        currentPointer = null;
         currentController = null;
         touchingSource = null;
         touchingPoint = Vector3.zero;
@@ -467,11 +384,10 @@ public void OnTouchStarted(HandTrackingInputEventData eventData)
         {
             if (touchingSource == null)
             {
-                currentPointer = eventData.InputSource.Pointers[0];
-                currentController = currentPointer.Controller;
                 touchingSource = eventData.InputSource;
+                currentController = touchingSource.Pointers[0].Controller;
 
-                TryGetHandPoint(eventData.Controller, out Vector3 handPt);
+                TryGetHandPoint(eventData.Controller, TrackedHandJoint.IndexTip, out Vector3 handPt);
 
                 touchingPoint = SnapFingerToQuad(handPt);
                 touchingInitialPt = touchingPoint;
@@ -516,12 +432,10 @@ public void OnInputDown(InputEventData eventData)
         {
             if (touchingSource == null)
             {
-                currentPointer = eventData.InputSource.Pointers[0];
-                currentController = currentPointer.Controller;
                 touchingSource = eventData.InputSource;
-
-                TryGetHandRayPoint(currentController, out touchingPoint);
-
+                currentController = touchingSource.Pointers[0].Controller;
+                TryGetHandPoint(currentController, TrackedHandJoint.Palm, out touchingPoint);
+               // touchingPoint = currentController.InputSource.Pointers[0].Position;
                 touchingPoint = SnapFingerToQuad(touchingPoint);
                 touchingInitialPt = touchingPoint;
                 touchingUV = GetUVFromPoint(touchingPoint);