feat: Clean up transfer tweener

Author: jcs090218

Assets/JCSUnity/Scripts/Effects/Particle/Type/JCS_TowardTarget.cs

@@ -21,7 +21,7 @@ public class JCS_TowardTarget : JCS_Particle
         /* Variables */
 
         // tweener effect to the object.
-        private JCS_TransformTweener mJCSTweener = null;
+        private JCS_TransformTweener mTweener = null;
 
         // when reach the certain range disable it.
         private JCS_DisableWithCertainRangeEvent mDisableWidthCertainRangeEvent = null;
@@ -66,11 +66,11 @@ public void SetTarget(JCS_UnityObject trans)
 
         private void Awake()
         {
-            this.mJCSTweener = this.GetComponent<JCS_TransformTweener>();
+            this.mTweener = this.GetComponent<JCS_TransformTweener>();
             this.mDisableWidthCertainRangeEvent = this.GetComponent<JCS_DisableWithCertainRangeEvent>();
 
             // set destination callback.
-            mJCSTweener.SetCallback(DestinationCallback);
+            mTweener.onDone = DestinationCallback;
         }
 
         private void OnEnable()
@@ -100,23 +100,23 @@ private void OnEnable()
             else
             {
                 // set the target transform.
-                this.mJCSTweener.SetTarget(this.mTarget);
+                this.mTweener.SetTarget(this.mTarget);
                 this.mDisableWidthCertainRangeEvent.SetTarget(this.mTarget);
 
                 // starting position.
                 SetPosition(newPos);
             }
 
-            mJCSTweener.UpdateUnityData();
+            mTweener.UpdateUnityData();
 
             // reset alpha change.
-            mJCSTweener.LocalAlpha = 1.0f;
+            mTweener.LocalAlpha = 1.0f;
 
             // enable the sprite renderer component.
-            mJCSTweener.LocalEnabled = true;
+            mTweener.LocalEnabled = true;
 
             // reset tweener
-            mJCSTweener.ResetTweener();
+            mTweener.ResetTweener();
 
             // update the unity data first.
             if (mReverseDirection)
@@ -125,10 +125,10 @@ private void OnEnable()
                  * Reverse could only use DoTween, cannot 
                  * use DoTweenContinue. 
                  */
-                mJCSTweener.DoTween(newPos);
+                mTweener.DoTween(newPos);
             }
             else
-                mJCSTweener.DoTweenContinue(this.mTarget);
+                mTweener.DoTweenContinue(this.mTarget);
         }
 
         /// <summary>

Assets/JCSUnity/Scripts/Effects/Tweener/JCS_TransformTweener.cs

@@ -20,7 +20,8 @@ public class JCS_TransformTweener : JCS_UnityObject
     {
         /* Variables */
 
-        private Action mDestinationCallback = null;
+        public Action onStart = null;
+        public Action onDone = null;
 
 #if UNITY_EDITOR
         [Separator("Helper Variables (JCS_TransformTweener)")]
@@ -216,9 +217,9 @@ protected override void Awake()
 
             RandomizeDuration();
 
-            mTweenerX.SetCallback(DoneTweeningX);
-            mTweenerY.SetCallback(DoneTweeningY);
-            mTweenerZ.SetCallback(DoneTweeningZ);
+            mTweenerX.onDone = DoneTweeningX;
+            mTweenerY.onDone = DoneTweeningY;
+            mTweenerZ.onDone = DoneTweeningZ;
         }
 
         private void LateUpdate()
@@ -291,15 +292,6 @@ public void ResetTweener()
             mTweenerZ.ResetTweener();
         }
 
-        /// <summary>
-        /// Callback when reach destination.
-        /// </summary>
-        /// <param name="func"> function pointer </param>
-        public void SetCallback(Action func)
-        {
-            mDestinationCallback = func;
-        }
-
         /// <summary>
         /// Tween to this vector either position, scale, rotation.
         /// </summary>
@@ -622,21 +614,30 @@ private void DoCallback()
 
         private void SafeDoCallback()
         {
-            if (mDestinationCallback == null)
-                return;
-
             if (!this.mDoneTweenX || !this.mDoneTweenY || !this.mDoneTweenZ)
                 return;
 
-            mDestinationCallback.Invoke();
+            onDone?.Invoke();
         }
 
         /// <summary>
         /// Callback for each tweener.
         /// </summary>
-        private void DoneTweeningX() { this.mDoneTweenX = true; SafeDoCallback(); }
-        private void DoneTweeningY() { this.mDoneTweenY = true; SafeDoCallback(); }
-        private void DoneTweeningZ() { this.mDoneTweenZ = true; SafeDoCallback(); }
+        private void DoneTweeningX()
+        {
+            this.mDoneTweenX = true;
+            SafeDoCallback();
+        }
+        private void DoneTweeningY()
+        {
+            this.mDoneTweenY = true;
+            SafeDoCallback();
+        }
+        private void DoneTweeningZ()
+        {
+            this.mDoneTweenZ = true;
+            SafeDoCallback();
+        }
 
         /// <summary>
         /// Prepare for tweening.
@@ -662,7 +663,8 @@ private void StartTween(
             TweenDelegate easingZ = null,
             Action callback = null)
         {
-            mDestinationCallback = callback;
+            onStart?.Invoke();
+            onDone = callback;
 
             this.mIsDoneTweening = false;
             this.mDoneTweenX = false;

Assets/Tweener/Tweener.cs

@@ -10,7 +10,7 @@ public class Tweener
     {
         /* Variables */
 
-        private Action _Callback = null;
+        public Action onDone = null;
 
         private TweenDelegate _Easing = null;
 
@@ -35,15 +35,6 @@ public class Tweener
         public float progressPct { get { return _ProgressPct; } }
         public JCS_TimeType deltaTimeType { get { return this._DeltaTimeType; } }
 
-        /// <summary>
-        /// Callback when reach destination.
-        /// </summary>
-        /// <param name="func"> function pointer </param>
-        public void SetCallback(Action func)
-        {
-            this._Callback = func;
-        }
-
         /* Functions */
 
         public Tweener() { }
@@ -55,17 +46,17 @@ public Tweener() { }
         /// <param name="to">To.</param>
         /// <param name="duration">Duration.</param>
         /// <param name="easing">Easing.</param>
-        public void easeFromTo(float from, float to, 
-            bool resetElapsedTime = true, 
-            float duration = 1.0f, 
+        public void easeFromTo(float from, float to,
+            bool resetElapsedTime = true,
+            float duration = 1.0f,
             TweenDelegate easing = null, Action callback = null,
             JCS_TimeType deltaTimeType = JCS_TimeType.DELTA_TIME)
         {
             if (easing == null)
                 easing = Easing.Linear;
 
             _Easing = easing;
-            SetCallback(callback);
+            onDone = callback;
 
             _From = from;
             _To = to;
@@ -104,8 +95,8 @@ public void update(bool callCallBack = true)
                 _TimeElapsed = 0.0f;
                 _ProgressPct = 1.0f;
 
-                if (callCallBack && _Callback != null)
-                    _Callback.Invoke();
+                if (callCallBack)
+                    onDone?.Invoke();
             }
         }
 
@@ -115,9 +106,9 @@ public void update(ref float whatToTween)
             update(false);
             whatToTween = _Progression;
 
-            if (wasAnimating && !_Animating && _Callback != null)
+            if (wasAnimating && !_Animating)
             {
-                _Callback.Invoke();
+                onDone?.Invoke();
             }
         }
 
@@ -137,8 +128,7 @@ public void ResetTweener()
         /// </summary>
         public void DoCallback()
         {
-            if (_Callback != null)
-                _Callback.Invoke();
+            onDone?.Invoke();
         }
     }
 }