More API changes

exyte · Aug 6, 2020 · 4a7049e · 4a7049e
1 parent b4feb66
commit 4a7049e
Showing 1 changed file with 11 additions and 58 deletions.
diff --git a/Source/animation/types/ShapeAnimation.swift b/Source/animation/types/ShapeAnimation.swift
@@ -66,85 +66,38 @@ class ShapeAnimation: AnimationImpl<Shape> {
 }
 
 public extension AnimatableVariable where T == Stroke? {
-    func animate<T: Stroke>(from: T? = nil, to: T, during: Double = 1.0, delay: Double = 0.0) {
-        let shape = node as! Shape
-
-        var safeFrom = from
-        if safeFrom == nil {
-            if let shapeStroke = shape.stroke as? T {
-                safeFrom = shapeStroke
-            } else {
-                safeFrom = Stroke(width: 1.0) as? T
-            }
-        }
-
-        shape.stroke = safeFrom
 
+    func animate(from: Stroke? = nil, to: Stroke, during: Double = 1.0, delay: Double = 0.0) {
+        let shape = node as! Shape
+        shape.stroke = from ?? (shape.stroke ?? Stroke(width: 1.0))
         let finalShape = SceneUtils.shapeCopy(from: shape)
         finalShape.stroke = to
-
         _ = ShapeAnimation(animatedNode: shape, finalValue: finalShape, animationDuration: during, delay: delay, autostart: true)
     }
 
-    func animation<T: Stroke>(from: T? = nil, to: T, during: Double = 1.0, delay: Double = 0.0) -> Animation {
+    func animation(from: Stroke? = nil, to: Stroke, during: Double = 1.0, delay: Double = 0.0) -> Animation {
         let shape = node as! Shape
-
-        var safeFrom = from
-        if safeFrom == nil {
-            if let shapeStroke = shape.stroke as? T {
-                safeFrom = shapeStroke
-            } else {
-                safeFrom = Stroke(width: 1.0) as? T
-            }
-        }
-
-        shape.stroke = safeFrom
-
+        shape.stroke = from ?? (shape.stroke ?? Stroke(width: 1.0))
         let finalShape = SceneUtils.shapeCopy(from: shape)
         finalShape.stroke = to
-
         return ShapeAnimation(animatedNode: shape, finalValue: finalShape, animationDuration: during, delay: delay, autostart: false)
     }
 }
-
 public extension AnimatableVariable where T == Fill? {
-    func animate<T: Fill>(from: T? = nil, to: T, during: Double = 1.0, delay: Double = 0.0) {
-        let shape = node as! Shape
-
-        var safeFrom = from
-        if safeFrom == nil {
-            if let shapeFill = shape.fill as? T {
-                safeFrom = shapeFill
-            } else {
-                safeFrom = Color.clear as? T
-            }
-        }
-
-        shape.fill = safeFrom
 
+    func animate(from: Fill? = nil, to: Fill, during: Double = 1.0, delay: Double = 0.0) {
+        let shape = node as! Shape
+        shape.fill = from ?? (shape.fill ?? Color.clear)
         let finalShape = SceneUtils.shapeCopy(from: shape)
         finalShape.fill = to
-
         _ = ShapeAnimation(animatedNode: shape, finalValue: finalShape, animationDuration: during, delay: delay, autostart: true)
     }
-
-    func animation<T: Fill>(from: T? = nil, to: T, during: Double = 1.0, delay: Double = 0.0) -> Animation {
+    
+    func animation(from: Fill? = nil, to: Fill, during: Double = 1.0, delay: Double = 0.0) -> Animation {
         let shape = node as! Shape
-
-        var safeFrom = from
-        if safeFrom == nil {
-            if let shapeFill = shape.fill as? T {
-                safeFrom = shapeFill
-            } else {
-                safeFrom = Color.clear as? T
-            }
-        }
-
-        shape.fill = safeFrom
-
+        shape.fill = from ?? (shape.fill ?? Color.clear)
         let finalShape = SceneUtils.shapeCopy(from: shape)
         finalShape.fill = to
-
         return ShapeAnimation(animatedNode: shape, finalValue: finalShape, animationDuration: during, delay: delay, autostart: false)
     }
 }