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

Applying node transform directly to animation layer

Browse Source
This commit is contained in:
Victor Sukochev 2016-08-08 18:29:48 +06:00
parent e03eeaab66
commit 5607c47ff1
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/animation/types/animation_generators/Cache/AnimationCache.swift
View File

@ -21,17 +21,24 @@ class AnimationCache {
guard let cachedLayer = layerCache[node] else {
let layer = ShapeLayer()
// layer.backgroundColor = UIColor.greenColor().CGColor
// layer.borderWidth = 1.0
// layer.borderColor = UIColor.blueColor().CGColor
layer.backgroundColor = UIColor.greenColor().CGColor
layer.borderWidth = 1.0
layer.borderColor = UIColor.blueColor().CGColor
if let shapeBounds = node.bounds() {
let cgRect = shapeBounds.cgRect()
layer.bounds = cgRect
let origFrame = CGRectMake(0.0, 0.0,
cgRect.width + cgRect.origin.x,
cgRect.height + cgRect.origin.y)
layer.bounds = origFrame
layer.anchorPoint = CGPointMake(0.0, 0.0)
}
layer.transform = CATransform3DMakeAffineTransform(RenderUtils.mapTransform(node.pos))
layer.node = node
layer.setNeedsDisplay()

9
Source/model/scene/Group.swift
View File

@ -21,7 +21,12 @@ public class Group: Node {
// GENERATED NOT
override public func bounds() -> Rect? {
guard var union = contentsVar.first?.bounds() else {
guard let firstPos = contentsVar.first?.pos else {
return .None
}
guard var union = contentsVar.first?.bounds()?.applyTransform(firstPos) else {
return .None
}
@ -30,7 +35,7 @@ public class Group: Node {
return
}
union = union.union(nodeBounds)
union = union.union(nodeBounds.applyTransform(node.pos))
}
return union

2
Source/model/scene/Shape.swift
View File

@ -67,7 +67,7 @@ public class Shape: Node {
bounds = form.bounds()
}
return bounds.applyTransform(self.pos)
return bounds
}
}