bug fix for tweener and naming issue

Author: jcs090218

Assets/FrameworkTest_Assets/Scripts/FT_ParticleSytem_Test.cs

@@ -52,14 +52,14 @@ private void Update()
     {
         if (JCS_Input.GetKeyDown(KeyCode.G))
         {
-            JCS_TransfromTweener masterTweener = mParticle.GetComponent<JCS_TransfromTweener>();
+            JCS_TransformTweener masterTweener = mParticle.GetComponent<JCS_TransformTweener>();
             JCS_TowardTarget masterTt = mParticle.GetComponent<JCS_TowardTarget>();
 
             for (int index = 0;
                 index < mParticles.length;
                 ++index)
             {
-                JCS_TransfromTweener tweener = mParticles.at(index).GetComponent<JCS_TransfromTweener>();
+                JCS_TransformTweener tweener = mParticles.at(index).GetComponent<JCS_TransformTweener>();
 
                 tweener.EasingX = masterTweener.EasingX;
                 tweener.EasingY = masterTweener.EasingY;

Assets/JCSUnity/Scripts/Effects/2D/JCS_2DConstWaveEffect.cs

@@ -27,7 +27,7 @@ public class JCS_2DConstWaveEffect
         /*           Private Variables             */
         /*******************************************/
 
-        [Header("** Initialize Varialbes (JCS_2DConstWaveEffect) **")]
+        [Header("** Runtime Varialbes (JCS_2DConstWaveEffect) **")]
 
         [Tooltip("as play on awake!")]
         [SerializeField]

Assets/JCSUnity/Scripts/Effects/Item/JCS_Item.cs

@@ -96,7 +96,7 @@ other sound. (Effect Sound)")]
 
         [Header("** Optional Variables (JCS_UnityObject) **")]
         [SerializeField]
-        private JCS_TransfromTweener mTweener = null;
+        private JCS_TransformTweener mTweener = null;
         [SerializeField]
         private JCS_DestinationDestroy mDestinationDestroy = null;
 
@@ -129,7 +129,7 @@ protected override void Awake()
         protected virtual void Start()
         {
             if (mTweener == null)
-                mTweener = this.GetComponent<JCS_TransfromTweener>();
+                mTweener = this.GetComponent<JCS_TransformTweener>();
             if (mDestinationDestroy == null)
                 mDestinationDestroy = this.GetComponent<JCS_DestinationDestroy>();
         }
@@ -276,7 +276,7 @@ private void DropEffect(Collider other)
                 if (mTweener == null)
                 {
                     // default settings
-                    mTweener = this.gameObject.AddComponent<JCS_TransfromTweener>();
+                    mTweener = this.gameObject.AddComponent<JCS_TransformTweener>();
 
                     mTweener.EasingY = JCS_TweenType.EASE_OUT_BACK;
                     mTweener.DurationX = 2.0f;

Assets/JCSUnity/Scripts/Effects/JCS_SlideEffect.cs

@@ -15,7 +15,7 @@ namespace JCSUnity
 
     /// <summary>
     /// Make object to make the smooth slide effect.
-    ///     - Could be compose with JCS_TransfromTweener class.
+    ///     - Could be compose with JCS_TransformTweener class.
     /// </summary>
     public class JCS_SlideEffect
         : JCS_UnityObject

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

@@ -16,7 +16,7 @@ namespace JCSUnity
     /// <summary>
     /// Particle will lerp to the target position.
     /// </summary>
-    [RequireComponent(typeof(JCS_TransfromTweener))]
+    [RequireComponent(typeof(JCS_TransformTweener))]
     [RequireComponent(typeof(JCS_DisableWithCertainRangeEvent))]
     public class JCS_TowardTarget
         : JCS_Particle
@@ -29,7 +29,7 @@ public class JCS_TowardTarget
         // Private Variables
 
         // tweener effect to the object.
-        private JCS_TransfromTweener mJCSTweener = null;
+        private JCS_TransformTweener mJCSTweener = null;
 
         // when reach the certain range disable it.
         private JCS_DisableWithCertainRangeEvent mDisableWidthCertainRangeEvent = null;
@@ -78,7 +78,7 @@ public void SetTargetTransfrom(Transform trans)
         //------------------------------
         private void Awake()
         {
-            this.mJCSTweener = this.GetComponent<JCS_TransfromTweener>();
+            this.mJCSTweener = this.GetComponent<JCS_TransformTweener>();
             this.mDisableWidthCertainRangeEvent = this.GetComponent<JCS_DisableWithCertainRangeEvent>();
 
             // set destination callback.

Assets/JCSUnity/Scripts/Effects/Tweener/JCS_TransfromTweener.cs renamed to Assets/JCSUnity/Scripts/Effects/Tweener/JCS_TransformTweener.cs

@@ -1,5 +1,5 @@
 /**
- * $File: JCS_TransfromTweener.cs $
+ * $File: JCS_TransformTweener.cs $
  * $Date: $
  * $Revision: $
  * $Creator: Jen-Chieh Shen $
@@ -13,11 +13,10 @@
 
 namespace JCSUnity
 {
-
     /// <summary>
     /// Tweener Effect
     /// </summary>
-    public class JCS_TransfromTweener
+    public class JCS_TransformTweener
         : JCS_UnityObject
     {
 
@@ -27,7 +26,7 @@ public class JCS_TransfromTweener
         //----------------------
         // Private Variables
 
-        [Header("** Check Variables (JCS_TransfromTweener) **")]
+        [Header("** Check Variables (JCS_TransformTweener) **")]
 
         [SerializeField]
         private bool mContinueTween = false;
@@ -40,28 +39,31 @@ public class JCS_TransfromTweener
         private Vector3 mRecordTargetTransformPosition = Vector3.zero;
 
         private Transform mRecordTransform = null;
-        
+
         [Tooltip("Is done tweening/animating?")]
         [SerializeField]
         private bool mIsDoneTweening = false;
 
 
-        [Header("** Runtime Variables (JCS_TransfromTweener) **")]
+        [Header("** Runtime Variables (JCS_TransformTweener) **")]
 
         [Tooltip("Do the tween effect?")]
         [SerializeField]
         private bool mTween = true;
 
         [Tooltip("How fase it move on x axis.")]
-        [SerializeField] [Range(0.01f, 1000.0f)]
+        [SerializeField]
+        [Range(0.01f, 1000.0f)]
         private float mDurationX = 1.0f;
 
         [Tooltip("How fase it move on y axis.")]
-        [SerializeField] [Range(0.01f, 1000.0f)]
+        [SerializeField]
+        [Range(0.01f, 1000.0f)]
         private float mDurationY = 1.0f;
 
         [Tooltip("How fase it move on z axis.")]
-        [SerializeField] [Range(0.01f, 1000.0f)]
+        [SerializeField]
+        [Range(0.01f, 1000.0f)]
         private float mDurationZ = 1.0f;
 
         [Tooltip("Enable this if the target is moving all the time.")]
@@ -76,30 +78,24 @@ [SerializeField] [Range(0.01f, 1000.0f)]
         private bool mDestroyWhenDoneTweening = false;
 
         [Tooltip("How many times of done tweening destroy will active?")]
-        [SerializeField] [Range(1, 10)]
+        [SerializeField]
+        [Range(1, 10)]
         private int mDestroyDoneTweeningCount = 1;
 
 
         [Header("- Randomize Duration")]
 
         [Tooltip("Randomize the duration with all axis at start. (x, y, z)")]
-        [SerializeField] [Range(0.0f, 1000.0f)]
+        [SerializeField]
+        [Range(0.0f, 1000.0f)]
         private float mRandomizeDuration = 0.0f;
 
 
         [Header("- Tweener Effect Transform")]
 
-        [Tooltip("Do tween effect with position?")]
-        [SerializeField]
-        private bool mTweenPosition = true;
-
-        [Tooltip("Do tween effect with rotation?")]
+        [Tooltip("Which transform's properties to tween.")]
         [SerializeField]
-        private bool mTweenRotation = false;
-
-        [Tooltip("Do tween effect with scale?")]
-        [SerializeField]
-        private bool mTweenScale = false;
+        private JCS_TransformType mTweenType = JCS_TransformType.POSITION;
 
         [Tooltip("Do the track base on location position.")]
         [SerializeField]
@@ -123,7 +119,7 @@ [SerializeField] [Range(0.0f, 1000.0f)]
         private Vector3Tweener tweener = new Vector3Tweener();
 
 
-        [Header("- Continuous Tween (JCS_TransfromTweener) ")]
+        [Header("- Continuous Tween (JCS_TransformTweener) ")]
 
         [Tooltip("While Continue tween when did the tweener algorithm stop?")]
         [SerializeField]
@@ -151,7 +147,8 @@ [SerializeField] [Range(0.0f, 1000.0f)]
         public Transform RecordTransform { get { return this.mRecordTransform; } }
         public bool DestroyWhenDoneTweening { get { return this.mDestroyWhenDoneTweening; } set { this.mDestroyWhenDoneTweening = value; } }
         public bool TweenEveryFrame { get { return this.mTweenEveryFrame; } set { this.mTweenEveryFrame = value; } }
-        
+        public JCS_TransformType TweenType { get { return this.mTweenType; } set { this.mTweenType = value; } }
+
         //========================================
         //      Unity's function
         //------------------------------
@@ -185,12 +182,18 @@ private void LateUpdate()
                 tweener.updateZ();
 
                 // Set the Position
-                if (mTweenPosition)
-                    transform.localPosition = tweener.progression;
-                if (mTweenRotation)
-                    transform.localEulerAngles = tweener.progression;
-                if (mTweenScale)
-                    transform.localScale = tweener.progression;
+                switch (mTweenType)
+                {
+                    case JCS_TransformType.POSITION:
+                        transform.localPosition = tweener.progression;
+                        break;
+                    case JCS_TransformType.ROTATION:
+                        transform.localEulerAngles = tweener.progression;
+                        break;
+                    case JCS_TransformType.SCALE:
+                        transform.localScale = tweener.progression;
+                        break;
+                }
 
                 mIsDoneTweening = false;
             }
@@ -287,7 +290,22 @@ public void DoTween(
             JCS_TweenType typeZ,
             CallBackDelegate callback = null)
         {
-            DoTween(LocalPosition, to, durationX, durationY, durationZ, typeX, typeY, typeZ, callback);
+            Vector3 from = Vector3.zero;
+
+            switch (mTweenType)
+            {
+                case JCS_TransformType.POSITION:
+                    from = LocalPosition;
+                    break;
+                case JCS_TransformType.ROTATION:
+                    from = LocalEulerAngles;
+                    break;
+                case JCS_TransformType.SCALE:
+                    from = LocalScale;
+                    break;
+            }
+
+            DoTween(from, to, durationX, durationY, durationZ, typeX, typeY, typeZ, callback);
         }
 
         /// <summary>

Assets/JCSUnity/Scripts/Effects/Tweener/JCS_TransfromTweener.cs.meta renamed to Assets/JCSUnity/Scripts/Effects/Tweener/JCS_TransformTweener.cs.meta

@@ -0,0 +1,25 @@
+/**
+ * $File: JCS_TransformType.cs $
+ * $Date: 2017-09-10 07:06:47 $
+ * $Revision: $
+ * $Creator: Jen-Chieh Shen $
+ * $Notice: See LICENSE.txt for modification and distribution information 
+ *	                 Copyright (c) 2017 by Shen, Jen-Chieh $
+ */
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+
+namespace JCSUnity
+{
+    /// <summary>
+    /// List of transform properties.
+    /// </summary>
+    public enum JCS_TransformType
+    {
+        POSITION,
+        ROTATION,
+        SCALE
+    }
+}

Assets/JCSUnity/Scripts/Enums/JCS_TransformType.cs

@@ -16,7 +16,7 @@ namespace JCSUnity
     /// <summary>
     /// Black Slide Screen
     /// </summary>
-    [RequireComponent(typeof(JCS_TransfromTweener))]
+    [RequireComponent(typeof(JCS_TransformTweener))]
     public class JCS_BlackSlideScreen
         : MonoBehaviour
     {
@@ -26,7 +26,7 @@ public class JCS_BlackSlideScreen
 
         //----------------------
         // Private Variables
-        private JCS_TransfromTweener mTweener = null;
+        private JCS_TransformTweener mTweener = null;
 
         private Vector3 mStartingPosition = Vector3.zero;
 
@@ -42,7 +42,7 @@ public class JCS_BlackSlideScreen
         //------------------------------
         private void Awake()
         {
-            this.mTweener = this.GetComponent<JCS_TransfromTweener>();
+            this.mTweener = this.GetComponent<JCS_TransformTweener>();
         }
 
         private void Start()