fixing serialization issue with generic types

coderDarren · coderDarren · commit 17657450dafd · 2020-03-20T11:09:34.000-04:00
diff --git a/Tween/ColorTween.cs b/Tween/ColorTween.cs
@@ -11,7 +11,8 @@ namespace Tween {
     public abstract class ColorTween : MonoBehaviour
     {
 
-        public Keyframe<Color>[] keys;
+        //public Keyframe<Color>[] keys;
+        public ColorKeyframe[] keys;
         public float duration;
         public float delay;
         public bool wrap;
@@ -30,6 +31,16 @@ private void OnDisable() {
         }
 #endregion
 
+#region Private Functions
+    private Keyframe<Color>[] GenericKeys(ColorKeyframe[] _keys) {
+        var _ret = new List<Keyframe<Color>>();
+        foreach (ColorKeyframe _frame in _keys) {
+            _ret.Add(new Keyframe<Color>(_frame.value, _frame.nTime));
+        }
+        return _ret.ToArray();
+    }
+#endregion
+
 #region Public Functions
         public void StartTween() {
             Init();
@@ -42,7 +53,7 @@ public void StopTween() {
 
 #region Override Functions
         protected virtual void Init() {
-            m_Tween = new Tweener<Color>(keys, duration, delay, wrap);
+            m_Tween = new Tweener<Color>(GenericKeys(keys), duration, delay, wrap);
             if (m_Tween.Loop != null) {
                 m_Tween.OnSetValue += OnSetValue;
                 m_Tween.OnMoveValue += OnMoveValue;
diff --git a/Tween/FloatTween.cs b/Tween/FloatTween.cs
@@ -11,7 +11,8 @@ namespace Tween {
     public abstract class FloatTween : MonoBehaviour
     {
 
-        public Keyframe<float>[] keys;
+        //public Keyframe<float>[] keys;
+        public FloatKeyframe[] keys;
         public float duration;
         public float delay;
         public bool wrap;
@@ -28,9 +29,19 @@ private void OnDisable() {
         }
 #endregion
 
+#region Private Functions
+    private Keyframe<float>[] GenericKeys(FloatKeyframe[] _keys) {
+        var _ret = new List<Keyframe<float>>();
+        foreach (FloatKeyframe _frame in _keys) {
+            _ret.Add(new Keyframe<float>(_frame.value, _frame.nTime));
+        }
+        return _ret.ToArray();
+    }
+#endregion
+
 #region Override Functions
         protected virtual void Init() {
-            m_Tween = new Tweener<float>(keys, duration, delay, wrap);
+            m_Tween = new Tweener<float>(GenericKeys(keys), duration, delay, wrap);
             if (m_Tween.Loop != null) {
                 m_Tween.OnSetValue += OnSetValue;
                 m_Tween.OnMoveValue += OnMoveValue;
diff --git a/Tween/Keyframe.cs b/Tween/Keyframe.cs
@@ -3,11 +3,39 @@
 
 namespace Tween {
 
-    [System.Serializable]
     public class Keyframe<T>
     {
         public T value;
         [Range(0,1)]
         public float nTime;
+
+        public Keyframe(T _val, float _n) {
+            this.value = _val;
+            this.nTime = _n;
+        }
+    }
+
+    [System.Serializable]
+    public class Vec3Keyframe
+    {
+        public Vector3 value;
+        [Range(0,1)]
+        public float nTime;
+    }
+
+    [System.Serializable]
+    public class FloatKeyframe
+    {
+        public float value;
+        [Range(0,1)]
+        public float nTime;
+    }
+
+    [System.Serializable]
+    public class ColorKeyframe
+    {
+        public Color value;
+        [Range(0,1)]
+        public float nTime;
     }
 }
diff --git a/Tween/SpriteColorTween.cs b/Tween/SpriteColorTween.cs
@@ -0,0 +1,28 @@
+﻿
+using UnityEngine;
+
+namespace Tween {
+
+    [RequireComponent(typeof(SpriteRenderer))]
+    public class SpriteColorTween : ColorTween
+    {
+        private SpriteRenderer m_Sprite;
+
+#region Override Functions
+        protected override void Init() {
+            m_Sprite = GetComponent<SpriteRenderer>();
+            base.Init();
+        }
+
+        protected override void OnSetValue(Color _val) {
+            m_Sprite.color = _val;
+        }
+
+        protected override void OnMoveValue(Color _curr, Color _target, float _nTime) {
+            m_Sprite.color = Color.Lerp(_curr, _target, _nTime);
+        }
+#endregion
+
+    }
+
+}
diff --git a/Tween/Vector3Tween.cs b/Tween/Vector3Tween.cs
@@ -10,8 +10,8 @@ namespace Tween {
     /// </summary>
     public abstract class Vector3Tween : MonoBehaviour
     {
-
-        public Keyframe<Vector3>[] keys;
+        //public Keyframe<Vector3>[] keys;
+        public Vec3Keyframe[] keys;
         public float duration;
         public float delay;
         public bool wrap;
@@ -28,9 +28,19 @@ private void OnDisable() {
         }
 #endregion
 
+#region Private Functions
+    private Keyframe<Vector3>[] GenericKeys(Vec3Keyframe[] _keys) {
+        var _ret = new List<Keyframe<Vector3>>();
+        foreach (Vec3Keyframe _frame in _keys) {
+            _ret.Add(new Keyframe<Vector3>(_frame.value, _frame.nTime));
+        }
+        return _ret.ToArray();
+    }
+#endregion
+
 #region Override Functions
         protected virtual void Init() {
-            m_Tween = new Tweener<Vector3>(keys, duration, delay, wrap);
+            m_Tween = new Tweener<Vector3>(GenericKeys(keys), duration, delay, wrap);
             if (m_Tween.Loop != null) {
                 m_Tween.OnSetValue += OnSetValue;
                 m_Tween.OnMoveValue += OnMoveValue;
