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

Revert "Animations sequence fix"

Browse Source 
This reverts commit 92f86e0bab.
This commit is contained in:
Viktor Sukochev 2017-09-05 15:47:54 +07:00
parent 92f86e0bab
commit 27df473d59
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/animation/types/OpacityAnimation.swift
View File

@ -67,9 +67,8 @@ public extension AnimatableVariable where T: DoubleInterpolation {
if let safeFrom = from {
return self.animation((safeFrom >> to).t(during, delay: delay))
}
let factory = {[unowned self]() -> (Double) -> Double in
let origin = self.node!.opacity
let origin = node!.opacity
let factory = { () -> (Double) -> Double in
return { (t: Double) in return origin.interpolate(to, progress: t) }
}
return OpacityAnimation(animatedNode: self.node!, factory: factory, animationDuration: during, delay: delay)

4
Source/animation/types/TransformAnimation.swift
View File

@ -76,8 +76,8 @@ public extension AnimatableVariable where T: TransformInterpolation {
return self.animation((safeFrom >> to).t(during, delay: delay))
}
let factory = { [unowned self] () -> (Double) -> Transform in
let origin = self.node!.place
let origin = node!.place
let factory = { () -> (Double) -> Transform in
return { (t: Double) in return origin.interpolate(to, progress: t) }
}
return TransformAnimation(animatedNode: self.node!, factory: factory, animationDuration: during, delay: delay)