diff --git a/Sources/Private/Model/ShapeItems/Trim.swift b/Sources/Private/Model/ShapeItems/Trim.swift index 977e88456b..d327f52676 100644 --- a/Sources/Private/Model/ShapeItems/Trim.swift +++ b/Sources/Private/Model/ShapeItems/Trim.swift @@ -23,7 +23,7 @@ final class Trim: ShapeItem { start = try container.decode(KeyframeGroup.self, forKey: .start) end = try container.decode(KeyframeGroup.self, forKey: .end) offset = try container.decode(KeyframeGroup.self, forKey: .offset) - trimType = try container.decode(TrimType.self, forKey: .trimType) + trimType = try container.decodeIfPresent(TrimType.self, forKey: .trimType) ?? .individually try super.init(from: decoder) } @@ -34,7 +34,7 @@ final class Trim: ShapeItem { end = try KeyframeGroup(dictionary: endDictionary) let offsetDictionary: [String: Any] = try dictionary.value(for: CodingKeys.offset) offset = try KeyframeGroup(dictionary: offsetDictionary) - let trimTypeRawValue: Int = try dictionary.value(for: CodingKeys.trimType) + let trimTypeRawValue: Int = try dictionary.value(for: CodingKeys.trimType) ?? TrimType.individually.rawValue guard let trimType = TrimType(rawValue: trimTypeRawValue) else { throw InitializableError.invalidInput() } diff --git a/Tests/Samples/Issues/pr_2478.json b/Tests/Samples/Issues/pr_2478.json new file mode 100644 index 0000000000..9b5f8b7211 --- /dev/null +++ b/Tests/Samples/Issues/pr_2478.json @@ -0,0 +1 @@ +{"v":"5.5.2","nm":"Untitled","fr":30,"ip":0,"op":15,"w":500,"h":500,"ddd":0,"assets":[{"id":"hat(21)-precomp","layers":[{"nm":"offset","ind":8,"hd":false,"ty":3,"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[5000,5000]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"Rectangle 57","ind":9,"parent":8,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":0,"k":{"c":true,"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-14.19,19.17],[14.19,19.17],[14.19,-19.17],[-14.19,-19.17]]}},"ty":"sh"},{"c":{"a":0,"k":[0.686274528503418,0.6823529601097107,0.6980392336845398]},"o":{"a":0,"k":100},"ty":"fl"},{"r":{"a":0,"k":5.885767459869385},"ty":"rd"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[-9.02,-12.45]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":-4.999985218048096},"o":{"a":0,"k":100},"sk":{"a":0,"k":0.00001366037849948043},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"Vector 34","ind":10,"parent":8,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":0,"k":{"c":true,"i":[[27.84,0],[3.48,0],[-1.16,2.32],[-42.92,0],[-1.16,-2.32],[3.48,0]],"o":[[-27.84,0],[-3.48,0],[1.16,-2.32],[42.92,0],[1.16,2.32],[-3.48,0]],"v":[[0.44,18.21],[-38.28,20.88],[-37.12,15.08],[0,-20.88],[37.12,15.08],[38.28,20.88]]}},"ty":"sh"},{"c":{"a":0,"k":[0.686274528503418,0.6823529601097107,0.6980392336845398]},"lc":1,"lj":1,"ml":10,"o":{"a":0,"k":100},"ty":"st","w":{"a":0,"k":5.885767459869385}},{"c":{"a":0,"k":[0.686274528503418,0.6823529601097107,0.6980392336845398]},"o":{"a":0,"k":100},"ty":"fl"},{"r":{"a":0,"k":0},"ty":"rd"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[-5.76,-0.03]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":-5.000000476837158},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0}]},{"id":"Arm(26)-precomp","layers":[{"nm":"offset","ind":12,"hd":false,"ty":3,"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[5000,5000]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"Vector 23","ind":13,"parent":12,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":0,"k":{"c":true,"i":[[-3.16,-1.41],[-8.94,4.24],[0,0],[-0.45,-12.09],[3.44,-2.21],[-1.03,-2.25],[2.17,-1.82]],"o":[[0,0],[8.94,-4.24],[-0.47,-12.17],[-0.87,-1.58],[-2.6,1.67],[-0.26,-1.75],[-3.79,3.18]],"v":[[-7.47,11.02],[3.99,8.89],[13.35,-0.25],[1.76,-5.86],[-5.54,-11.02],[-5.56,-2.49],[-13.35,-5.18]]}},"ty":"sh"},{"c":{"a":0,"k":[0.686274528503418,0.6823529601097107,0.6980392336845398]},"o":{"a":0,"k":100},"ty":"fl"},{"r":{"a":0,"k":0},"ty":"rd"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[-65.43,-12.71]},"s":{"a":0,"k":[100,-100]},"r":{"a":0,"k":45.000003814697266},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"Vector 46","ind":14,"parent":12,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":0,"k":{"c":false,"i":[[0,0],[0,0]],"o":[[5.85,-4.81],[0,0]],"v":[[-15,6.5],[15,-6.5]]}},"ty":"sh"},{"c":{"a":0,"k":[0.7803922295570374,0.7803922295570374,0.7803922295570374]},"lc":2,"lj":1,"ml":10,"o":{"a":0,"k":100},"ty":"st","w":{"a":0,"k":5}},{"r":{"a":0,"k":0},"ty":"rd"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[-39.4,-28.64]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"Vector 40","ind":15,"parent":12,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":0,"k":{"c":false,"i":[[0,0],[-7.44,-14.46]],"o":[[-9.02,13.39],[0,0]],"v":[[3.16,-20.51],[-3.16,20.51]]}},"ty":"sh"},{"c":{"a":0,"k":[0.7803922295570374,0.7803922295570374,0.7803922295570374]},"lc":2,"lj":1,"ml":10,"o":{"a":0,"k":100},"ty":"st","w":{"a":0,"k":5}},{"r":{"a":0,"k":0},"ty":"rd"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[-20.5,-6.14]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":-107.76818084716797},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0}]},{"id":"Hammer(12)-precomp","layers":[{"nm":"offset","ind":16,"hd":false,"ty":3,"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[5000,5000]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"Rectangle 151","ind":17,"parent":16,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":0,"k":{"c":true,"i":[[-8.76,7.45],[-10.61,0.29],[0,0],[0,0],[0,0],[0,2.94]],"o":[[9.35,-7.94],[16.03,-0.44],[0,0],[0,0],[0,0],[0,0]],"v":[[-24.52,-6.61],[0,-14],[32.07,-14],[32.07,14],[-32.07,14],[-32.07,9.05]]}},"ty":"sh"},{"c":{"a":0,"k":[0.7137255072593689,0.6901960968971252,1]},"o":{"a":0,"k":100},"ty":"fl"},{"r":{"a":0,"k":0},"ty":"rd"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[-75.14,-76.85]},"s":{"a":0,"k":[100,-100]},"r":{"a":0,"k":131.60116577148438},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"Rectangle 150","ind":18,"parent":16,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":0,"k":{"c":false,"i":[[0,0],[0,0],[-1,-22.52],[2.44,0],[4.69,0],[0,4.05]],"o":[[0,0],[0,0],[0.13,3.04],[-5.22,0],[-3.26,0],[0,0]],"v":[[-7.6,-61],[7.6,-61],[12.79,56.24],[8.94,61],[-7.64,60.96],[-12.57,55.53]]}},"ty":"sh"},{"c":{"a":0,"k":[0.7137255072593689,0.6901960968971252,1]},"o":{"a":0,"k":100},"ty":"fl"},{"r":{"a":0,"k":0},"ty":"rd"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[-50.66,-47.18]},"s":{"a":0,"k":[100,-100]},"r":{"a":0,"k":131.60000610351562},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0}]},{"id":"Face(28)-precomp","layers":[{"nm":"offset","ind":25,"hd":false,"ty":3,"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[5000,5000]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"Ellipse 15","ind":27,"parent":25,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":0,"k":{"c":true,"i":[[-2.42,0],[0,2.42],[2.42,0],[0,-2.42]],"o":[[2.42,0],[0,-2.42],[-2.42,0],[0,2.42]],"v":[[0,4.41],[4.41,0],[0,-4.41],[-4.41,0]]}},"ty":"sh"},{"c":{"a":0,"k":[0.686274528503418,0.6823529601097107,0.6980392336845398]},"o":{"a":0,"k":100},"ty":"fl"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[23.49,-6.94]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"Ellipse 14","ind":28,"parent":25,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":0,"k":{"c":true,"i":[[-2.42,0],[0,2.42],[2.42,0],[0,-2.42]],"o":[[2.42,0],[0,-2.42],[-2.42,0],[0,2.42]],"v":[[0,4.41],[4.41,0],[0,-4.41],[-4.41,0]]}},"ty":"sh"},{"c":{"a":0,"k":[0.686274528503418,0.6823529601097107,0.6980392336845398]},"o":{"a":0,"k":100},"ty":"fl"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[-23.49,-6.94]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"Ellipse 8","ind":29,"parent":25,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":0,"k":{"c":true,"i":[[0,-4.06],[4.06,0],[0,4.06],[-6.18,0]],"o":[[0,4.06],[-4.06,0],[0,-4.06],[6.47,0]],"v":[[7.36,0],[0,7.36],[-7.36,0],[0,-7.36]]}},"ty":"sh"},{"c":{"a":0,"k":[0.686274528503418,0.6823529601097107,0.6980392336845398]},"o":{"a":0,"k":100},"ty":"fl"},{"r":{"a":0,"k":0},"ty":"rd"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[-0.47,-6.94]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"Vector 22","ind":30,"parent":25,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":0,"k":{"c":false,"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[-17.11,-1.22],[0,-2.44],[17.11,2.44]]}},"ty":"sh"},{"c":{"a":0,"k":[0.7803922295570374,0.7803922295570374,0.7803922295570374]},"lc":1,"lj":1,"ml":10,"o":{"a":0,"k":100},"ty":"st","w":{"a":0,"k":5}},{"r":{"a":0,"k":0},"ty":"rd"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[-0.79,7.48]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"Vector 8","ind":31,"parent":25,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":0,"k":{"c":false,"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0.38,-8.3],[0,6.37]]}},"ty":"sh"},{"ks":{"a":0,"k":{"c":false,"i":[[0,0],[4.89,0],[0,0]],"o":[[0,0],[-4.89,0],[0,0]],"v":[[0,6.37],[-6.11,8.3],[-11,0.26]]}},"ty":"sh"},{"ks":{"a":0,"k":{"c":false,"i":[[0,0],[-4.38,0],[0,0]],"o":[[0,0],[6.11,0],[0,0]],"v":[[0,6.37],[5.6,8.3],[11,2.7]]}},"ty":"sh"},{"c":{"a":0,"k":[0.7803922295570374,0.7803922295570374,0.7803922295570374]},"lc":2,"lj":2,"ml":10,"o":{"a":0,"k":100},"ty":"st","w":{"a":0,"k":4.889956951141357}},{"r":{"a":0,"k":0},"ty":"rd"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[-0.79,6]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0}]}],"layers":[{"nm":"root","ind":2,"hd":false,"ty":3,"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[250,250]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"Custom shape 1","ind":3,"parent":2,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":0,"k":{"c":false,"i":[[0,0],[-0.96,-6.01],[-8.74,-0.08],[0,0]],"o":[[0,0],[0.96,6.01],[15.3,0.14],[0,0]],"v":[[-2.03,-7.31],[-15.82,0.34],[0.57,7.17],[15.87,0.07]]}},"ty":"sh"},{"c":{"a":0,"k":[0.7803922295570374,0.7803922295570374,0.7803922295570374]},"lc":2,"lj":1,"ml":10,"o":{"a":0,"k":100},"ty":"st","w":{"a":0,"k":5}},{"r":{"a":0,"k":0},"ty":"rd"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[-55.89,132.64]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"ground-line-2","ind":4,"parent":2,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":0,"k":{"c":false,"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-20.96,0],[10.42,0]]}},"ty":"sh"},{"c":{"a":0,"k":[0.686274528503418,0.6823529601097107,0.6980392336845398]},"lc":2,"lj":1,"ml":10,"o":{"a":0,"k":100},"ty":"st","w":{"a":0,"k":5}},{"r":{"a":0,"k":0},"ty":"rd"},{"e":{"a":0,"k":100},"o":{"a":0,"k":0},"s":{"a":0,"k":0},"ty":"tm"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[-91.08,139.48]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"ground-line-3","ind":5,"parent":2,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":0,"k":{"c":false,"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-28.51,0],[28.51,0]]}},"ty":"sh"},{"c":{"a":0,"k":[0.686274528503418,0.6823529601097107,0.6980392336845398]},"lc":2,"lj":1,"ml":10,"o":{"a":0,"k":100},"ty":"st","w":{"a":0,"k":5}},{"r":{"a":0,"k":0},"ty":"rd"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[123.29,139.48]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"hat line 2","ind":6,"parent":2,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":0,"k":{"c":false,"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[-3.72,-6.38],[-3.32,4.52],[3.72,6.38]]}},"ty":"sh"},{"c":{"a":0,"k":[0.7803922295570374,0.7803922295570374,0.8000000715255737]},"lc":2,"lj":1,"ml":10,"o":{"a":0,"k":100},"ty":"st","w":{"a":0,"k":5}},{"r":{"a":0,"k":22},"ty":"rd"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":1,"k":[{"i":{"x":[0.550000011920929],"y":[1]},"o":{"x":[0.45500001311302185],"y":[0]},"s":[-8.77,-112.35],"t":0},{"i":{"x":[0.550000011920929],"y":[1]},"o":{"x":[0.45500001311302185],"y":[0]},"s":[-8.77,-114],"t":3},{"i":{"x":[0.550000011920929],"y":[1]},"o":{"x":[0.45500001311302185],"y":[0]},"s":[-8.77,-112.35],"t":15}]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":-0.00001366037849948043},"o":{"a":0,"k":100},"sk":{"a":0,"k":-0.000006830189249740215},"sa":{"a":0,"k":0}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"hat line","ind":7,"parent":2,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":0,"k":{"c":false,"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[-5.25,-5.75],[-2.75,5.75],[5.25,5.75]]}},"ty":"sh"},{"c":{"a":0,"k":[0.7803922295570374,0.7803922295570374,0.8000000715255737]},"lc":2,"lj":2,"ml":10,"o":{"a":0,"k":100},"ty":"st","w":{"a":0,"k":5}},{"r":{"a":0,"k":29},"ty":"rd"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":1,"k":[{"i":{"x":[0.550000011920929],"y":[1]},"o":{"x":[0.45500001311302185],"y":[0]},"s":[-48.33,-108.97],"t":0},{"i":{"x":[0.550000011920929],"y":[1]},"o":{"x":[0.45500001311302185],"y":[0]},"s":[-48.33,-111],"t":3},{"i":{"x":[0.550000011920929],"y":[1]},"o":{"x":[0.45500001311302185],"y":[0]},"s":[-48.33,-108.97],"t":15}]},"s":{"a":0,"k":[100,-100]},"r":{"a":0,"k":163.1356658935547},"o":{"a":0,"k":100},"sk":{"a":0,"k":0.0000017075468576877029},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"hat","ind":8,"parent":2,"hd":false,"ty":0,"h":99999,"refId":"hat(21)-precomp","w":99999,"ks":{"a":{"a":0,"k":[5000,5000]},"p":{"a":1,"k":[{"i":{"x":[0.550000011920929],"y":[1]},"o":{"x":[0.45500001311302185],"y":[0]},"s":[-19.14,-106.37],"t":0},{"i":{"x":[0.550000011920929],"y":[1]},"o":{"x":[0.45500001311302185],"y":[0]},"s":[-19.14,-108.14],"t":3},{"i":{"x":[0.550000011920929],"y":[1]},"o":{"x":[0.45500001311302185],"y":[0]},"s":[-19.14,-106.37],"t":15}]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":2.700448989868164},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"Ground","ind":11,"parent":2,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":0,"k":{"c":false,"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-181,0],[-128,0]]}},"ty":"sh"},{"c":{"a":0,"k":[0.686274528503418,0.6823529601097107,0.6980392336845398]},"lc":2,"lj":2,"ml":10,"o":{"a":0,"k":100},"ty":"st","w":{"a":0,"k":5}},{"r":{"a":0,"k":0},"ty":"rd"},{"e":{"a":0,"k":100},"o":{"a":0,"k":0},"s":{"a":0,"k":35.71983337402344},"ty":"tm"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[-17.44,139.64]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"Arm","ind":12,"parent":2,"hd":false,"ty":0,"h":99999,"refId":"Arm(26)-precomp","w":99999,"ks":{"a":{"a":0,"k":[5000,5000]},"p":{"a":0,"k":[26.82,54.35]},"s":{"a":0,"k":[100,100]},"r":{"a":1,"k":[{"i":{"x":[0.550000011920929],"y":[1]},"o":{"x":[0.45500001311302185],"y":[0]},"s":[8.792792320251465],"t":0},{"i":{"x":[0.550000011920929],"y":[1]},"o":{"x":[0.45500001311302185],"y":[0]},"s":[15.000000953674316],"t":4},{"i":{"x":[0.550000011920929],"y":[1]},"o":{"x":[0.45500001311302185],"y":[0]},"s":[-5],"t":15}]},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"Hammer","ind":16,"parent":2,"hd":false,"ty":0,"h":99999,"refId":"Hammer(12)-precomp","w":99999,"ks":{"a":{"a":0,"k":[5000,5000]},"p":{"a":0,"k":[-21.03,59.58]},"s":{"a":0,"k":[100,100]},"r":{"a":1,"k":[{"i":{"x":[0.550000011920929],"y":[1]},"o":{"x":[0.45500001311302185],"y":[0]},"s":[0],"t":0},{"i":{"x":[0.550000011920929],"y":[1]},"o":{"x":[0.45500001311302185],"y":[0]},"s":[10],"t":4},{"i":{"x":[0.550000011920929],"y":[1]},"o":{"x":[0.45500001311302185],"y":[0]},"s":[-44],"t":15}]},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"L-Hand","ind":19,"parent":2,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":0,"k":{"c":true,"i":[[-3.16,-1.41],[-8.94,4.24],[0,0],[-0.45,-12.09],[3.44,-2.21],[-1.03,-2.25],[2.17,-1.82]],"o":[[0,0],[8.94,-4.24],[-0.47,-12.17],[-0.87,-1.58],[-2.6,1.67],[-0.26,-1.75],[-3.79,3.18]],"v":[[-7.47,11.02],[3.99,8.89],[13.35,-0.25],[1.76,-5.86],[-5.54,-11.02],[-5.56,-2.49],[-13.35,-5.18]]}},"ty":"sh"},{"c":{"a":0,"k":[0.686274528503418,0.6823529601097107,0.6980392336845398]},"o":{"a":0,"k":100},"ty":"fl"},{"r":{"a":0,"k":0},"ty":"rd"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[-85.1,44.35]},"s":{"a":0,"k":[100,-100]},"r":{"a":0,"k":-105.00000762939453},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"Nail","ind":20,"parent":2,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":1,"k":[{"h":1,"s":[{"c":true,"i":[[0,0],[-1.88,0],[-7.73,0],[0,-1.88],[1.88,0],[2.88,0],[0.27,-17.73],[1.44,0],[0.27,17.73],[2.88,0],[0,1.88]],"o":[[0,-1.88],[7.73,0],[1.88,0],[0,1.88],[-2.88,0],[-0.27,17.73],[-1.44,0],[-0.27,-17.73],[-2.88,0],[-1.88,0],[0,0]],"v":[[-15,-56.59],[-11.59,-60],[11.59,-60],[15,-56.59],[11.59,-53.19],[2.97,-53.19],[2.15,0],[-2.15,0],[-2.97,-53.19],[-11.59,-53.19],[-15,-56.59]]}],"t":1},{"h":1,"s":[{"c":true,"i":[[0,0],[-1.88,0],[-7.73,0],[0,-1.88],[1.88,0],[2.88,0],[0.27,-17.73],[1.44,0],[0.27,17.73],[2.88,0],[0,1.88]],"o":[[0,-1.88],[7.73,0],[1.88,0],[0,1.88],[-2.88,0],[-0.27,17.73],[-1.44,0],[-0.27,-17.73],[-2.88,0],[-1.88,0],[0,0]],"v":[[-15,-56.59],[-11.59,-60],[11.59,-60],[15,-56.59],[11.59,-53.19],[2.97,-53.19],[2.15,0],[-2.15,0],[-2.97,-53.19],[-11.59,-53.19],[-15,-56.59]]}],"t":12},{"h":1,"s":[{"c":true,"i":[[0,0],[-1.88,0],[-7.73,0],[0,-1.88],[1.88,0],[2.88,0],[0.27,-17.73],[1.44,0],[0.27,17.73],[2.88,0],[0,1.88]],"o":[[0,-1.88],[7.73,0],[1.88,0],[0,1.88],[-2.88,0],[-0.27,17.73],[-1.44,0],[-0.27,-17.73],[-2.88,0],[-1.88,0],[0,0]],"v":[[-15,-56.59],[-11.59,-60],[11.59,-60],[15,-56.59],[11.59,-53.19],[2.97,-53.19],[2.15,0],[-2.15,0],[-2.97,-53.19],[-11.59,-53.19],[-15,-56.59]]}],"t":13},{"h":1,"s":[{"c":true,"i":[[0,0],[-1.88,0],[-7.73,0],[0,-1.88],[1.88,0],[2.88,0],[0.27,-17.73],[1.44,0],[0.27,17.73],[2.88,0],[0,1.88]],"o":[[0,-1.88],[7.73,0],[1.88,0],[0,1.88],[-2.88,0],[-0.27,17.73],[-1.44,0],[-0.27,-17.73],[-2.88,0],[-1.88,0],[0,0]],"v":[[-15,-56.59],[-11.59,-60],[11.59,-60],[15,-56.59],[11.59,-53.19],[2.97,-53.19],[2.15,0],[-2.15,0],[-2.97,-53.19],[-11.59,-53.19],[-15,-56.59]]}],"t":14}]},"ty":"sh"},{"c":{"a":0,"k":[0.5882353186607361,0.5568627715110779,1]},"o":{"a":0,"k":100},"r":2,"ty":"fl"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[-129.19,141.69]},"s":{"a":1,"k":[{"i":{"x":[0.550000011920929],"y":[1]},"o":{"x":[0.546187162399292],"y":[-0.0003608371480368078]},"s":[100,100],"t":12},{"i":{"x":[0.550000011920929],"y":[1]},"o":{"x":[0.546187162399292],"y":[-0.0003608371480368078]},"s":[100,86],"t":15}]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"Rectangle 152","ind":21,"parent":20,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":0,"k":{"c":true,"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-15,3.41],[15,3.41],[15,-3.41],[-15,-3.41]]}},"ty":"sh"},{"c":{"a":0,"k":[0.5882353186607361,0.5568627715110779,1]},"o":{"a":0,"k":100},"ty":"fl"},{"r":{"a":0,"k":10},"ty":"rd"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[0,-56.59]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0.000006830189249740215},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"Rectangle 153","ind":22,"parent":20,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":0,"k":{"c":true,"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-3,-28.96],[3,-28.96],[2.15,26.5],[-2.15,26.5]]}},"ty":"sh"},{"c":{"a":0,"k":[0.5882353186607361,0.5568627715110779,1]},"o":{"a":0,"k":100},"ty":"fl"},{"r":{"a":0,"k":0},"ty":"rd"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[0,-26.5]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"hash","ind":23,"parent":24,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":0,"k":{"c":false,"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[9.56,-15.45],[-8.09,15.45]]}},"ty":"sh"},{"ks":{"a":0,"k":{"c":false,"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-11.04,-5.15],[18.39,2.21]]}},"ty":"sh"},{"ks":{"a":0,"k":{"c":false,"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-18.39,5.15],[-12.51,6.62]]}},"ty":"sh"},{"ks":{"a":0,"k":{"c":false,"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[5.15,11.04],[-4.13,8.52]]}},"ty":"sh"},{"c":{"a":0,"k":[0.686274528503418,0.6823529601097107,0.6980392336845398]},"lc":2,"lj":1,"ml":10,"o":{"a":0,"k":100},"ty":"st","w":{"a":0,"k":5}},{"r":{"a":0,"k":0},"ty":"rd"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[29.1,-40.8]},"s":{"a":0,"k":[101.57,99.47]},"r":{"a":0,"k":5.927908897399902},"o":{"a":0,"k":100},"sk":{"a":0,"k":-11.29537296295166},"sa":{"a":0,"k":0}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"tail","ind":24,"parent":2,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":1,"k":[{"h":1,"s":[{"c":false,"i":[[0,0],[-2,3.5]],"o":[[2.92,-5.5],[0,0]],"v":[[-0.03,-41.92],[10.69,-64.36]]}],"t":0},{"h":1,"s":[{"c":false,"i":[[0,0],[-2,3.5]],"o":[[2.92,-5.51],[0,0]],"v":[[-0.02,-41.93],[10.69,-64.36]]}],"t":1},{"h":1,"s":[{"c":false,"i":[[0,0],[-2,3.51]],"o":[[2.95,-5.53],[0,0]],"v":[[0,-41.97],[10.69,-64.36]]}],"t":2},{"h":1,"s":[{"c":false,"i":[[0,0],[-2,3.53]],"o":[[3,-5.58],[0,0]],"v":[[0.03,-42.05],[10.69,-64.36]]}],"t":3},{"h":1,"s":[{"c":false,"i":[[0,0],[-2,3.55]],"o":[[3.08,-5.67],[0,0]],"v":[[0.1,-42.19],[10.69,-64.36]]}],"t":4},{"h":1,"s":[{"c":false,"i":[[0,0],[-2,3.6]],"o":[[3.21,-5.8],[0,0]],"v":[[0.2,-42.42],[10.69,-64.36]]}],"t":5},{"h":1,"s":[{"c":false,"i":[[0,0],[-2,3.67]],"o":[[3.44,-6.05],[0,0]],"v":[[0.39,-42.81],[10.69,-64.36]]}],"t":6},{"h":1,"s":[{"c":false,"i":[[0,0],[-2,3.83]],"o":[[3.93,-6.56],[0,0]],"v":[[0.78,-43.65],[10.69,-64.36]]}],"t":7},{"h":1,"s":[{"c":false,"i":[[0,0],[-2,4.17]],"o":[[4.95,-7.63],[0,0]],"v":[[1.6,-45.39],[10.69,-64.36]]}],"t":8},{"h":1,"s":[{"c":false,"i":[[0,0],[-2,4.33]],"o":[[5.44,-8.14],[0,0]],"v":[[1.99,-46.23],[10.69,-64.36]]}],"t":9},{"h":1,"s":[{"c":false,"i":[[0,0],[-2,4.4]],"o":[[5.67,-8.39],[0,0]],"v":[[2.18,-46.63],[10.69,-64.36]]}],"t":10},{"h":1,"s":[{"c":false,"i":[[0,0],[-2,4.45]],"o":[[5.81,-8.52],[0,0]],"v":[[2.28,-46.85],[10.69,-64.36]]}],"t":11},{"h":1,"s":[{"c":false,"i":[[0,0],[-2,4.47]],"o":[[5.89,-8.61],[0,0]],"v":[[2.35,-46.99],[10.69,-64.36]]}],"t":12},{"h":1,"s":[{"c":false,"i":[[0,0],[-2,4.49]],"o":[[5.93,-8.66],[0,0]],"v":[[2.39,-47.07],[10.69,-64.36]]}],"t":13},{"h":1,"s":[{"c":false,"i":[[0,0],[-2,4.5]],"o":[[5.96,-8.68],[0,0]],"v":[[2.41,-47.11],[10.69,-64.36]]}],"t":14}]},"ty":"sh"},{"ks":{"a":1,"k":[{"h":1,"s":[{"c":false,"i":[[0,0],[-17.32,-27.67],[84,-40]],"o":[[3.5,-14],[6.26,10],[0,0]],"v":[[14.69,-73.36],[62.43,-73.36],[-4.59,25.14]]}],"t":0},{"h":1,"s":[{"c":false,"i":[[0,0],[-17.32,-27.67],[84.03,-40]],"o":[[3.5,-14],[6.26,10],[0,0]],"v":[[14.69,-73.36],[62.43,-73.36],[-4.61,25.14]]}],"t":1},{"h":1,"s":[{"c":false,"i":[[0,0],[-17.32,-27.67],[84.12,-40]],"o":[[3.5,-14],[6.26,10],[0,0]],"v":[[14.69,-73.36],[62.43,-73.36],[-4.66,25.13]]}],"t":2},{"h":1,"s":[{"c":false,"i":[[0,0],[-17.32,-27.67],[84.3,-40]],"o":[[3.5,-14],[6.26,10],[0,0]],"v":[[14.69,-73.36],[62.43,-73.36],[-4.75,25.12]]}],"t":3},{"h":1,"s":[{"c":false,"i":[[0,0],[-17.32,-27.67],[84.61,-40.01]],"o":[[3.5,-14],[6.26,10],[0,0]],"v":[[14.69,-73.36],[62.43,-73.36],[-4.91,25.1]]}],"t":4},{"h":1,"s":[{"c":false,"i":[[0,0],[-17.32,-27.67],[85.12,-40.01]],"o":[[3.5,-14],[6.26,10],[0,0]],"v":[[14.69,-73.36],[62.43,-73.36],[-5.18,25.06]]}],"t":5},{"h":1,"s":[{"c":false,"i":[[0,0],[-17.32,-27.67],[86.01,-40.02]],"o":[[3.5,-14],[6.26,10],[0,0]],"v":[[14.69,-73.36],[62.43,-73.36],[-5.64,25]]}],"t":6},{"h":1,"s":[{"c":false,"i":[[0,0],[-17.32,-27.67],[87.89,-40.05]],"o":[[3.5,-14],[6.26,10],[0,0]],"v":[[14.69,-73.36],[62.43,-73.36],[-6.63,24.86]]}],"t":7},{"h":1,"s":[{"c":false,"i":[[0,0],[-17.32,-27.67],[91.82,-40.09]],"o":[[3.5,-14],[6.26,10],[0,0]],"v":[[14.69,-73.36],[62.43,-73.36],[-8.67,24.58]]}],"t":8},{"h":1,"s":[{"c":false,"i":[[0,0],[-17.32,-27.67],[93.71,-40.12]],"o":[[3.5,-14],[6.26,10],[0,0]],"v":[[14.69,-73.36],[62.43,-73.36],[-9.66,24.44]]}],"t":9},{"h":1,"s":[{"c":false,"i":[[0,0],[-17.32,-27.67],[94.59,-40.13]],"o":[[3.5,-14],[6.26,10],[0,0]],"v":[[14.69,-73.36],[62.43,-73.36],[-10.12,24.38]]}],"t":10},{"h":1,"s":[{"c":false,"i":[[0,0],[-17.32,-27.67],[95.1,-40.13]],"o":[[3.5,-14],[6.26,10],[0,0]],"v":[[14.69,-73.36],[62.43,-73.36],[-10.39,24.34]]}],"t":11},{"h":1,"s":[{"c":false,"i":[[0,0],[-17.32,-27.67],[95.41,-40.14]],"o":[[3.5,-14],[6.26,10],[0,0]],"v":[[14.69,-73.36],[62.43,-73.36],[-10.55,24.32]]}],"t":12},{"h":1,"s":[{"c":false,"i":[[0,0],[-17.32,-27.67],[95.59,-40.14]],"o":[[3.5,-14],[6.26,10],[0,0]],"v":[[14.69,-73.36],[62.43,-73.36],[-10.64,24.3]]}],"t":13},{"h":1,"s":[{"c":false,"i":[[0,0],[-17.32,-27.67],[95.68,-40.14]],"o":[[3.5,-14],[6.26,10],[0,0]],"v":[[14.69,-73.36],[62.43,-73.36],[-10.69,24.3]]}],"t":14}]},"ty":"sh"},{"c":{"a":0,"k":[0.7803922295570374,0.7803922295570374,0.7803922295570374]},"lc":2,"lj":1,"ml":10,"o":{"a":0,"k":100},"ty":"st","w":{"a":0,"k":5}},{"r":{"a":0,"k":0},"ty":"rd"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[106.09,92.25]},"s":{"a":0,"k":[100,100]},"r":{"a":1,"k":[{"i":{"x":[0.17000001668930054],"y":[1]},"o":{"x":[0.8299999833106995],"y":[0]},"s":[12],"t":0},{"i":{"x":[0.17000001668930054],"y":[1]},"o":{"x":[0.8299999833106995],"y":[0]},"s":[0],"t":15}]},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"Face","ind":25,"parent":26,"hd":false,"ty":0,"h":99999,"refId":"Face(28)-precomp","w":99999,"ks":{"a":{"a":0,"k":[5000,5000]},"p":{"a":0,"k":[-50.35,-59.29]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"Vector 33","ind":32,"parent":26,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":0,"k":{"c":false,"i":[[0,0],[-6.44,30.5],[0,0],[0,0]],"o":[[0,0],[10.04,-47.5],[0,0],[0,0]],"v":[[12.5,60],[-12.5,-1.5],[3,-55.5],[-3.5,-60]]}},"ty":"sh"},{"c":{"a":0,"k":[0.7803922295570374,0.7803922295570374,0.7803922295570374]},"lc":2,"lj":1,"ml":10,"o":{"a":0,"k":100},"ty":"st","w":{"a":0,"k":5}},{"r":{"a":0,"k":0},"ty":"rd"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[-77.75,43.78]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"Vector 41","ind":33,"parent":2,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":0,"k":{"c":false,"i":[[0,0],[-42.48,0.27],[-18.43,16.89],[2.17,7.55]],"o":[[-19.94,18.27],[-11.43,10.47],[7.37,-6.76],[0,0]],"v":[[-28.02,-33.93],[2.29,25.78],[16.55,33.93],[28.02,13.89]]}},"ty":"sh"},{"c":{"a":0,"k":[0.7803922295570374,0.7803922295570374,0.7803922295570374]},"lc":2,"lj":1,"ml":10,"o":{"a":0,"k":100},"ty":"st","w":{"a":0,"k":5}},{"r":{"a":0,"k":0},"ty":"rd"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":0,"k":[20,106.24]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":42.504051208496094},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0},{"nm":"Body","ind":26,"parent":2,"hd":false,"ty":4,"shapes":[{"it":[{"ks":{"a":0,"k":{"c":false,"i":[[0,0],[-5.31,10.63],[-4,5.5],[0,0],[-26.5,0],[-7.5,-5],[-5,-7.5],[5.75,-1.78],[-29.5,-57.39],[41,0],[9.36,-0.2]],"o":[[-22.42,-21.5],[0,0],[4,-5.5],[5,-7],[24,0],[5.57,0.71],[5,7.5],[0,0],[29.5,57.39],[-2.65,0],[0,0]],"v":[[-86.83,-25.43],[-87.25,-82.32],[-89.75,-97.82],[-76.25,-98.82],[-30.75,-117.32],[16.25,-110.32],[40.25,-105.82],[29.75,-84.07],[89.75,-6.43],[48.75,116.97],[29.75,117.32]]}},"ty":"sh"},{"ks":{"a":0,"k":{"c":false,"i":[[0,0],[9.45,1.91]],"o":[[-7.25,2.84],[0,0]],"v":[[-22.74,113.08],[-42.24,113.75]]}},"ty":"sh"},{"c":{"a":0,"k":[0.7803922295570374,0.7803922295570374,0.7803922295570374]},"lc":2,"lj":1,"ml":10,"o":{"a":0,"k":100},"ty":"st","w":{"a":0,"k":5}},{"r":{"a":0,"k":0},"ty":"rd"},{"a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"ty":"tr"}],"ty":"gr"}],"ks":{"a":{"a":0,"k":[0,0]},"p":{"a":1,"k":[{"i":{"x":[0.550000011920929],"y":[1]},"o":{"x":[0.45500001311302185],"y":[0]},"s":[8.31,22.46],"t":0},{"i":{"x":[0.550000011920929],"y":[1]},"o":{"x":[0.45500001311302185],"y":[0]},"s":[8.31,20.86],"t":3},{"i":{"x":[0.550000011920929],"y":[1]},"o":{"x":[0.45500001311302185],"y":[0]},"s":[8.31,22.46],"t":15}]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":-180}},"bm":0,"ip":0,"op":15,"st":0,"ao":0,"ddd":0}]} \ No newline at end of file diff --git a/Tests/__Snapshots__/AutomaticEngineTests/testAutomaticEngineDetection.Issues-pr_2478.txt b/Tests/__Snapshots__/AutomaticEngineTests/testAutomaticEngineDetection.Issues-pr_2478.txt new file mode 100644 index 0000000000..4b584aadcc --- /dev/null +++ b/Tests/__Snapshots__/AutomaticEngineTests/testAutomaticEngineDetection.Issues-pr_2478.txt @@ -0,0 +1,5 @@ +Does not support Core Animation engine. Encountered compatibility issues: +[Body.Layer.Layer] Rounded corners support is not currently implemented for combined shape items +[Face.Vector 8.Layer.Layer] Rounded corners support is not currently implemented for combined shape items +[tail.Layer.Layer] Rounded corners support is not currently implemented for combined shape items +[hash.Layer.Layer] Rounded corners support is not currently implemented for combined shape items \ No newline at end of file diff --git a/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-pr_2478-0.png b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-pr_2478-0.png new file mode 100644 index 0000000000..37f78aaa5b Binary files /dev/null and b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-pr_2478-0.png differ diff --git a/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-pr_2478-100.png b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-pr_2478-100.png new file mode 100644 index 0000000000..b9d0325cdc Binary files /dev/null and b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-pr_2478-100.png differ diff --git a/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-pr_2478-25.png b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-pr_2478-25.png new file mode 100644 index 0000000000..85fd002add Binary files /dev/null and b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-pr_2478-25.png differ diff --git a/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-pr_2478-50.png b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-pr_2478-50.png new file mode 100644 index 0000000000..313cda1c90 Binary files /dev/null and b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-pr_2478-50.png differ diff --git a/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-pr_2478-75.png b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-pr_2478-75.png new file mode 100644 index 0000000000..5cdf26374a Binary files /dev/null and b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-pr_2478-75.png differ diff --git a/Tests/__Snapshots__/SnapshotTests/testMainThreadRenderingEngine.Issues-pr_2478-0.png b/Tests/__Snapshots__/SnapshotTests/testMainThreadRenderingEngine.Issues-pr_2478-0.png new file mode 100644 index 0000000000..37f78aaa5b Binary files /dev/null and b/Tests/__Snapshots__/SnapshotTests/testMainThreadRenderingEngine.Issues-pr_2478-0.png differ diff --git a/Tests/__Snapshots__/SnapshotTests/testMainThreadRenderingEngine.Issues-pr_2478-100.png b/Tests/__Snapshots__/SnapshotTests/testMainThreadRenderingEngine.Issues-pr_2478-100.png new file mode 100644 index 0000000000..b9d0325cdc Binary files /dev/null and b/Tests/__Snapshots__/SnapshotTests/testMainThreadRenderingEngine.Issues-pr_2478-100.png differ diff --git a/Tests/__Snapshots__/SnapshotTests/testMainThreadRenderingEngine.Issues-pr_2478-25.png b/Tests/__Snapshots__/SnapshotTests/testMainThreadRenderingEngine.Issues-pr_2478-25.png new file mode 100644 index 0000000000..85fd002add Binary files /dev/null and b/Tests/__Snapshots__/SnapshotTests/testMainThreadRenderingEngine.Issues-pr_2478-25.png differ diff --git a/Tests/__Snapshots__/SnapshotTests/testMainThreadRenderingEngine.Issues-pr_2478-50.png b/Tests/__Snapshots__/SnapshotTests/testMainThreadRenderingEngine.Issues-pr_2478-50.png new file mode 100644 index 0000000000..313cda1c90 Binary files /dev/null and b/Tests/__Snapshots__/SnapshotTests/testMainThreadRenderingEngine.Issues-pr_2478-50.png differ diff --git a/Tests/__Snapshots__/SnapshotTests/testMainThreadRenderingEngine.Issues-pr_2478-75.png b/Tests/__Snapshots__/SnapshotTests/testMainThreadRenderingEngine.Issues-pr_2478-75.png new file mode 100644 index 0000000000..8385b673b1 Binary files /dev/null and b/Tests/__Snapshots__/SnapshotTests/testMainThreadRenderingEngine.Issues-pr_2478-75.png differ