Calculate swipe by percentage of the page space.

Author: jcs090218

Assets/JCSUnity/Scripts/GUI/JCS_SlideScreenPanelHolder.cs

@@ -90,48 +90,6 @@ public void DeltaMove(Vector3 deltaPos)
                 sp.transform.localPosition += deltaPos;
         }
 
-        /// <summary>
-        /// Difference between target position and current position.
-        /// </summary>
-        /// <returns></returns>
-        public Vector3 PositionDiff()
-        {
-            // SOURCE: https://docs.unity3d.com/2018.1/Documentation/ScriptReference/UI.GraphicRaycaster.Raycast.html
-            PointerEventData pointerEventData = null;
-            Canvas canvas = JCS_Canvas.instance.GetCanvas();
-            GraphicRaycaster raycaster = canvas.GetComponent<GraphicRaycaster>();
-
-            // Set up the new Pointer Event
-            pointerEventData = new PointerEventData(EventSystem.current);
-            // Set the Pointer Event Position to that of the mouse position
-            pointerEventData.position = Input.mousePosition;
-
-            // Create a list of Raycast Results
-            List<RaycastResult> results = new List<RaycastResult>();
-
-            // Raycast using the Graphics Raycaster and mouse click position
-            raycaster.Raycast(pointerEventData, results);
-
-            JCS_SlidePanel sp = null;
-
-            // For every result returned, output the name of the GameObject on the Canvas hit by the Ray
-            foreach (RaycastResult result in results)
-            {
-                sp = result.gameObject.GetComponent<JCS_SlidePanel>();
-                if (sp != null)
-                    break;
-            }
-
-            if (sp != null)
-            {
-                Vector3 curPos = sp.transform.position;
-                Vector3 targPos = sp.GetTargetPosition();
-                return JCS_Mathf.AbsoluteValue(curPos - targPos);
-            }
-
-            return Vector3.zero;
-        }
-
         /// <summary>
         /// Add Force to the panel.
         /// </summary>

Assets/JCSUnity/Scripts/GameObject/2D/2DCamera/JCS_2DSlideScreenCamera.cs

@@ -64,15 +64,9 @@ public class JCS_2DSlideScreenCamera
 
         [Header("## Mobile")]
 
-        [Tooltip("Distance to slide over next scene on x axis.")]
-        [Range(0.0f, 5000.0f)]
+        [Tooltip("Area space to swipe for previous/next page.")]
         [SerializeField]
-        private float mSwipeDistanceX = 5.0f;
-
-        [Tooltip("Distance to slide over next scene on y axis.")]
-        [Range(0.0f, 5000)]
-        [SerializeField]
-        private float mSwipeDistanceY = 5.0f;
+        private Vector2 mSwipeArea = new Vector2(0.5f, 0.5f);
 
         [Tooltip("Freeze the x axis sliding action.")]
         [SerializeField]
@@ -115,6 +109,7 @@ public class JCS_2DSlideScreenCamera
         public JCS_SlideScreenPanelHolder PanelHolder { get { return this.mPanelHolder; } set { this.mPanelHolder = value; } }
         public void SetJCS2DCamera(JCS_2DCamera cam) { this.mJCS_2DCamera = cam; }
         public JCS_UnityGUIType UnityGUIType { get { return this.mUnityGUIType; } set { this.mUnityGUIType = value; } }
+        public Vector2 SwipeArea { get { return this.mSwipeArea; } set { this.mSwipeArea = value; } }
         public bool FreezeX { get { return this.mFreezeX; } set { this.mFreezeX = value; } }
         public bool FreezeY { get { return this.mFreezeY; } set { this.mFreezeY = value; } }
         public AudioClip SwitchSceneSound { get { return this.mSwitchSceneSound; } set { this.mSwitchSceneSound = value; } }
@@ -351,17 +346,21 @@ private void DoMobileSwipe()
 
             if (JCS_Input.GetMouseButtonUp(JCS_MouseButton.LEFT))
             {
-                Vector3 posDiff = mPanelHolder.PositionDiff();
+                Vector3 posDiff = si.DragDistance;
+                JCS_ScreenSizef vs = JCS_ScreenSettings.instance.VisibleScreenSize();
+                JCS_ScreenSizef target_vs = new JCS_ScreenSizef(vs.width * mSwipeArea.x, vs.height * mSwipeArea.y);
 
-                if (!mFreezeX && posDiff.x > this.mSwipeDistanceX)
+                if (!mFreezeX && posDiff.x > target_vs.width)
                 {
+                    print(posDiff);
+
                     if (JCS_Mathf.IsPositive(si.DragDisplacement.x))
                         SwitchScene(JCS_2D4Direction.LEFT);
                     else
                         SwitchScene(JCS_2D4Direction.RIGHT);
                 }
 
-                if (!mFreezeY && posDiff.y > this.mSwipeDistanceY)
+                if (!mFreezeY && posDiff.y > target_vs.height)
                 {
                     if (JCS_Mathf.IsPositive(si.DragDisplacement.y))
                         SwitchScene(JCS_2D4Direction.BOTTOM);