Merge pull request #427 from f3dm76/fix/morphingAnimation

Morphing animation scale/translate/rotation

Author: ystrot

Source/animation/AnimationUtils.swift

@@ -1,11 +1,11 @@
 import Foundation
 
 class AnimationUtils {
-    class func absolutePosition(_ node: Node) -> Transform {
-        return AnimationUtils.absoluteTransform(node, pos: node.place)
+    class func absolutePosition(_ node: Node, view: MacawView? = nil) -> Transform {
+        return AnimationUtils.absoluteTransform(node, pos: node.place, view: view)
     }
 
-    class func absoluteTransform(_ node: Node, pos: Transform) -> Transform {
+    class func absoluteTransform(_ node: Node, pos: Transform, view: MacawView? = nil) -> Transform {
         var transform = pos
         var parent = nodesMap.parents(node).first
         while parent != .none {

Source/animation/types/ShapeAnimation.swift

@@ -11,16 +11,7 @@ class ShapeAnimation: AnimationImpl<Shape> {
 
         let interpolationFunc = { (t: Double) -> Shape in
             if t == 0 {
-                return Shape(form: animatedNode.form,
-                             fill: animatedNode.fill,
-                             stroke: animatedNode.stroke,
-                             place: animatedNode.place,
-                             opaque: animatedNode.opaque,
-                             opacity: animatedNode.opacity,
-                             clip: animatedNode.clip,
-                             effect: animatedNode.effect,
-                             visible: animatedNode.visible,
-                             tag: animatedNode.tag)
+                return animatedNode
             }
 
             return finalValue

Source/animation/types/animation_generators/ShapeAnimationGenerator.swift

@@ -37,7 +37,7 @@ func addShapeAnimation(_ animation: BasicAnimation, sceneLayer: CALayer, animati
 
     // Creating proper animation
     let generatedAnim = generateShapeAnimation(
-        from: fromShape,
+        from: mutatingShape,
         to: toShape,
         duration: duration,
         renderTransform: layer.renderTransform!)
@@ -78,6 +78,12 @@ func addShapeAnimation(_ animation: BasicAnimation, sceneLayer: CALayer, animati
 
         if !animation.autoreverses {
             let currentShape = shapeAnimation.getVFunc()(t)
+            mutatingShape.place = currentShape.place
+            mutatingShape.opaque = currentShape.opaque
+            mutatingShape.opacity = currentShape.opacity
+            mutatingShape.clip = currentShape.clip
+            mutatingShape.mask = currentShape.mask
+            mutatingShape.effect = currentShape.effect
             mutatingShape.form = currentShape.form
             mutatingShape.stroke = currentShape.stroke
             mutatingShape.fill = currentShape.fill
@@ -137,6 +143,15 @@ fileprivate func generateShapeAnimation(from: Shape, to: Shape, duration: Double
 
     group.animations = [pathAnimation]
 
+    // Transform
+    let scaleAnimation = CABasicAnimation(keyPath: "transform")
+    scaleAnimation.duration = duration
+    let view = nodesMap.getView(from)
+    scaleAnimation.fromValue = CATransform3DMakeAffineTransform(AnimationUtils.absolutePosition(from, view: view).toCG())
+    scaleAnimation.toValue = CATransform3DMakeAffineTransform(AnimationUtils.absolutePosition(to, view: view).toCG())
+
+    group.animations?.append(scaleAnimation)
+
     // Fill
     let fromFillColor = from.fill as? Color ?? Color.clear
     let toFillColor = to.fill as? Color ?? Color.clear

Source/animation/types/animation_generators/TransformGenerator.swift

@@ -102,7 +102,9 @@ func transformAnimationByFunc(_ node: Node, valueFunc: (Double) -> Transform, du
         }
 
         timeValues.append(dt)
-        let value = AnimationUtils.absoluteTransform(node, pos: valueFunc(offset + dt))
+
+        let view = nodesMap.getView(node)
+        let value = AnimationUtils.absoluteTransform(node, pos: valueFunc(offset + dt), view: view)
         let cgValue = CATransform3DMakeAffineTransform(value.toCG())
         transformValues.append(cgValue)
     }

Source/model/scene/Group.swift

@@ -31,6 +31,7 @@ open class Group: Node {
             tag: tag
         )
 
+        self.contents = contents
         self.contentsVar.node = self
     }
 
@@ -64,17 +65,7 @@ open class Group: Node {
     }
 
     override open var bounds: Rect? {
-        var union: Rect?
-
-        contents.forEach { node in
-            guard let nodeBounds = node.bounds?.applying(node.place) else {
-                return
-            }
-
-            union = union?.union(rect: nodeBounds) ?? nodeBounds
-        }
-
-        return union
+        return BoundsUtils.getNodesBounds(contents)
     }
 
     override func shouldCheckForPressed() -> Bool {

Source/utils/BoundsUtils.swift

@@ -41,4 +41,15 @@ final internal class BoundsUtils {
             return CGRect(x: destX, y: destY, width: newSize.w, height: newSize.h)
         }
     }
+
+    class func getNodesBounds(_ nodes: [Node]) -> Rect? {
+        var union: Rect?
+        nodes.forEach { node in
+            guard let nodeBounds = node.bounds?.applying(node.place) else {
+                return
+            }
+            union = union?.union(rect: nodeBounds) ?? nodeBounds
+        }
+        return union
+    }
 }

Source/views/MacawView.swift

@@ -592,12 +592,21 @@ private class LayoutHelper {
 
     public func getTransform(_ node: Node, _ layout: ContentLayout, _ size: Size) -> CGAffineTransform {
         setSize(size: size)
-        if let rect = getNodeBounds(node: node) {
+        var rect = node.bounds
+        if let canvas = node as? SVGCanvas {
+            if let view = nodesMap.getView(canvas) {
+                rect = canvas.layout(size: view.bounds.size.toMacaw()).rect()
+            } else {
+                rect = BoundsUtils.getNodesBounds(canvas.contents)
+            }
+        }
+
+        if let rect = rect {
             setRect(rect: rect)
             if let transform = prevTransform {
                 return transform
             }
-            return setTransform(transform: layout.layout(rect: prevRect!, into: size).toCG())
+            return setTransform(transform: layout.layout(rect: prevRect!, into: size).move(dx: rect.x, dy: rect.y).toCG())
         }
         return CGAffineTransform.identity
     }