exyte/Macaw
1
1
Fork 0
mirror of https://github.com/exyte/Macaw.git synced 2024-09-21 18:09:21 +03:00
Code Issues Projects Releases Wiki Activity

Stroke line width and color animation support

Browse Source
This commit is contained in:
Viktor Sukochev 2017-02-06 12:22:28 +07:00
parent da3d1f4238
commit e47b230b82
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Source/animation/types/animation_generators/ShapeAnimationGenerator.swift
View File

@ -103,13 +103,38 @@ fileprivate func generateShapAnimation(from:Shape, to: Shape, duration: Double,
let fromPath = RenderUtils.toCGPath(from.form).copy(using: &transform)
let toPath = RenderUtils.toCGPath(to.form).copy(using: &transform)
let group = CAAnimationGroup()
let pathAnimation = CABasicAnimation(keyPath: "path")
pathAnimation.fromValue = fromPath
pathAnimation.toValue = toPath
pathAnimation.duration = duration
let group = CAAnimationGroup()
group.animations = [pathAnimation]
group.animations = [pathAnimation]
// Stroke
if let fromStroke = from.stroke, let toStroke = to.stroke {
// Line width
let strokeWidthAnimation = CABasicAnimation(keyPath: "lineWidth")
strokeWidthAnimation.fromValue = fromStroke.width
strokeWidthAnimation.toValue = toStroke.width
strokeWidthAnimation.duration = duration
group.animations?.append(strokeWidthAnimation)
// Line color
if let fromColor = fromStroke.fill as? Color, let toColor = toStroke.fill as? Color{
let strokeColorAnimation = CABasicAnimation(keyPath: "strokeColor")
strokeColorAnimation.fromValue = RenderUtils.mapColor(fromColor)
strokeColorAnimation.toValue = RenderUtils.mapColor(toColor)
strokeColorAnimation.duration = duration
group.animations?.append(strokeColorAnimation)
}
}
group.duration = duration
group.fillMode = kCAFillModeForwards
group.isRemovedOnCompletion = false