From acd5098863864810c7802c7683812af286a448cd Mon Sep 17 00:00:00 2001 From: Anton Dolzhenko Date: Wed, 4 Jan 2017 21:37:39 +0200 Subject: [PATCH 1/4] Remove unnecessary parameters from pod command --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 804738e..f4fd744 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ source 'https://github.com/CocoaPods/Specs.git' platform :ios, '9.0' target 'TargetName' do -pod 'RainyRefreshControl', :git => 'https://github.com/Onix-Systems/RainyRefreshControl', :branch => 'feature/remove-sample-project' +pod 'RainyRefreshControl' end ``` From 7f13e7e243f851840802b56b5d21f24dd3e9b138 Mon Sep 17 00:00:00 2001 From: Anton Dolzhenko Date: Wed, 18 Jan 2017 10:22:05 +0200 Subject: [PATCH 2/4] Remove POP dependency --- RainyRefreshControl.podspec | 1 - Sources/Umbrella.swift | 145 ++++++++++++++++++++++-------------- 2 files changed, 88 insertions(+), 58 deletions(-) diff --git a/RainyRefreshControl.podspec b/RainyRefreshControl.podspec index cb1bfae..380d30b 100644 --- a/RainyRefreshControl.podspec +++ b/RainyRefreshControl.podspec @@ -15,6 +15,5 @@ Pod::Spec.new do |s| s.frameworks = 'SpriteKit' s.ios.deployment_target = '9.0' s.pod_target_xcconfig = { 'SWIFT_VERSION' => '3' } - s.dependency 'pop', '1.0.9' end diff --git a/Sources/Umbrella.swift b/Sources/Umbrella.swift index cad0b97..8f5ff9b 100644 --- a/Sources/Umbrella.swift +++ b/Sources/Umbrella.swift @@ -6,7 +6,7 @@ // Copyright © 2016 Onix Systems. All rights reserved. // -import pop +import UIKit enum UmbrellaState { case closed @@ -18,11 +18,64 @@ enum UmbrellaState { final class UmbrellaView:UIView { - var lineWidth:CGFloat = 3.0 - var strokeColor: UIColor = .red + var lineWidth:CGFloat = 1.0 + var strokeColor: UIColor = .white + + private(set) var state = UmbrellaState.closed + private var animationValue: CGFloat { + set { + if let layer = layer as? UmbrellaLayer { + layer.animationValue = newValue + } + } + get { + if let layer = layer as? UmbrellaLayer { + return layer.animationValue + } + return 0.0 + } + } - //A,B,C,D,E - origin coords - //a,b,c,d,e - control points + override class var layerClass : AnyClass { + return UmbrellaLayer.self + } + + override init(frame: CGRect) { + super.init(frame: frame) + if let layer = layer as? UmbrellaLayer { + layer.contentsScale = UIScreen.main.scale + layer.lineWidth = lineWidth + layer.strokeColor = strokeColor + } + animationValue = 1 + } + + required init?(coder aDecoder: NSCoder) { + super.init(coder: aDecoder) + } + + // MARK: - Methods + func setButtonState(state: UmbrellaState, animated: Bool) { + if self.state == state { + return + } + self.state = state + + let toValue: CGFloat = state.value + if animated { + UIView.animate(withDuration: 0.25, animations: { + self.animationValue = toValue + }) + } else { + animationValue = toValue + } + } +} + +final class UmbrellaLayer:CALayer { + @NSManaged var animationValue: CGFloat + var lineWidth:CGFloat = 1.0 + var strokeColor:UIColor = .white private var APoint:CGPoint! private var aPoint:CGPoint! @@ -45,50 +98,31 @@ final class UmbrellaView:UIView { private var FPoint:CGPoint! - private(set) var state = UmbrellaState.closed - private var animationValue: CGFloat = 1.0 { - didSet { - setNeedsDisplay() - } + fileprivate class func isCustomAnimKey(_ key: String) -> Bool { + return key == "animationValue" } - // MARK: - Methods - func setButtonState(state: UmbrellaState, animated: Bool) { - if self.state == state { - return - } - self.state = state - if pop_animation(forKey: "animationValue") != nil { - pop_removeAnimation(forKey: "animationValue") + override class func needsDisplay(forKey key: String) -> Bool { + if self.isCustomAnimKey(key) { + return true } - - let toValue: CGFloat = state.value - if animated { - let animation: POPBasicAnimation = POPBasicAnimation() - if let property = POPAnimatableProperty.property(withName: "animationValue", initializer: { prop in - prop?.readBlock = { (object: Any?, values: UnsafeMutablePointer?) -> Void in - if let view = object as? UmbrellaView { - values?[0] = view.animationValue - } - } - prop?.writeBlock = { (object: Any?, values: UnsafePointer?) -> Void in - if let button = object as? UmbrellaView, - let values = values { - button.animationValue = values[0] - } + return super.needsDisplay(forKey: key) + } + + override func action(forKey event: String) -> CAAction? { + if UmbrellaLayer.isCustomAnimKey(event) { + if let animation = super.action(forKey: "backgroundColor") as? CABasicAnimation { + animation.keyPath = event + if let pLayer = presentation() { + animation.fromValue = pLayer.animationValue } - prop?.threshold = 0.01 - }) as? POPAnimatableProperty { - animation.property = property + animation.toValue = nil + return animation } - animation.fromValue = NSNumber(value: Float(self.animationValue)) - animation.toValue = NSNumber(value: Float(toValue)) - animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut) - animation.duration = 0.25 - pop_add(animation, forKey: "percentage") - } else { - animationValue = toValue + setNeedsDisplay() + return nil } + return super.action(forKey: event) } func update() { @@ -118,18 +152,16 @@ final class UmbrellaView:UIView { FPoint = CGPoint(x: midX, y: (midY-height*0.3683)-(0.0016*animationValue)) } - override func draw(_ rect: CGRect) { - super.draw(rect) - update() + override func draw(in ctx: CGContext) { + super.draw(in: ctx) + ctx.setStrokeColor(strokeColor.cgColor) + ctx.setLineWidth(lineWidth) + update() //// Draw a handle let bezierPath = UIBezierPath() bezierPath.move(to: CGPoint(x: bounds.midX, y: bounds.midY+bounds.height*0.4266)) bezierPath.addLine(to: CGPoint(x: bounds.midX, y: bounds.midY-bounds.height*0.415)) - strokeColor.setStroke() - bezierPath.lineWidth = lineWidth - bezierPath.lineCapStyle = .round - bezierPath.stroke() let arrayOfDots:[(CGPoint,CGPoint,CGPoint,CGPoint)] = [(APoint,FPoint,aPoint,FPoint), (FPoint,EPoint,FPoint,ePoint), @@ -141,13 +173,12 @@ final class UmbrellaView:UIView { (DPoint,EPoint,DPoint,e1Point)] arrayOfDots.forEach { (a,b,c,d) in - let path = UIBezierPath() - path.move(to: a) - path.addCurve(to: b, controlPoint1: c, controlPoint2: d) - strokeColor.setStroke() - path.lineWidth = lineWidth - path.lineCapStyle = .round - path.stroke() + bezierPath.move(to: a) + bezierPath.addCurve(to: b, controlPoint1: c, controlPoint2: d) } + ctx.addPath(bezierPath.cgPath) + ctx.setLineCap(.round) + ctx.strokePath() } + } From 3e4e3cdf7db7932c2316e1e7b64c0973391664c2 Mon Sep 17 00:00:00 2001 From: Anton Dolzhenko Date: Wed, 18 Jan 2017 10:28:44 +0200 Subject: [PATCH 3/4] Update sample --- Example/Podfile | 2 +- Example/Podfile.lock | 15 +- .../RainyRefreshControl.podspec.json | 5 - Example/Pods/Manifest.lock | 15 +- Example/Pods/Pods.xcodeproj/project.pbxproj | 758 +++------- Example/Pods/RainyRefreshControl/README.md | 32 + .../Sources/Umbrella.swift | 145 +- ...reshControl Demo-acknowledgements.markdown | 34 - ...RefreshControl Demo-acknowledgements.plist | 40 - ...ods-RainyRefreshControl Demo-frameworks.sh | 2 - ...ds-RainyRefreshControl Demo.debug.xcconfig | 6 +- ...-RainyRefreshControl Demo.release.xcconfig | 6 +- .../RainyRefreshControl.xcconfig | 1 - .../Pods/Target Support Files/pop/Info.plist | 26 - .../Pods/Target Support Files/pop/pop-dummy.m | 5 - .../Target Support Files/pop/pop-prefix.pch | 12 - .../Target Support Files/pop/pop-umbrella.h | 31 - .../Target Support Files/pop/pop.modulemap | 6 - .../Target Support Files/pop/pop.xcconfig | 12 - Example/Pods/pop/LICENSE | 30 - Example/Pods/pop/README.md | 203 --- Example/Pods/pop/pop/POP.h | 29 - Example/Pods/pop/pop/POPAction.h | 67 - Example/Pods/pop/pop/POPAnimatableProperty.h | 251 ---- Example/Pods/pop/pop/POPAnimatableProperty.mm | 1307 ----------------- Example/Pods/pop/pop/POPAnimation.h | 188 --- Example/Pods/pop/pop/POPAnimation.mm | 303 ---- Example/Pods/pop/pop/POPAnimationEvent.h | 69 - Example/Pods/pop/pop/POPAnimationEvent.mm | 108 -- .../Pods/pop/pop/POPAnimationEventInternal.h | 41 - Example/Pods/pop/pop/POPAnimationExtras.h | 43 - Example/Pods/pop/pop/POPAnimationExtras.mm | 117 -- Example/Pods/pop/pop/POPAnimationInternal.h | 505 ------- Example/Pods/pop/pop/POPAnimationPrivate.h | 16 - Example/Pods/pop/pop/POPAnimationRuntime.h | 103 -- Example/Pods/pop/pop/POPAnimationRuntime.mm | 329 ----- Example/Pods/pop/pop/POPAnimationTracer.h | 60 - Example/Pods/pop/pop/POPAnimationTracer.mm | 191 --- .../Pods/pop/pop/POPAnimationTracerInternal.h | 96 -- Example/Pods/pop/pop/POPAnimator.h | 47 - Example/Pods/pop/pop/POPAnimator.mm | 806 ---------- Example/Pods/pop/pop/POPAnimatorPrivate.h | 68 - Example/Pods/pop/pop/POPBasicAnimation.h | 71 - Example/Pods/pop/pop/POPBasicAnimation.mm | 106 -- .../Pods/pop/pop/POPBasicAnimationInternal.h | 97 -- Example/Pods/pop/pop/POPCGUtils.h | 152 -- Example/Pods/pop/pop/POPCGUtils.mm | 150 -- Example/Pods/pop/pop/POPCustomAnimation.h | 46 - Example/Pods/pop/pop/POPCustomAnimation.mm | 75 - Example/Pods/pop/pop/POPDecayAnimation.h | 66 - Example/Pods/pop/pop/POPDecayAnimation.mm | 203 --- .../Pods/pop/pop/POPDecayAnimationInternal.h | 127 -- Example/Pods/pop/pop/POPDefines.h | 37 - Example/Pods/pop/pop/POPGeometry.h | 73 - Example/Pods/pop/pop/POPGeometry.mm | 94 -- Example/Pods/pop/pop/POPLayerExtras.h | 196 --- Example/Pods/pop/pop/POPLayerExtras.mm | 288 ---- Example/Pods/pop/pop/POPMath.h | 56 - Example/Pods/pop/pop/POPMath.mm | 83 -- Example/Pods/pop/pop/POPPropertyAnimation.h | 65 - Example/Pods/pop/pop/POPPropertyAnimation.mm | 125 -- .../pop/pop/POPPropertyAnimationInternal.h | 359 ----- Example/Pods/pop/pop/POPSpringAnimation.h | 67 - Example/Pods/pop/pop/POPSpringAnimation.mm | 192 --- .../Pods/pop/pop/POPSpringAnimationInternal.h | 132 -- Example/Pods/pop/pop/POPSpringSolver.h | 190 --- Example/Pods/pop/pop/POPVector.h | 394 ----- Example/Pods/pop/pop/POPVector.mm | 334 ----- .../Pods/pop/pop/WebCore/FloatConversion.h | 56 - .../pop/pop/WebCore/TransformationMatrix.cpp | 1074 -------------- .../pop/pop/WebCore/TransformationMatrix.h | 279 ---- Example/Pods/pop/pop/WebCore/UnitBezier.h | 123 -- 72 files changed, 325 insertions(+), 11115 deletions(-) delete mode 100644 Example/Pods/Target Support Files/pop/Info.plist delete mode 100644 Example/Pods/Target Support Files/pop/pop-dummy.m delete mode 100644 Example/Pods/Target Support Files/pop/pop-prefix.pch delete mode 100644 Example/Pods/Target Support Files/pop/pop-umbrella.h delete mode 100644 Example/Pods/Target Support Files/pop/pop.modulemap delete mode 100644 Example/Pods/Target Support Files/pop/pop.xcconfig delete mode 100644 Example/Pods/pop/LICENSE delete mode 100644 Example/Pods/pop/README.md delete mode 100644 Example/Pods/pop/pop/POP.h delete mode 100644 Example/Pods/pop/pop/POPAction.h delete mode 100644 Example/Pods/pop/pop/POPAnimatableProperty.h delete mode 100644 Example/Pods/pop/pop/POPAnimatableProperty.mm delete mode 100644 Example/Pods/pop/pop/POPAnimation.h delete mode 100644 Example/Pods/pop/pop/POPAnimation.mm delete mode 100644 Example/Pods/pop/pop/POPAnimationEvent.h delete mode 100644 Example/Pods/pop/pop/POPAnimationEvent.mm delete mode 100644 Example/Pods/pop/pop/POPAnimationEventInternal.h delete mode 100644 Example/Pods/pop/pop/POPAnimationExtras.h delete mode 100644 Example/Pods/pop/pop/POPAnimationExtras.mm delete mode 100644 Example/Pods/pop/pop/POPAnimationInternal.h delete mode 100644 Example/Pods/pop/pop/POPAnimationPrivate.h delete mode 100644 Example/Pods/pop/pop/POPAnimationRuntime.h delete mode 100644 Example/Pods/pop/pop/POPAnimationRuntime.mm delete mode 100644 Example/Pods/pop/pop/POPAnimationTracer.h delete mode 100644 Example/Pods/pop/pop/POPAnimationTracer.mm delete mode 100644 Example/Pods/pop/pop/POPAnimationTracerInternal.h delete mode 100644 Example/Pods/pop/pop/POPAnimator.h delete mode 100644 Example/Pods/pop/pop/POPAnimator.mm delete mode 100644 Example/Pods/pop/pop/POPAnimatorPrivate.h delete mode 100644 Example/Pods/pop/pop/POPBasicAnimation.h delete mode 100644 Example/Pods/pop/pop/POPBasicAnimation.mm delete mode 100644 Example/Pods/pop/pop/POPBasicAnimationInternal.h delete mode 100644 Example/Pods/pop/pop/POPCGUtils.h delete mode 100644 Example/Pods/pop/pop/POPCGUtils.mm delete mode 100644 Example/Pods/pop/pop/POPCustomAnimation.h delete mode 100644 Example/Pods/pop/pop/POPCustomAnimation.mm delete mode 100644 Example/Pods/pop/pop/POPDecayAnimation.h delete mode 100644 Example/Pods/pop/pop/POPDecayAnimation.mm delete mode 100644 Example/Pods/pop/pop/POPDecayAnimationInternal.h delete mode 100644 Example/Pods/pop/pop/POPDefines.h delete mode 100644 Example/Pods/pop/pop/POPGeometry.h delete mode 100644 Example/Pods/pop/pop/POPGeometry.mm delete mode 100644 Example/Pods/pop/pop/POPLayerExtras.h delete mode 100644 Example/Pods/pop/pop/POPLayerExtras.mm delete mode 100644 Example/Pods/pop/pop/POPMath.h delete mode 100644 Example/Pods/pop/pop/POPMath.mm delete mode 100644 Example/Pods/pop/pop/POPPropertyAnimation.h delete mode 100644 Example/Pods/pop/pop/POPPropertyAnimation.mm delete mode 100644 Example/Pods/pop/pop/POPPropertyAnimationInternal.h delete mode 100644 Example/Pods/pop/pop/POPSpringAnimation.h delete mode 100644 Example/Pods/pop/pop/POPSpringAnimation.mm delete mode 100644 Example/Pods/pop/pop/POPSpringAnimationInternal.h delete mode 100644 Example/Pods/pop/pop/POPSpringSolver.h delete mode 100644 Example/Pods/pop/pop/POPVector.h delete mode 100644 Example/Pods/pop/pop/POPVector.mm delete mode 100644 Example/Pods/pop/pop/WebCore/FloatConversion.h delete mode 100644 Example/Pods/pop/pop/WebCore/TransformationMatrix.cpp delete mode 100644 Example/Pods/pop/pop/WebCore/TransformationMatrix.h delete mode 100644 Example/Pods/pop/pop/WebCore/UnitBezier.h diff --git a/Example/Podfile b/Example/Podfile index 764dbb2..59891bb 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -3,6 +3,6 @@ use_frameworks! target 'RainyRefreshControl Demo' do - pod 'RainyRefreshControl', :git => 'https://github.com/Onix-Systems/RainyRefreshControl', :branch => 'feature/remove-sample-project' + pod 'RainyRefreshControl' end diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 96253ab..07a8d35 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,25 +1,22 @@ PODS: - - pop (1.0.9) - - RainyRefreshControl (0.2.0): - - pop (= 1.0.9) + - RainyRefreshControl (0.2.0) DEPENDENCIES: - - RainyRefreshControl (from `https://github.com/Onix-Systems/RainyRefreshControl`, branch `feature/remove-sample-project`) + - RainyRefreshControl (from `https://github.com/Onix-Systems/RainyRefreshControl`, branch `feature/remove-pop`) EXTERNAL SOURCES: RainyRefreshControl: - :branch: feature/remove-sample-project + :branch: feature/remove-pop :git: https://github.com/Onix-Systems/RainyRefreshControl CHECKOUT OPTIONS: RainyRefreshControl: - :commit: 3d411c66108c9022a173f3b7275d94cd0668a8ea + :commit: 7f13e7e243f851840802b56b5d21f24dd3e9b138 :git: https://github.com/Onix-Systems/RainyRefreshControl SPEC CHECKSUMS: - pop: f667631a5108a2e60d9e8797c9b32ddaf2080bce - RainyRefreshControl: e4718413438a92edfce3e90b74cba0e5fccfd88a + RainyRefreshControl: 7be63e37b6f4eb155f6327445967e83b48cd9336 -PODFILE CHECKSUM: 19b644a50858bac13f7f1af5ee9d9728d76ac170 +PODFILE CHECKSUM: 8bcbd7f984c86572a3b151d8bcc571009da8d3ab COCOAPODS: 1.2.0.beta.3 diff --git a/Example/Pods/Local Podspecs/RainyRefreshControl.podspec.json b/Example/Pods/Local Podspecs/RainyRefreshControl.podspec.json index a3e681b..a378af7 100644 --- a/Example/Pods/Local Podspecs/RainyRefreshControl.podspec.json +++ b/Example/Pods/Local Podspecs/RainyRefreshControl.podspec.json @@ -29,10 +29,5 @@ }, "pod_target_xcconfig": { "SWIFT_VERSION": "3" - }, - "dependencies": { - "pop": [ - "1.0.9" - ] } } diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock index 96253ab..07a8d35 100644 --- a/Example/Pods/Manifest.lock +++ b/Example/Pods/Manifest.lock @@ -1,25 +1,22 @@ PODS: - - pop (1.0.9) - - RainyRefreshControl (0.2.0): - - pop (= 1.0.9) + - RainyRefreshControl (0.2.0) DEPENDENCIES: - - RainyRefreshControl (from `https://github.com/Onix-Systems/RainyRefreshControl`, branch `feature/remove-sample-project`) + - RainyRefreshControl (from `https://github.com/Onix-Systems/RainyRefreshControl`, branch `feature/remove-pop`) EXTERNAL SOURCES: RainyRefreshControl: - :branch: feature/remove-sample-project + :branch: feature/remove-pop :git: https://github.com/Onix-Systems/RainyRefreshControl CHECKOUT OPTIONS: RainyRefreshControl: - :commit: 3d411c66108c9022a173f3b7275d94cd0668a8ea + :commit: 7f13e7e243f851840802b56b5d21f24dd3e9b138 :git: https://github.com/Onix-Systems/RainyRefreshControl SPEC CHECKSUMS: - pop: f667631a5108a2e60d9e8797c9b32ddaf2080bce - RainyRefreshControl: e4718413438a92edfce3e90b74cba0e5fccfd88a + RainyRefreshControl: 7be63e37b6f4eb155f6327445967e83b48cd9336 -PODFILE CHECKSUM: 19b644a50858bac13f7f1af5ee9d9728d76ac170 +PODFILE CHECKSUM: 8bcbd7f984c86572a3b151d8bcc571009da8d3ab COCOAPODS: 1.2.0.beta.3 diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index 9624982..9708338 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -7,230 +7,93 @@ objects = { /* Begin PBXBuildFile section */ - 0832D3787F5581F6665F61B002CC2B95 /* POPVector.h in Headers */ = {isa = PBXBuildFile; fileRef = F1C8B7CFAE4D696D0580FDF5AE6CFC3C /* POPVector.h */; settings = {ATTRIBUTES = (Project, ); }; }; - 0BF240C023B096B8397908302AA01622 /* POPCGUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 083DEB87AA473ED7261BE242AD0AC68B /* POPCGUtils.h */; settings = {ATTRIBUTES = (Project, ); }; }; - 15CA1C446D793788029E786C58636A1D /* RainyRefreshControl.bundle in Resources */ = {isa = PBXBuildFile; fileRef = B9266D47DE971E07259D4F0931B37D13 /* RainyRefreshControl.bundle */; }; - 160AE4335C8363D5B06E55BDF5811BA3 /* POPAnimator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 19D27DFE1AE3529C657992CA9A04FEB0 /* POPAnimator.mm */; }; - 1A053BEEBFB53B53C7C589409C28F2C5 /* rain.sks in Resources */ = {isa = PBXBuildFile; fileRef = 20BDA5D4401D06B2C6412F2DB96E9894 /* rain.sks */; }; - 1C801B0061681E049D6D968283394809 /* POPMath.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0867D0B308EC0775A464FD338C7601AE /* POPMath.mm */; }; - 221358EFF8A2C88ECA1FB243E559C4D8 /* POPGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = BECDCD8A7CDA96DF5C16BC6A3E96D4B5 /* POPGeometry.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 249C415BDA2B1A789DE312A15D22AA74 /* POPDecayAnimationInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 667EC01785D2878E2A0F9813C7A5C639 /* POPDecayAnimationInternal.h */; settings = {ATTRIBUTES = (Project, ); }; }; - 2788EB2503B72C568BFA3CFEAF832347 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C5B9707F412A19914AAD0267005831A /* Foundation.framework */; }; - 28519464CFCB002881607295477ACD93 /* POPDecayAnimation.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0359B367E56AE51C7FE36B41F1F1F8E /* POPDecayAnimation.mm */; }; - 28C215AD57A66C1C4EDB552630BAFBEB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C5B9707F412A19914AAD0267005831A /* Foundation.framework */; }; - 2E392985A17FBBC522548B38C4C04A20 /* RainyRefreshControl-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 57ACF5A395630AE40E2644C72BFC7510 /* RainyRefreshControl-dummy.m */; }; - 2F6479749952851B307D9568252EBF79 /* TransformationMatrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8ED4C47F0A83618B0921BB3EBCE99E57 /* TransformationMatrix.cpp */; }; - 338BD8DAE34074E916DDC94EAC5AAC69 /* Pods-RainyRefreshControl Demo-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 7D95D28D202017A37F35888C826E8822 /* Pods-RainyRefreshControl Demo-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 37D94B0FB666D550BD31C9C3BD890B63 /* POPAnimatableProperty.h in Headers */ = {isa = PBXBuildFile; fileRef = 03CDED920C31B4D007EC866DE050683F /* POPAnimatableProperty.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 386963101CCCBFFBB6F8E36670A68C99 /* POPAnimatableProperty.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3AFB9039F43AE0F41519A0E8EE0CB62E /* POPAnimatableProperty.mm */; }; - 40FA1B710B65CBCDE0A7601EE142291F /* TransformationMatrix.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BCC9B0E0933928D2C2B09229670D083 /* TransformationMatrix.h */; settings = {ATTRIBUTES = (Project, ); }; }; - 45F6B4B1A607A506634B866C33AB4A5D /* pop.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 12275F3C9EA534AAA9AEE0CF6019AF64 /* pop.framework */; }; - 4A9094664F8F9A68BC56CB45CCE5D1D2 /* POPPropertyAnimationInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = F71DD06C83DE8D2F893EBD9B9F3B1E44 /* POPPropertyAnimationInternal.h */; settings = {ATTRIBUTES = (Project, ); }; }; - 4C7C41D59147EE087817CFAE04CBB9D9 /* POPLayerExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 922A4A6F56AF023AC9EE5C8C7D6E45C3 /* POPLayerExtras.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4F3EFA88DC7C015C8A280D330C02BE16 /* POPAnimationRuntime.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6923D1A3B6B18D842C841F4CFBDC9F9D /* POPAnimationRuntime.mm */; }; - 4F7F9F53ECF919497C7F41448202EC4F /* pop-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A2C59B2DFAB1B309C6AF8D162FE04CD /* pop-dummy.m */; }; - 53FEE17D453BD922C37CDD4D013FE813 /* POPAnimationTracer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 218D2CCF61902461241298B98704F7BD /* POPAnimationTracer.mm */; }; - 583F7AE70F6F0E97C310F58A731970C0 /* POPAnimator.h in Headers */ = {isa = PBXBuildFile; fileRef = FA22147C6A8DB8E6AADF1733FB2EF0DA /* POPAnimator.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 5F0D4AC6AC12A7EFB91DE5B998E4A426 /* POPAnimationExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 413818FB4734DB1CA1E4E92C312B01E8 /* POPAnimationExtras.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 6065FAEABD3EB8698AC7622C93BDF4D9 /* POPAnimationRuntime.h in Headers */ = {isa = PBXBuildFile; fileRef = 1E7FFB4119500212384B7497090D0173 /* POPAnimationRuntime.h */; settings = {ATTRIBUTES = (Project, ); }; }; - 64EE752C3B9FC49F6D0932194CE870D1 /* POPAnimationExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = 64CA262F640B4BF7F724E961047CBD5D /* POPAnimationExtras.mm */; }; - 70C0B8A3AFE8B1B096B5B114E00D1454 /* Umbrella.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F98862432B268951C90E1FBCA5E96F1 /* Umbrella.swift */; }; - 72CE6F26CA9005C6D0976D710F92311F /* POPAnimationEventInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BC72B916B7AD90CEAC64A2FA7F18CE26 /* POPAnimationEventInternal.h */; settings = {ATTRIBUTES = (Project, ); }; }; - 73F2B5171119D3AF4844F0B8ED82A85A /* RainScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA2649978B3D96EDBAB3C3F0C960095D /* RainScene.swift */; }; - 75837E09DAC9E908693AA233C6BC880F /* pop-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 61BAC7E3B5C35F3CAB3829C8DD6D60A2 /* pop-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 7974BB8FEED954F2D99515280A40D181 /* RainyRefreshControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = B98486A23220FFC4C48181CEA8D9F09D /* RainyRefreshControl.swift */; }; - 7BAA191DB91D6B0B1DF16BE0CE2F131E /* ONXRefreshControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDEF4CA08EDE38A5F24167D0A638E1AC /* ONXRefreshControl.swift */; }; - 7E8C6DC1D4438BE3C37BE8F096CC73CF /* POPGeometry.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37D3076AE9CD63FDCE423E1C1A31221F /* POPGeometry.mm */; }; - 845F22C41B151704A3C517B620A2CA6A /* POPSpringSolver.h in Headers */ = {isa = PBXBuildFile; fileRef = F25D456EED8C67AAC65DB30798555D64 /* POPSpringSolver.h */; settings = {ATTRIBUTES = (Project, ); }; }; - 84A85EA2A55D4879BF9430F26C78343E /* POPBasicAnimation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2A514F173D18C795AF7125BD2714AC41 /* POPBasicAnimation.mm */; }; - 866E512A70FC6881C754A2CD5CB7D5B9 /* POPBasicAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 3233205454E930CBC49C5CC9E39771C4 /* POPBasicAnimation.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 8767AD2BF76FFC1F7233DAC2D0282078 /* spark.png in Resources */ = {isa = PBXBuildFile; fileRef = 9820F1B9DF658DB9E89F075A6D389C96 /* spark.png */; }; - 8FCCDBDB86F06941AD4C9ADBB5C7C4A3 /* POPAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 69BB2739A793613A2468D8F6AF037126 /* POPAnimation.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 90D1F5B54514E43258A0B30918736F3B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C5B9707F412A19914AAD0267005831A /* Foundation.framework */; }; - 91E45E4AA9B980D7A96C1E753804997A /* POPAnimationTracer.h in Headers */ = {isa = PBXBuildFile; fileRef = 980CCFBF4A39B41104504F09E13BFCA8 /* POPAnimationTracer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 91EB88FDBE27288391D6BDA3F9BE4A4D /* RainyRefreshControl-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FD662028937E117E9898BF10C473AF1 /* RainyRefreshControl-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 92586C2A71EEF91D94AE386EAC2A7908 /* FloatConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = EFF0283C523E5DF490213321FFB532DE /* FloatConversion.h */; settings = {ATTRIBUTES = (Project, ); }; }; - 961557E68BD6D3743C290222E5E02950 /* POPDecayAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B3EE984D47E086F442FCA6AB1D80639 /* POPDecayAnimation.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 9C29FC420B7CFB58B56138259F048D76 /* POPAnimationTracerInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 6F83FEDAEB73601FA1243C3A9ACD52D1 /* POPAnimationTracerInternal.h */; settings = {ATTRIBUTES = (Project, ); }; }; - 9CC2882FA67367CF55DC54F4BC8D7FBC /* UnitBezier.h in Headers */ = {isa = PBXBuildFile; fileRef = 362628ACC248B5DAE0F7C04CE0422856 /* UnitBezier.h */; settings = {ATTRIBUTES = (Project, ); }; }; - A16413AD35B4E448C220CF5E89537C1A /* POPAnimation.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB2363710AA6D49EEEEC1E833EEF3C67 /* POPAnimation.mm */; }; - A1835B1840B4265518F6A9589AE432E7 /* Pods-RainyRefreshControl Demo-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 36B1838FB46DFC4770A4C677D5528929 /* Pods-RainyRefreshControl Demo-dummy.m */; }; - A4755F9A3F21FF3D1A72592A4AA09880 /* POPAnimationPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = C429E5187116638E09142547423316C4 /* POPAnimationPrivate.h */; settings = {ATTRIBUTES = (Project, ); }; }; - A4E3CBB008CDD7AD02680968EEFBE108 /* POPAnimationEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = CF46E558A719B5630AAC1EC6C4914BFC /* POPAnimationEvent.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A6039C316D0BD674A624BD87FB786F7D /* POP.h in Headers */ = {isa = PBXBuildFile; fileRef = 17AF5B0DB4639C970885CD580EB579A1 /* POP.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A86A47EC00CA8D2B214B94404575438B /* POPCustomAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CBF3EC5F7FDFF47FC3F60E30D01ECDE /* POPCustomAnimation.h */; settings = {ATTRIBUTES = (Public, ); }; }; - ABE9379FEF6169F4CA35DC823C68FF0D /* POPCGUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = AAA59B22C40B4C4797D77B00FA369A2D /* POPCGUtils.mm */; }; - AF421AFD7E86B6D36F0286500CBEEDCF /* POPVector.mm in Sources */ = {isa = PBXBuildFile; fileRef = 204BE999B7367F72241B05059E80DC0C /* POPVector.mm */; }; - BBA8350708F7E0F9B200B4131DECDFB3 /* POPAnimationEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = EB32C272698AA8AEC2CA61BA78515C76 /* POPAnimationEvent.mm */; }; - CA15DEF93BCFC2076618458833A9B4A3 /* POPSpringAnimation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 706E59081DCA16A38E12BA1E47B17EE0 /* POPSpringAnimation.mm */; }; - D64E8E4C135C6B6732DA88578B19B571 /* POPLayerExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B848729F9A2A18EC236360116C563FD /* POPLayerExtras.mm */; }; - DA900E9904F0A6D09487F18775622102 /* POPAnimatorPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = E877389B0D696F1362CF16FA50D3A630 /* POPAnimatorPrivate.h */; settings = {ATTRIBUTES = (Project, ); }; }; - DBE00F6DE811D2E7F8BACDA6E44B0AFB /* POPDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = BD1F51C4A4DF7CBE65E18F4CF0A9C2FB /* POPDefines.h */; settings = {ATTRIBUTES = (Public, ); }; }; - DDC64E32CCFE39544B1BE604A3C41D94 /* POPPropertyAnimation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1CF697B9BE951489C1DB42DEE97CC4A3 /* POPPropertyAnimation.mm */; }; - E556917EBF7B0AF4E27534172BC42E84 /* POPAnimationInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7719653D28E88EB2B0666A06BD6C64D5 /* POPAnimationInternal.h */; settings = {ATTRIBUTES = (Project, ); }; }; - EBBE521C6F16D2DBBFE92D316FCB3C1B /* POPCustomAnimation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 78B1C9531C32F9F7B13A2B489A042323 /* POPCustomAnimation.mm */; }; - ECB5580236F205ED9EC988A7C08FE397 /* POPMath.h in Headers */ = {isa = PBXBuildFile; fileRef = F4E78184ACEB5247806C2B319714F05C /* POPMath.h */; settings = {ATTRIBUTES = (Project, ); }; }; - F027A0D44D0BDA350F9D8E6FA3ECA42B /* POPSpringAnimationInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A0587BB5C925900E0E61B56CDDC753C /* POPSpringAnimationInternal.h */; settings = {ATTRIBUTES = (Project, ); }; }; - F0FCA2D752FEBDE3D0E37BE522C8FC25 /* POPAction.h in Headers */ = {isa = PBXBuildFile; fileRef = A644D1B96FC9B105A106C227B8EC5335 /* POPAction.h */; settings = {ATTRIBUTES = (Project, ); }; }; - F22CF3825A1EA8E36055C0EE21CDC121 /* POPBasicAnimationInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = AD5EB1DEC701B8DA47C2CFA3195DECBD /* POPBasicAnimationInternal.h */; settings = {ATTRIBUTES = (Project, ); }; }; - F4B72BB8B87EF7F8828AFF642B3D687A /* POPPropertyAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B5874F651B8179670E740CA573AF2EF /* POPPropertyAnimation.h */; settings = {ATTRIBUTES = (Public, ); }; }; - FDBDC8EE19ABFDB22EFAEFFB0BC65BBB /* POPSpringAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = BAD90FBF2D0036D4769EDF2C2E5725DF /* POPSpringAnimation.h */; settings = {ATTRIBUTES = (Public, ); }; }; - FEF3ECDDB09707C4C7B926ED605BD73B /* SpriteKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D162B94416E077EFC6A09C7FD3806A61 /* SpriteKit.framework */; }; + 20D5C75487453B0D01D709EC631FB094 /* RainyRefreshControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 603FF8F9571C8CEB39C968BEDEA8A347 /* RainyRefreshControl.swift */; }; + 3033ED5BD47547919EF012BF86C3817D /* RainyRefreshControl-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 93E72975AA3437F17EB8F98E484046DF /* RainyRefreshControl-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 37759E90DFD306BCFCC83535245296CD /* SpriteKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0249A9C977E2C510FF1F675627C9C583 /* SpriteKit.framework */; }; + 3EDDDE173D15C1B012E25DAAEACEE190 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FCA7FA45186F6582486335B7162AD32C /* Foundation.framework */; }; + 44AA229808D160653A8A43C6C635219B /* Umbrella.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A0EECCD134614751336E00A6A4CA253 /* Umbrella.swift */; }; + 4618D9A21C9FB6F2C589A4A0CF3CACC3 /* RainyRefreshControl-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = CBEC8AD3AD90316F4E5E4C1B37D6F84F /* RainyRefreshControl-dummy.m */; }; + 59F595E88F696D02E197338D2826E12F /* ONXRefreshControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDA2C6801270A78110A3424979DD68B8 /* ONXRefreshControl.swift */; }; + ABDF314F0F143C0C856333810CFE30A0 /* Pods-RainyRefreshControl Demo-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 7D95D28D202017A37F35888C826E8822 /* Pods-RainyRefreshControl Demo-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + B07BB44D7B6A51CA8F7A66F15FAAED6F /* RainyRefreshControl.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 4C5E2DC96C868A97DE6F99B512ED026A /* RainyRefreshControl.bundle */; }; + B4FB0CED1E74725AE3DA2FABAFF9B7A1 /* spark.png in Resources */ = {isa = PBXBuildFile; fileRef = 9CF739DC20FBEFC3E2E16CAD9FBDE575 /* spark.png */; }; + CFBD7DBE86BAFC55CDB6C90EA275DA15 /* Pods-RainyRefreshControl Demo-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 36B1838FB46DFC4770A4C677D5528929 /* Pods-RainyRefreshControl Demo-dummy.m */; }; + CFE0AB03764FF214AC4EF9D87EFA0009 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FCA7FA45186F6582486335B7162AD32C /* Foundation.framework */; }; + E2E2B9E042903247DC7B90FADBCD6645 /* rain.sks in Resources */ = {isa = PBXBuildFile; fileRef = 04289EB8997D4D67AFE5867D122F8EF9 /* rain.sks */; }; + ED7D2910481277EEBBC8F50340CECF7D /* RainScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CD0EC2A28ED7C0A8975B44D4E5DC8FB /* RainScene.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 088983D4228CAEEA9E1268D66A5B6E70 /* PBXContainerItemProxy */ = { + 326B7B992F2492270E9BCE3B354C373F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; proxyType = 1; - remoteGlobalIDString = B2B43C2F560C0598357B64A075AB1EA1; - remoteInfo = RainyRefreshControl; - }; - 5069BA3569F0DBD7EF266643C6F617CC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3DF82A24BB2916E75716DA6BA35C3291; - remoteInfo = pop; - }; - 9763BDDAE95D79A9F2EF9F08B629506E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3DF82A24BB2916E75716DA6BA35C3291; - remoteInfo = pop; + remoteGlobalIDString = 8E6BC691AFA82E6A078562554E228D4C; + remoteInfo = "RainyRefreshControl-RainyRefreshControl"; }; - C24FA562BB1A7FBEC8844E1D86AF1150 /* PBXContainerItemProxy */ = { + F9F9FBE882B8A97E79DC04BDBBDD5887 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; proxyType = 1; - remoteGlobalIDString = 7404EB291A00ECB6FCFD02CC762F510F; - remoteInfo = "RainyRefreshControl-RainyRefreshControl"; + remoteGlobalIDString = DF75062C53A3BA790E8409B42895F92B; + remoteInfo = RainyRefreshControl; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 0247BE33682E23682D447246A126E710 /* pop.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = pop.xcconfig; sourceTree = ""; }; - 03CDED920C31B4D007EC866DE050683F /* POPAnimatableProperty.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPAnimatableProperty.h; path = pop/POPAnimatableProperty.h; sourceTree = ""; }; - 083DEB87AA473ED7261BE242AD0AC68B /* POPCGUtils.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPCGUtils.h; path = pop/POPCGUtils.h; sourceTree = ""; }; - 0867D0B308EC0775A464FD338C7601AE /* POPMath.mm */ = {isa = PBXFileReference; includeInIndex = 1; name = POPMath.mm; path = pop/POPMath.mm; sourceTree = ""; }; - 12275F3C9EA534AAA9AEE0CF6019AF64 /* pop.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = pop.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 17AF5B0DB4639C970885CD580EB579A1 /* POP.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POP.h; path = pop/POP.h; sourceTree = ""; }; - 19D27DFE1AE3529C657992CA9A04FEB0 /* POPAnimator.mm */ = {isa = PBXFileReference; includeInIndex = 1; name = POPAnimator.mm; path = pop/POPAnimator.mm; sourceTree = ""; }; - 1CF697B9BE951489C1DB42DEE97CC4A3 /* POPPropertyAnimation.mm */ = {isa = PBXFileReference; includeInIndex = 1; name = POPPropertyAnimation.mm; path = pop/POPPropertyAnimation.mm; sourceTree = ""; }; - 1E4AE3BDFCAFD4B436E91FC6DD8BDEB2 /* ResourceBundle-RainyRefreshControl-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "ResourceBundle-RainyRefreshControl-Info.plist"; sourceTree = ""; }; - 1E7FFB4119500212384B7497090D0173 /* POPAnimationRuntime.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPAnimationRuntime.h; path = pop/POPAnimationRuntime.h; sourceTree = ""; }; + 0249A9C977E2C510FF1F675627C9C583 /* SpriteKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SpriteKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/System/Library/Frameworks/SpriteKit.framework; sourceTree = DEVELOPER_DIR; }; + 04289EB8997D4D67AFE5867D122F8EF9 /* rain.sks */ = {isa = PBXFileReference; includeInIndex = 1; name = rain.sks; path = Sources/Assets/rain.sks; sourceTree = ""; }; + 0CD0EC2A28ED7C0A8975B44D4E5DC8FB /* RainScene.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RainScene.swift; path = Sources/RainScene.swift; sourceTree = ""; }; 1F1B8F94FE3C389136C8243C23447433 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 1FD662028937E117E9898BF10C473AF1 /* RainyRefreshControl-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "RainyRefreshControl-umbrella.h"; sourceTree = ""; }; - 204BE999B7367F72241B05059E80DC0C /* POPVector.mm */ = {isa = PBXFileReference; includeInIndex = 1; name = POPVector.mm; path = pop/POPVector.mm; sourceTree = ""; }; - 20BDA5D4401D06B2C6412F2DB96E9894 /* rain.sks */ = {isa = PBXFileReference; includeInIndex = 1; name = rain.sks; path = Sources/Assets/rain.sks; sourceTree = ""; }; - 218D2CCF61902461241298B98704F7BD /* POPAnimationTracer.mm */ = {isa = PBXFileReference; includeInIndex = 1; name = POPAnimationTracer.mm; path = pop/POPAnimationTracer.mm; sourceTree = ""; }; - 23A18A87ED2E6EEB71685B427DFC3DD8 /* pop-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "pop-prefix.pch"; sourceTree = ""; }; - 2A514F173D18C795AF7125BD2714AC41 /* POPBasicAnimation.mm */ = {isa = PBXFileReference; includeInIndex = 1; name = POPBasicAnimation.mm; path = pop/POPBasicAnimation.mm; sourceTree = ""; }; - 301E76DFD7BD1468C7C7405A107E564B /* RainyRefreshControl.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = RainyRefreshControl.framework; path = RainyRefreshControl.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 3233205454E930CBC49C5CC9E39771C4 /* POPBasicAnimation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPBasicAnimation.h; path = pop/POPBasicAnimation.h; sourceTree = ""; }; 358D798B5448EE272570F3FB7C7B7C56 /* Pods-RainyRefreshControl Demo-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-RainyRefreshControl Demo-acknowledgements.plist"; sourceTree = ""; }; - 362628ACC248B5DAE0F7C04CE0422856 /* UnitBezier.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = UnitBezier.h; path = pop/WebCore/UnitBezier.h; sourceTree = ""; }; 36B1838FB46DFC4770A4C677D5528929 /* Pods-RainyRefreshControl Demo-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-RainyRefreshControl Demo-dummy.m"; sourceTree = ""; }; - 37D3076AE9CD63FDCE423E1C1A31221F /* POPGeometry.mm */ = {isa = PBXFileReference; includeInIndex = 1; name = POPGeometry.mm; path = pop/POPGeometry.mm; sourceTree = ""; }; - 3AFB9039F43AE0F41519A0E8EE0CB62E /* POPAnimatableProperty.mm */ = {isa = PBXFileReference; includeInIndex = 1; name = POPAnimatableProperty.mm; path = pop/POPAnimatableProperty.mm; sourceTree = ""; }; - 3B5874F651B8179670E740CA573AF2EF /* POPPropertyAnimation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPPropertyAnimation.h; path = pop/POPPropertyAnimation.h; sourceTree = ""; }; - 3C5B9707F412A19914AAD0267005831A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; - 413818FB4734DB1CA1E4E92C312B01E8 /* POPAnimationExtras.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPAnimationExtras.h; path = pop/POPAnimationExtras.h; sourceTree = ""; }; - 4A2C59B2DFAB1B309C6AF8D162FE04CD /* pop-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "pop-dummy.m"; sourceTree = ""; }; - 4B848729F9A2A18EC236360116C563FD /* POPLayerExtras.mm */ = {isa = PBXFileReference; includeInIndex = 1; name = POPLayerExtras.mm; path = pop/POPLayerExtras.mm; sourceTree = ""; }; - 4CBF3EC5F7FDFF47FC3F60E30D01ECDE /* POPCustomAnimation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPCustomAnimation.h; path = pop/POPCustomAnimation.h; sourceTree = ""; }; - 4F98862432B268951C90E1FBCA5E96F1 /* Umbrella.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Umbrella.swift; path = Sources/Umbrella.swift; sourceTree = ""; }; - 57ACF5A395630AE40E2644C72BFC7510 /* RainyRefreshControl-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "RainyRefreshControl-dummy.m"; sourceTree = ""; }; + 4BD07A557C9990D4E2DC026B40C7426C /* RainyRefreshControl-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "RainyRefreshControl-prefix.pch"; sourceTree = ""; }; + 4C5E2DC96C868A97DE6F99B512ED026A /* RainyRefreshControl.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = RainyRefreshControl.bundle; path = RainyRefreshControl.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; + 4E86CC189B340AC19D3FE3E82221B0C0 /* RainyRefreshControl.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = RainyRefreshControl.modulemap; sourceTree = ""; }; + 4F72EB8650F04E579A635DD1BA9F94A7 /* ResourceBundle-RainyRefreshControl-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "ResourceBundle-RainyRefreshControl-Info.plist"; sourceTree = ""; }; + 51435AFAC671806990011AA0BE63FF71 /* RainyRefreshControl.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = RainyRefreshControl.framework; path = RainyRefreshControl.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 58B96D7DFA8DF9476B3B43E0D80B0679 /* Pods-RainyRefreshControl Demo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-RainyRefreshControl Demo.release.xcconfig"; sourceTree = ""; }; - 5A0587BB5C925900E0E61B56CDDC753C /* POPSpringAnimationInternal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPSpringAnimationInternal.h; path = pop/POPSpringAnimationInternal.h; sourceTree = ""; }; - 61BAC7E3B5C35F3CAB3829C8DD6D60A2 /* pop-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "pop-umbrella.h"; sourceTree = ""; }; - 64CA262F640B4BF7F724E961047CBD5D /* POPAnimationExtras.mm */ = {isa = PBXFileReference; includeInIndex = 1; name = POPAnimationExtras.mm; path = pop/POPAnimationExtras.mm; sourceTree = ""; }; - 667EC01785D2878E2A0F9813C7A5C639 /* POPDecayAnimationInternal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPDecayAnimationInternal.h; path = pop/POPDecayAnimationInternal.h; sourceTree = ""; }; - 6923D1A3B6B18D842C841F4CFBDC9F9D /* POPAnimationRuntime.mm */ = {isa = PBXFileReference; includeInIndex = 1; name = POPAnimationRuntime.mm; path = pop/POPAnimationRuntime.mm; sourceTree = ""; }; - 69BB2739A793613A2468D8F6AF037126 /* POPAnimation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPAnimation.h; path = pop/POPAnimation.h; sourceTree = ""; }; - 6B3EE984D47E086F442FCA6AB1D80639 /* POPDecayAnimation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPDecayAnimation.h; path = pop/POPDecayAnimation.h; sourceTree = ""; }; - 6BCC9B0E0933928D2C2B09229670D083 /* TransformationMatrix.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = TransformationMatrix.h; path = pop/WebCore/TransformationMatrix.h; sourceTree = ""; }; - 6F83FEDAEB73601FA1243C3A9ACD52D1 /* POPAnimationTracerInternal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPAnimationTracerInternal.h; path = pop/POPAnimationTracerInternal.h; sourceTree = ""; }; - 706E59081DCA16A38E12BA1E47B17EE0 /* POPSpringAnimation.mm */ = {isa = PBXFileReference; includeInIndex = 1; name = POPSpringAnimation.mm; path = pop/POPSpringAnimation.mm; sourceTree = ""; }; - 72938AF3D7458F8BBD96E89FAE218194 /* RainyRefreshControl.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = RainyRefreshControl.xcconfig; sourceTree = ""; }; + 599F0A78ADBEFE1A0027A79573B78D76 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 603FF8F9571C8CEB39C968BEDEA8A347 /* RainyRefreshControl.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RainyRefreshControl.swift; path = Sources/RainyRefreshControl.swift; sourceTree = ""; }; 744ADBE3F7E408DF64BE1C90AE9D595E /* Pods-RainyRefreshControl Demo.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-RainyRefreshControl Demo.modulemap"; sourceTree = ""; }; - 7719653D28E88EB2B0666A06BD6C64D5 /* POPAnimationInternal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPAnimationInternal.h; path = pop/POPAnimationInternal.h; sourceTree = ""; }; - 78B1C9531C32F9F7B13A2B489A042323 /* POPCustomAnimation.mm */ = {isa = PBXFileReference; includeInIndex = 1; name = POPCustomAnimation.mm; path = pop/POPCustomAnimation.mm; sourceTree = ""; }; + 75CF1B3AAE05B60F257A819AA5E75B91 /* RainyRefreshControl.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = RainyRefreshControl.xcconfig; sourceTree = ""; }; 7A11E230CDE48A203DFBD37FEA42CA9F /* Pods-RainyRefreshControl Demo-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-RainyRefreshControl Demo-acknowledgements.markdown"; sourceTree = ""; }; 7D95D28D202017A37F35888C826E8822 /* Pods-RainyRefreshControl Demo-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-RainyRefreshControl Demo-umbrella.h"; sourceTree = ""; }; - 8ED4C47F0A83618B0921BB3EBCE99E57 /* TransformationMatrix.cpp */ = {isa = PBXFileReference; includeInIndex = 1; name = TransformationMatrix.cpp; path = pop/WebCore/TransformationMatrix.cpp; sourceTree = ""; }; - 922A4A6F56AF023AC9EE5C8C7D6E45C3 /* POPLayerExtras.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPLayerExtras.h; path = pop/POPLayerExtras.h; sourceTree = ""; }; + 8A0EECCD134614751336E00A6A4CA253 /* Umbrella.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Umbrella.swift; path = Sources/Umbrella.swift; sourceTree = ""; }; 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; - 9543FA2D25AFEDC6A1954102050371D7 /* RainyRefreshControl.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = RainyRefreshControl.modulemap; sourceTree = ""; }; - 980CCFBF4A39B41104504F09E13BFCA8 /* POPAnimationTracer.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPAnimationTracer.h; path = pop/POPAnimationTracer.h; sourceTree = ""; }; - 9820F1B9DF658DB9E89F075A6D389C96 /* spark.png */ = {isa = PBXFileReference; includeInIndex = 1; name = spark.png; path = Sources/Assets/spark.png; sourceTree = ""; }; + 93E72975AA3437F17EB8F98E484046DF /* RainyRefreshControl-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "RainyRefreshControl-umbrella.h"; sourceTree = ""; }; + 96068DD34EB8073E9E3B0FBD08A6764A /* Pods_RainyRefreshControl_Demo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_RainyRefreshControl_Demo.framework; path = "Pods-RainyRefreshControl Demo.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; 9B1B9452E1150161A96FE6B82E4B2F30 /* Pods-RainyRefreshControl Demo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-RainyRefreshControl Demo.debug.xcconfig"; sourceTree = ""; }; + 9CF739DC20FBEFC3E2E16CAD9FBDE575 /* spark.png */ = {isa = PBXFileReference; includeInIndex = 1; name = spark.png; path = Sources/Assets/spark.png; sourceTree = ""; }; 9FB9816AA9E22141BC5F0BFBBB40E0FF /* Pods-RainyRefreshControl Demo-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-RainyRefreshControl Demo-frameworks.sh"; sourceTree = ""; }; - A644D1B96FC9B105A106C227B8EC5335 /* POPAction.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPAction.h; path = pop/POPAction.h; sourceTree = ""; }; - AAA59B22C40B4C4797D77B00FA369A2D /* POPCGUtils.mm */ = {isa = PBXFileReference; includeInIndex = 1; name = POPCGUtils.mm; path = pop/POPCGUtils.mm; sourceTree = ""; }; - AB2363710AA6D49EEEEC1E833EEF3C67 /* POPAnimation.mm */ = {isa = PBXFileReference; includeInIndex = 1; name = POPAnimation.mm; path = pop/POPAnimation.mm; sourceTree = ""; }; - AD5EB1DEC701B8DA47C2CFA3195DECBD /* POPBasicAnimationInternal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPBasicAnimationInternal.h; path = pop/POPBasicAnimationInternal.h; sourceTree = ""; }; - B9266D47DE971E07259D4F0931B37D13 /* RainyRefreshControl.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = RainyRefreshControl.bundle; path = RainyRefreshControl.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; - B98486A23220FFC4C48181CEA8D9F09D /* RainyRefreshControl.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RainyRefreshControl.swift; path = Sources/RainyRefreshControl.swift; sourceTree = ""; }; - BAD90FBF2D0036D4769EDF2C2E5725DF /* POPSpringAnimation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPSpringAnimation.h; path = pop/POPSpringAnimation.h; sourceTree = ""; }; - BC72B916B7AD90CEAC64A2FA7F18CE26 /* POPAnimationEventInternal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPAnimationEventInternal.h; path = pop/POPAnimationEventInternal.h; sourceTree = ""; }; - BD1F51C4A4DF7CBE65E18F4CF0A9C2FB /* POPDefines.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPDefines.h; path = pop/POPDefines.h; sourceTree = ""; }; - BECDCD8A7CDA96DF5C16BC6A3E96D4B5 /* POPGeometry.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPGeometry.h; path = pop/POPGeometry.h; sourceTree = ""; }; - C0359B367E56AE51C7FE36B41F1F1F8E /* POPDecayAnimation.mm */ = {isa = PBXFileReference; includeInIndex = 1; name = POPDecayAnimation.mm; path = pop/POPDecayAnimation.mm; sourceTree = ""; }; - C429E5187116638E09142547423316C4 /* POPAnimationPrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPAnimationPrivate.h; path = pop/POPAnimationPrivate.h; sourceTree = ""; }; - C492E21DBD699B5BD031080080470459 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - C63A4A76AF3008BF26DD5F346BC2213C /* pop.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = pop.framework; path = pop.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - CA2649978B3D96EDBAB3C3F0C960095D /* RainScene.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = RainScene.swift; path = Sources/RainScene.swift; sourceTree = ""; }; - CA77AAE34F4D2AECA68C1E3B8C93038D /* Pods_RainyRefreshControl_Demo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_RainyRefreshControl_Demo.framework; path = "Pods-RainyRefreshControl Demo.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - CF46E558A719B5630AAC1EC6C4914BFC /* POPAnimationEvent.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPAnimationEvent.h; path = pop/POPAnimationEvent.h; sourceTree = ""; }; - D1548DE2A6A8071E3864F84EB7CBB197 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - D162B94416E077EFC6A09C7FD3806A61 /* SpriteKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SpriteKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/System/Library/Frameworks/SpriteKit.framework; sourceTree = DEVELOPER_DIR; }; - DAC260EB27489B0B6904C59A9F39DB85 /* pop.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = pop.modulemap; sourceTree = ""; }; + CBEC8AD3AD90316F4E5E4C1B37D6F84F /* RainyRefreshControl-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "RainyRefreshControl-dummy.m"; sourceTree = ""; }; DAFEC787B80A591C422A1BB110B84EF3 /* Pods-RainyRefreshControl Demo-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-RainyRefreshControl Demo-resources.sh"; sourceTree = ""; }; - E877389B0D696F1362CF16FA50D3A630 /* POPAnimatorPrivate.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPAnimatorPrivate.h; path = pop/POPAnimatorPrivate.h; sourceTree = ""; }; - EB32C272698AA8AEC2CA61BA78515C76 /* POPAnimationEvent.mm */ = {isa = PBXFileReference; includeInIndex = 1; name = POPAnimationEvent.mm; path = pop/POPAnimationEvent.mm; sourceTree = ""; }; - EDEF4CA08EDE38A5F24167D0A638E1AC /* ONXRefreshControl.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ONXRefreshControl.swift; path = Sources/ONXRefreshControl.swift; sourceTree = ""; }; - EF936F0B5A14ED70436D1FC25DF7EBE1 /* RainyRefreshControl-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "RainyRefreshControl-prefix.pch"; sourceTree = ""; }; - EFF0283C523E5DF490213321FFB532DE /* FloatConversion.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = FloatConversion.h; path = pop/WebCore/FloatConversion.h; sourceTree = ""; }; - F1C8B7CFAE4D696D0580FDF5AE6CFC3C /* POPVector.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPVector.h; path = pop/POPVector.h; sourceTree = ""; }; - F25D456EED8C67AAC65DB30798555D64 /* POPSpringSolver.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPSpringSolver.h; path = pop/POPSpringSolver.h; sourceTree = ""; }; - F4E78184ACEB5247806C2B319714F05C /* POPMath.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPMath.h; path = pop/POPMath.h; sourceTree = ""; }; - F71DD06C83DE8D2F893EBD9B9F3B1E44 /* POPPropertyAnimationInternal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPPropertyAnimationInternal.h; path = pop/POPPropertyAnimationInternal.h; sourceTree = ""; }; - FA22147C6A8DB8E6AADF1733FB2EF0DA /* POPAnimator.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = POPAnimator.h; path = pop/POPAnimator.h; sourceTree = ""; }; + DDA2C6801270A78110A3424979DD68B8 /* ONXRefreshControl.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ONXRefreshControl.swift; path = Sources/ONXRefreshControl.swift; sourceTree = ""; }; + FCA7FA45186F6582486335B7162AD32C /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 460A932EAD4E4C74CA50A990AE6E657A /* Frameworks */ = { + 6C21CD1494996B8DA79005BE9F8E6386 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 90D1F5B54514E43258A0B30918736F3B /* Foundation.framework in Frameworks */, - 45F6B4B1A607A506634B866C33AB4A5D /* pop.framework in Frameworks */, - FEF3ECDDB09707C4C7B926ED605BD73B /* SpriteKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - 4E10F5D16A3C3AAB30EA5619845313D4 /* Frameworks */ = { + B90AAB9BDFEE106AA9482290DBE79BEE /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + CFE0AB03764FF214AC4EF9D87EFA0009 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - 83BDF4EED8320BE35A85C69208C40CB7 /* Frameworks */ = { + D48348C343E99FA2415B129CF3DAC6E4 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 2788EB2503B72C568BFA3CFEAF832347 /* Foundation.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - F0B88C07BF91FF949B15235F0C1B7D76 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 28C215AD57A66C1C4EDB552630BAFBEB /* Foundation.framework in Frameworks */, + 3EDDDE173D15C1B012E25DAAEACEE190 /* Foundation.framework in Frameworks */, + 37759E90DFD306BCFCC83535245296CD /* SpriteKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -245,113 +108,49 @@ name = "Targets Support Files"; sourceTree = ""; }; - 411297DAE823E2BFFDA7565AFC978DE4 /* pop */ = { + 433CD3331B6C3787F473C941B61FC68F /* Frameworks */ = { isa = PBXGroup; children = ( - EFF0283C523E5DF490213321FFB532DE /* FloatConversion.h */, - 17AF5B0DB4639C970885CD580EB579A1 /* POP.h */, - A644D1B96FC9B105A106C227B8EC5335 /* POPAction.h */, - 03CDED920C31B4D007EC866DE050683F /* POPAnimatableProperty.h */, - 3AFB9039F43AE0F41519A0E8EE0CB62E /* POPAnimatableProperty.mm */, - 69BB2739A793613A2468D8F6AF037126 /* POPAnimation.h */, - AB2363710AA6D49EEEEC1E833EEF3C67 /* POPAnimation.mm */, - CF46E558A719B5630AAC1EC6C4914BFC /* POPAnimationEvent.h */, - EB32C272698AA8AEC2CA61BA78515C76 /* POPAnimationEvent.mm */, - BC72B916B7AD90CEAC64A2FA7F18CE26 /* POPAnimationEventInternal.h */, - 413818FB4734DB1CA1E4E92C312B01E8 /* POPAnimationExtras.h */, - 64CA262F640B4BF7F724E961047CBD5D /* POPAnimationExtras.mm */, - 7719653D28E88EB2B0666A06BD6C64D5 /* POPAnimationInternal.h */, - C429E5187116638E09142547423316C4 /* POPAnimationPrivate.h */, - 1E7FFB4119500212384B7497090D0173 /* POPAnimationRuntime.h */, - 6923D1A3B6B18D842C841F4CFBDC9F9D /* POPAnimationRuntime.mm */, - 980CCFBF4A39B41104504F09E13BFCA8 /* POPAnimationTracer.h */, - 218D2CCF61902461241298B98704F7BD /* POPAnimationTracer.mm */, - 6F83FEDAEB73601FA1243C3A9ACD52D1 /* POPAnimationTracerInternal.h */, - FA22147C6A8DB8E6AADF1733FB2EF0DA /* POPAnimator.h */, - 19D27DFE1AE3529C657992CA9A04FEB0 /* POPAnimator.mm */, - E877389B0D696F1362CF16FA50D3A630 /* POPAnimatorPrivate.h */, - 3233205454E930CBC49C5CC9E39771C4 /* POPBasicAnimation.h */, - 2A514F173D18C795AF7125BD2714AC41 /* POPBasicAnimation.mm */, - AD5EB1DEC701B8DA47C2CFA3195DECBD /* POPBasicAnimationInternal.h */, - 083DEB87AA473ED7261BE242AD0AC68B /* POPCGUtils.h */, - AAA59B22C40B4C4797D77B00FA369A2D /* POPCGUtils.mm */, - 4CBF3EC5F7FDFF47FC3F60E30D01ECDE /* POPCustomAnimation.h */, - 78B1C9531C32F9F7B13A2B489A042323 /* POPCustomAnimation.mm */, - 6B3EE984D47E086F442FCA6AB1D80639 /* POPDecayAnimation.h */, - C0359B367E56AE51C7FE36B41F1F1F8E /* POPDecayAnimation.mm */, - 667EC01785D2878E2A0F9813C7A5C639 /* POPDecayAnimationInternal.h */, - BD1F51C4A4DF7CBE65E18F4CF0A9C2FB /* POPDefines.h */, - BECDCD8A7CDA96DF5C16BC6A3E96D4B5 /* POPGeometry.h */, - 37D3076AE9CD63FDCE423E1C1A31221F /* POPGeometry.mm */, - 922A4A6F56AF023AC9EE5C8C7D6E45C3 /* POPLayerExtras.h */, - 4B848729F9A2A18EC236360116C563FD /* POPLayerExtras.mm */, - F4E78184ACEB5247806C2B319714F05C /* POPMath.h */, - 0867D0B308EC0775A464FD338C7601AE /* POPMath.mm */, - 3B5874F651B8179670E740CA573AF2EF /* POPPropertyAnimation.h */, - 1CF697B9BE951489C1DB42DEE97CC4A3 /* POPPropertyAnimation.mm */, - F71DD06C83DE8D2F893EBD9B9F3B1E44 /* POPPropertyAnimationInternal.h */, - BAD90FBF2D0036D4769EDF2C2E5725DF /* POPSpringAnimation.h */, - 706E59081DCA16A38E12BA1E47B17EE0 /* POPSpringAnimation.mm */, - 5A0587BB5C925900E0E61B56CDDC753C /* POPSpringAnimationInternal.h */, - F25D456EED8C67AAC65DB30798555D64 /* POPSpringSolver.h */, - F1C8B7CFAE4D696D0580FDF5AE6CFC3C /* POPVector.h */, - 204BE999B7367F72241B05059E80DC0C /* POPVector.mm */, - 8ED4C47F0A83618B0921BB3EBCE99E57 /* TransformationMatrix.cpp */, - 6BCC9B0E0933928D2C2B09229670D083 /* TransformationMatrix.h */, - 362628ACC248B5DAE0F7C04CE0422856 /* UnitBezier.h */, - 9304B61FD79119FA8BA040109ED077C1 /* Support Files */, + 4C7095B9AFEC860980372B20C9D52AC4 /* iOS */, ); - name = pop; - path = pop; + name = Frameworks; sourceTree = ""; }; - 45B9AD0BA8F2B391FBB7CBF759A613FA /* iOS */ = { + 4C7095B9AFEC860980372B20C9D52AC4 /* iOS */ = { isa = PBXGroup; children = ( - 3C5B9707F412A19914AAD0267005831A /* Foundation.framework */, - D162B94416E077EFC6A09C7FD3806A61 /* SpriteKit.framework */, + FCA7FA45186F6582486335B7162AD32C /* Foundation.framework */, + 0249A9C977E2C510FF1F675627C9C583 /* SpriteKit.framework */, ); name = iOS; sourceTree = ""; }; - 49B66E6111C6A2833037DE63BD64F462 /* Products */ = { - isa = PBXGroup; - children = ( - CA77AAE34F4D2AECA68C1E3B8C93038D /* Pods_RainyRefreshControl_Demo.framework */, - C63A4A76AF3008BF26DD5F346BC2213C /* pop.framework */, - B9266D47DE971E07259D4F0931B37D13 /* RainyRefreshControl.bundle */, - 301E76DFD7BD1468C7C7405A107E564B /* RainyRefreshControl.framework */, - ); - name = Products; - sourceTree = ""; - }; - 667DFCB05703062C75E06A623E038402 /* Pods */ = { + 6A2E9DF26E496C1F6A4502FB2A42F826 /* Resources */ = { isa = PBXGroup; children = ( - 411297DAE823E2BFFDA7565AFC978DE4 /* pop */, - D0A28570ACA93F60790F3F14F6DE6923 /* RainyRefreshControl */, + 04289EB8997D4D67AFE5867D122F8EF9 /* rain.sks */, + 9CF739DC20FBEFC3E2E16CAD9FBDE575 /* spark.png */, ); - name = Pods; + name = Resources; sourceTree = ""; }; - 7B0F3FFB9AC766D12EC7E1AF92E9222D /* Frameworks */ = { + 7DB346D0F39D3F0E887471402A8071AB = { isa = PBXGroup; children = ( - 12275F3C9EA534AAA9AEE0CF6019AF64 /* pop.framework */, - 45B9AD0BA8F2B391FBB7CBF759A613FA /* iOS */, + 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */, + 433CD3331B6C3787F473C941B61FC68F /* Frameworks */, + 801258E922A3E1E15E60E65009521A22 /* Pods */, + B59D42466837AA29A1C57D22A5D8BB72 /* Products */, + 0A29A0A70E72D47D9FD2921BC3CA986C /* Targets Support Files */, ); - name = Frameworks; sourceTree = ""; }; - 7DB346D0F39D3F0E887471402A8071AB = { + 801258E922A3E1E15E60E65009521A22 /* Pods */ = { isa = PBXGroup; children = ( - 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */, - 7B0F3FFB9AC766D12EC7E1AF92E9222D /* Frameworks */, - 667DFCB05703062C75E06A623E038402 /* Pods */, - 49B66E6111C6A2833037DE63BD64F462 /* Products */, - 0A29A0A70E72D47D9FD2921BC3CA986C /* Targets Support Files */, + 98BD5345263B842B00E45B6C38A8E74D /* RainyRefreshControl */, ); + name = Pods; sourceTree = ""; }; 8AD59799EE71C3D69AECA0A3EC3BC9AE /* Pods-RainyRefreshControl Demo */ = { @@ -372,53 +171,40 @@ path = "Target Support Files/Pods-RainyRefreshControl Demo"; sourceTree = ""; }; - 9304B61FD79119FA8BA040109ED077C1 /* Support Files */ = { - isa = PBXGroup; - children = ( - D1548DE2A6A8071E3864F84EB7CBB197 /* Info.plist */, - DAC260EB27489B0B6904C59A9F39DB85 /* pop.modulemap */, - 0247BE33682E23682D447246A126E710 /* pop.xcconfig */, - 4A2C59B2DFAB1B309C6AF8D162FE04CD /* pop-dummy.m */, - 23A18A87ED2E6EEB71685B427DFC3DD8 /* pop-prefix.pch */, - 61BAC7E3B5C35F3CAB3829C8DD6D60A2 /* pop-umbrella.h */, - ); - name = "Support Files"; - path = "../Target Support Files/pop"; - sourceTree = ""; - }; - B1B0BB7D297FD056194106F12CE9C5F9 /* Resources */ = { + 98BD5345263B842B00E45B6C38A8E74D /* RainyRefreshControl */ = { isa = PBXGroup; children = ( - 20BDA5D4401D06B2C6412F2DB96E9894 /* rain.sks */, - 9820F1B9DF658DB9E89F075A6D389C96 /* spark.png */, + DDA2C6801270A78110A3424979DD68B8 /* ONXRefreshControl.swift */, + 0CD0EC2A28ED7C0A8975B44D4E5DC8FB /* RainScene.swift */, + 603FF8F9571C8CEB39C968BEDEA8A347 /* RainyRefreshControl.swift */, + 8A0EECCD134614751336E00A6A4CA253 /* Umbrella.swift */, + 6A2E9DF26E496C1F6A4502FB2A42F826 /* Resources */, + FBDCD54F4ADAFCB178A7345CCBC9FCB3 /* Support Files */, ); - name = Resources; + name = RainyRefreshControl; + path = RainyRefreshControl; sourceTree = ""; }; - D0A28570ACA93F60790F3F14F6DE6923 /* RainyRefreshControl */ = { + B59D42466837AA29A1C57D22A5D8BB72 /* Products */ = { isa = PBXGroup; children = ( - EDEF4CA08EDE38A5F24167D0A638E1AC /* ONXRefreshControl.swift */, - CA2649978B3D96EDBAB3C3F0C960095D /* RainScene.swift */, - B98486A23220FFC4C48181CEA8D9F09D /* RainyRefreshControl.swift */, - 4F98862432B268951C90E1FBCA5E96F1 /* Umbrella.swift */, - B1B0BB7D297FD056194106F12CE9C5F9 /* Resources */, - DEE6B13348A0E1F5BFD3E31E40F9CAE0 /* Support Files */, + 96068DD34EB8073E9E3B0FBD08A6764A /* Pods_RainyRefreshControl_Demo.framework */, + 4C5E2DC96C868A97DE6F99B512ED026A /* RainyRefreshControl.bundle */, + 51435AFAC671806990011AA0BE63FF71 /* RainyRefreshControl.framework */, ); - name = RainyRefreshControl; - path = RainyRefreshControl; + name = Products; sourceTree = ""; }; - DEE6B13348A0E1F5BFD3E31E40F9CAE0 /* Support Files */ = { + FBDCD54F4ADAFCB178A7345CCBC9FCB3 /* Support Files */ = { isa = PBXGroup; children = ( - C492E21DBD699B5BD031080080470459 /* Info.plist */, - 9543FA2D25AFEDC6A1954102050371D7 /* RainyRefreshControl.modulemap */, - 72938AF3D7458F8BBD96E89FAE218194 /* RainyRefreshControl.xcconfig */, - 57ACF5A395630AE40E2644C72BFC7510 /* RainyRefreshControl-dummy.m */, - EF936F0B5A14ED70436D1FC25DF7EBE1 /* RainyRefreshControl-prefix.pch */, - 1FD662028937E117E9898BF10C473AF1 /* RainyRefreshControl-umbrella.h */, - 1E4AE3BDFCAFD4B436E91FC6DD8BDEB2 /* ResourceBundle-RainyRefreshControl-Info.plist */, + 599F0A78ADBEFE1A0027A79573B78D76 /* Info.plist */, + 4E86CC189B340AC19D3FE3E82221B0C0 /* RainyRefreshControl.modulemap */, + 75CF1B3AAE05B60F257A819AA5E75B91 /* RainyRefreshControl.xcconfig */, + CBEC8AD3AD90316F4E5E4C1B37D6F84F /* RainyRefreshControl-dummy.m */, + 4BD07A557C9990D4E2DC026B40C7426C /* RainyRefreshControl-prefix.pch */, + 93E72975AA3437F17EB8F98E484046DF /* RainyRefreshControl-umbrella.h */, + 4F72EB8650F04E579A635DD1BA9F94A7 /* ResourceBundle-RainyRefreshControl-Info.plist */, ); name = "Support Files"; path = "../Target Support Files/RainyRefreshControl"; @@ -427,137 +213,77 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 038365BBEADE6EBEA0FED4477168B869 /* Headers */ = { + 766BD6B3020A87EEBCEA54F9E25497E5 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 91EB88FDBE27288391D6BDA3F9BE4A4D /* RainyRefreshControl-umbrella.h in Headers */, + ABDF314F0F143C0C856333810CFE30A0 /* Pods-RainyRefreshControl Demo-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; - 11B4624DB5848FAFE1D01C8AAABA2A16 /* Headers */ = { + C443909D4E07C52B7D05965CA5F8B06E /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 92586C2A71EEF91D94AE386EAC2A7908 /* FloatConversion.h in Headers */, - 75837E09DAC9E908693AA233C6BC880F /* pop-umbrella.h in Headers */, - A6039C316D0BD674A624BD87FB786F7D /* POP.h in Headers */, - F0FCA2D752FEBDE3D0E37BE522C8FC25 /* POPAction.h in Headers */, - 37D94B0FB666D550BD31C9C3BD890B63 /* POPAnimatableProperty.h in Headers */, - 8FCCDBDB86F06941AD4C9ADBB5C7C4A3 /* POPAnimation.h in Headers */, - A4E3CBB008CDD7AD02680968EEFBE108 /* POPAnimationEvent.h in Headers */, - 72CE6F26CA9005C6D0976D710F92311F /* POPAnimationEventInternal.h in Headers */, - 5F0D4AC6AC12A7EFB91DE5B998E4A426 /* POPAnimationExtras.h in Headers */, - E556917EBF7B0AF4E27534172BC42E84 /* POPAnimationInternal.h in Headers */, - A4755F9A3F21FF3D1A72592A4AA09880 /* POPAnimationPrivate.h in Headers */, - 6065FAEABD3EB8698AC7622C93BDF4D9 /* POPAnimationRuntime.h in Headers */, - 91E45E4AA9B980D7A96C1E753804997A /* POPAnimationTracer.h in Headers */, - 9C29FC420B7CFB58B56138259F048D76 /* POPAnimationTracerInternal.h in Headers */, - 583F7AE70F6F0E97C310F58A731970C0 /* POPAnimator.h in Headers */, - DA900E9904F0A6D09487F18775622102 /* POPAnimatorPrivate.h in Headers */, - 866E512A70FC6881C754A2CD5CB7D5B9 /* POPBasicAnimation.h in Headers */, - F22CF3825A1EA8E36055C0EE21CDC121 /* POPBasicAnimationInternal.h in Headers */, - 0BF240C023B096B8397908302AA01622 /* POPCGUtils.h in Headers */, - A86A47EC00CA8D2B214B94404575438B /* POPCustomAnimation.h in Headers */, - 961557E68BD6D3743C290222E5E02950 /* POPDecayAnimation.h in Headers */, - 249C415BDA2B1A789DE312A15D22AA74 /* POPDecayAnimationInternal.h in Headers */, - DBE00F6DE811D2E7F8BACDA6E44B0AFB /* POPDefines.h in Headers */, - 221358EFF8A2C88ECA1FB243E559C4D8 /* POPGeometry.h in Headers */, - 4C7C41D59147EE087817CFAE04CBB9D9 /* POPLayerExtras.h in Headers */, - ECB5580236F205ED9EC988A7C08FE397 /* POPMath.h in Headers */, - F4B72BB8B87EF7F8828AFF642B3D687A /* POPPropertyAnimation.h in Headers */, - 4A9094664F8F9A68BC56CB45CCE5D1D2 /* POPPropertyAnimationInternal.h in Headers */, - FDBDC8EE19ABFDB22EFAEFFB0BC65BBB /* POPSpringAnimation.h in Headers */, - F027A0D44D0BDA350F9D8E6FA3ECA42B /* POPSpringAnimationInternal.h in Headers */, - 845F22C41B151704A3C517B620A2CA6A /* POPSpringSolver.h in Headers */, - 0832D3787F5581F6665F61B002CC2B95 /* POPVector.h in Headers */, - 40FA1B710B65CBCDE0A7601EE142291F /* TransformationMatrix.h in Headers */, - 9CC2882FA67367CF55DC54F4BC8D7FBC /* UnitBezier.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - ABFC66ECBFA6BB3E330D6FD02B2ECCDA /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 338BD8DAE34074E916DDC94EAC5AAC69 /* Pods-RainyRefreshControl Demo-umbrella.h in Headers */, + 3033ED5BD47547919EF012BF86C3817D /* RainyRefreshControl-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 3DF82A24BB2916E75716DA6BA35C3291 /* pop */ = { + 8E6BC691AFA82E6A078562554E228D4C /* RainyRefreshControl-RainyRefreshControl */ = { isa = PBXNativeTarget; - buildConfigurationList = 35CA76BB00496AD04DD4C1B3547C8A91 /* Build configuration list for PBXNativeTarget "pop" */; + buildConfigurationList = 9FB216EACB41A97A45BF3E66B1106867 /* Build configuration list for PBXNativeTarget "RainyRefreshControl-RainyRefreshControl" */; buildPhases = ( - EC64234C4FA35E6D0A3211D441CFCF10 /* Sources */, - F0B88C07BF91FF949B15235F0C1B7D76 /* Frameworks */, - 11B4624DB5848FAFE1D01C8AAABA2A16 /* Headers */, + 27FEDF87AAE7C9742D42DC9F3FD6F45D /* Sources */, + 6C21CD1494996B8DA79005BE9F8E6386 /* Frameworks */, + 57012CCB5FC27E64A7BFE7995A3B18AC /* Resources */, ); buildRules = ( ); dependencies = ( ); - name = pop; - productName = pop; - productReference = C63A4A76AF3008BF26DD5F346BC2213C /* pop.framework */; - productType = "com.apple.product-type.framework"; + name = "RainyRefreshControl-RainyRefreshControl"; + productName = "RainyRefreshControl-RainyRefreshControl"; + productReference = 4C5E2DC96C868A97DE6F99B512ED026A /* RainyRefreshControl.bundle */; + productType = "com.apple.product-type.bundle"; }; - 534C7242D945A4ABF2D741B1C604A6FC /* Pods-RainyRefreshControl Demo */ = { + B89207F37EA6635203BC0ABF4AE95FBE /* Pods-RainyRefreshControl Demo */ = { isa = PBXNativeTarget; - buildConfigurationList = 5CE05AD3C9B469B715BBDBEC70BC043E /* Build configuration list for PBXNativeTarget "Pods-RainyRefreshControl Demo" */; + buildConfigurationList = 4F17AEE43743209E016BCBBA22BCAAF3 /* Build configuration list for PBXNativeTarget "Pods-RainyRefreshControl Demo" */; buildPhases = ( - F91D78C0393B3F187DE7BF93C4D82FDE /* Sources */, - 83BDF4EED8320BE35A85C69208C40CB7 /* Frameworks */, - ABFC66ECBFA6BB3E330D6FD02B2ECCDA /* Headers */, + 62095DDE2F5074F1393C44C348B7ADF3 /* Sources */, + B90AAB9BDFEE106AA9482290DBE79BEE /* Frameworks */, + 766BD6B3020A87EEBCEA54F9E25497E5 /* Headers */, ); buildRules = ( ); dependencies = ( - 75C1FBD9391FBABA22926F1715AC95A1 /* PBXTargetDependency */, - 21D450EC0BD490AAE6CFCC820BACCA91 /* PBXTargetDependency */, + 52056507852A6114A79A3BACBAEB32E2 /* PBXTargetDependency */, ); name = "Pods-RainyRefreshControl Demo"; productName = "Pods-RainyRefreshControl Demo"; - productReference = CA77AAE34F4D2AECA68C1E3B8C93038D /* Pods_RainyRefreshControl_Demo.framework */; + productReference = 96068DD34EB8073E9E3B0FBD08A6764A /* Pods_RainyRefreshControl_Demo.framework */; productType = "com.apple.product-type.framework"; }; - 7404EB291A00ECB6FCFD02CC762F510F /* RainyRefreshControl-RainyRefreshControl */ = { - isa = PBXNativeTarget; - buildConfigurationList = E9E639511F63A2225C9EA39AD1460F3C /* Build configuration list for PBXNativeTarget "RainyRefreshControl-RainyRefreshControl" */; - buildPhases = ( - FA7CCE2613F23FF9D9090A00932A28BB /* Sources */, - 4E10F5D16A3C3AAB30EA5619845313D4 /* Frameworks */, - 72066F197C3D4511998AED01A3B15CAA /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "RainyRefreshControl-RainyRefreshControl"; - productName = "RainyRefreshControl-RainyRefreshControl"; - productReference = B9266D47DE971E07259D4F0931B37D13 /* RainyRefreshControl.bundle */; - productType = "com.apple.product-type.bundle"; - }; - B2B43C2F560C0598357B64A075AB1EA1 /* RainyRefreshControl */ = { + DF75062C53A3BA790E8409B42895F92B /* RainyRefreshControl */ = { isa = PBXNativeTarget; - buildConfigurationList = E84DC696E82BA7573CA1917FD4573306 /* Build configuration list for PBXNativeTarget "RainyRefreshControl" */; + buildConfigurationList = 544D3B386656A79A9A5C4331B1BAB7E5 /* Build configuration list for PBXNativeTarget "RainyRefreshControl" */; buildPhases = ( - 247DC38EE7DD20074A2457C6EB13379A /* Sources */, - 460A932EAD4E4C74CA50A990AE6E657A /* Frameworks */, - AF2EEF001C3A9FA8A23707FAD5F123C3 /* Resources */, - 038365BBEADE6EBEA0FED4477168B869 /* Headers */, + 12C6A8804982E2084CB83B51067BC562 /* Sources */, + D48348C343E99FA2415B129CF3DAC6E4 /* Frameworks */, + 918FD5F41E6DFE11161FBA89C0BB0F0F /* Resources */, + C443909D4E07C52B7D05965CA5F8B06E /* Headers */, ); buildRules = ( ); dependencies = ( - C296C46F08565AD22FE06A5F87BA4FED /* PBXTargetDependency */, - A649CE13B17A37F3D46C502C97910B2B /* PBXTargetDependency */, + 2B29DBA3CCC917EFBB9CB2C489FF34BD /* PBXTargetDependency */, ); name = RainyRefreshControl; productName = RainyRefreshControl; - productReference = 301E76DFD7BD1468C7C7405A107E564B /* RainyRefreshControl.framework */; + productReference = 51435AFAC671806990011AA0BE63FF71 /* RainyRefreshControl.framework */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -577,118 +303,79 @@ en, ); mainGroup = 7DB346D0F39D3F0E887471402A8071AB; - productRefGroup = 49B66E6111C6A2833037DE63BD64F462 /* Products */; + productRefGroup = B59D42466837AA29A1C57D22A5D8BB72 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 534C7242D945A4ABF2D741B1C604A6FC /* Pods-RainyRefreshControl Demo */, - 3DF82A24BB2916E75716DA6BA35C3291 /* pop */, - B2B43C2F560C0598357B64A075AB1EA1 /* RainyRefreshControl */, - 7404EB291A00ECB6FCFD02CC762F510F /* RainyRefreshControl-RainyRefreshControl */, + B89207F37EA6635203BC0ABF4AE95FBE /* Pods-RainyRefreshControl Demo */, + DF75062C53A3BA790E8409B42895F92B /* RainyRefreshControl */, + 8E6BC691AFA82E6A078562554E228D4C /* RainyRefreshControl-RainyRefreshControl */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 72066F197C3D4511998AED01A3B15CAA /* Resources */ = { + 57012CCB5FC27E64A7BFE7995A3B18AC /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1A053BEEBFB53B53C7C589409C28F2C5 /* rain.sks in Resources */, - 8767AD2BF76FFC1F7233DAC2D0282078 /* spark.png in Resources */, + E2E2B9E042903247DC7B90FADBCD6645 /* rain.sks in Resources */, + B4FB0CED1E74725AE3DA2FABAFF9B7A1 /* spark.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; - AF2EEF001C3A9FA8A23707FAD5F123C3 /* Resources */ = { + 918FD5F41E6DFE11161FBA89C0BB0F0F /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 15CA1C446D793788029E786C58636A1D /* RainyRefreshControl.bundle in Resources */, + B07BB44D7B6A51CA8F7A66F15FAAED6F /* RainyRefreshControl.bundle in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 247DC38EE7DD20074A2457C6EB13379A /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 7BAA191DB91D6B0B1DF16BE0CE2F131E /* ONXRefreshControl.swift in Sources */, - 73F2B5171119D3AF4844F0B8ED82A85A /* RainScene.swift in Sources */, - 2E392985A17FBBC522548B38C4C04A20 /* RainyRefreshControl-dummy.m in Sources */, - 7974BB8FEED954F2D99515280A40D181 /* RainyRefreshControl.swift in Sources */, - 70C0B8A3AFE8B1B096B5B114E00D1454 /* Umbrella.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - EC64234C4FA35E6D0A3211D441CFCF10 /* Sources */ = { + 12C6A8804982E2084CB83B51067BC562 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 4F7F9F53ECF919497C7F41448202EC4F /* pop-dummy.m in Sources */, - 386963101CCCBFFBB6F8E36670A68C99 /* POPAnimatableProperty.mm in Sources */, - A16413AD35B4E448C220CF5E89537C1A /* POPAnimation.mm in Sources */, - BBA8350708F7E0F9B200B4131DECDFB3 /* POPAnimationEvent.mm in Sources */, - 64EE752C3B9FC49F6D0932194CE870D1 /* POPAnimationExtras.mm in Sources */, - 4F3EFA88DC7C015C8A280D330C02BE16 /* POPAnimationRuntime.mm in Sources */, - 53FEE17D453BD922C37CDD4D013FE813 /* POPAnimationTracer.mm in Sources */, - 160AE4335C8363D5B06E55BDF5811BA3 /* POPAnimator.mm in Sources */, - 84A85EA2A55D4879BF9430F26C78343E /* POPBasicAnimation.mm in Sources */, - ABE9379FEF6169F4CA35DC823C68FF0D /* POPCGUtils.mm in Sources */, - EBBE521C6F16D2DBBFE92D316FCB3C1B /* POPCustomAnimation.mm in Sources */, - 28519464CFCB002881607295477ACD93 /* POPDecayAnimation.mm in Sources */, - 7E8C6DC1D4438BE3C37BE8F096CC73CF /* POPGeometry.mm in Sources */, - D64E8E4C135C6B6732DA88578B19B571 /* POPLayerExtras.mm in Sources */, - 1C801B0061681E049D6D968283394809 /* POPMath.mm in Sources */, - DDC64E32CCFE39544B1BE604A3C41D94 /* POPPropertyAnimation.mm in Sources */, - CA15DEF93BCFC2076618458833A9B4A3 /* POPSpringAnimation.mm in Sources */, - AF421AFD7E86B6D36F0286500CBEEDCF /* POPVector.mm in Sources */, - 2F6479749952851B307D9568252EBF79 /* TransformationMatrix.cpp in Sources */, + 59F595E88F696D02E197338D2826E12F /* ONXRefreshControl.swift in Sources */, + ED7D2910481277EEBBC8F50340CECF7D /* RainScene.swift in Sources */, + 4618D9A21C9FB6F2C589A4A0CF3CACC3 /* RainyRefreshControl-dummy.m in Sources */, + 20D5C75487453B0D01D709EC631FB094 /* RainyRefreshControl.swift in Sources */, + 44AA229808D160653A8A43C6C635219B /* Umbrella.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - F91D78C0393B3F187DE7BF93C4D82FDE /* Sources */ = { + 27FEDF87AAE7C9742D42DC9F3FD6F45D /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - A1835B1840B4265518F6A9589AE432E7 /* Pods-RainyRefreshControl Demo-dummy.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - FA7CCE2613F23FF9D9090A00932A28BB /* Sources */ = { + 62095DDE2F5074F1393C44C348B7ADF3 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + CFBD7DBE86BAFC55CDB6C90EA275DA15 /* Pods-RainyRefreshControl Demo-dummy.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 21D450EC0BD490AAE6CFCC820BACCA91 /* PBXTargetDependency */ = { + 2B29DBA3CCC917EFBB9CB2C489FF34BD /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = pop; - target = 3DF82A24BB2916E75716DA6BA35C3291 /* pop */; - targetProxy = 9763BDDAE95D79A9F2EF9F08B629506E /* PBXContainerItemProxy */; + name = "RainyRefreshControl-RainyRefreshControl"; + target = 8E6BC691AFA82E6A078562554E228D4C /* RainyRefreshControl-RainyRefreshControl */; + targetProxy = 326B7B992F2492270E9BCE3B354C373F /* PBXContainerItemProxy */; }; - 75C1FBD9391FBABA22926F1715AC95A1 /* PBXTargetDependency */ = { + 52056507852A6114A79A3BACBAEB32E2 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RainyRefreshControl; - target = B2B43C2F560C0598357B64A075AB1EA1 /* RainyRefreshControl */; - targetProxy = 088983D4228CAEEA9E1268D66A5B6E70 /* PBXContainerItemProxy */; - }; - A649CE13B17A37F3D46C502C97910B2B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = pop; - target = 3DF82A24BB2916E75716DA6BA35C3291 /* pop */; - targetProxy = 5069BA3569F0DBD7EF266643C6F617CC /* PBXContainerItemProxy */; - }; - C296C46F08565AD22FE06A5F87BA4FED /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "RainyRefreshControl-RainyRefreshControl"; - target = 7404EB291A00ECB6FCFD02CC762F510F /* RainyRefreshControl-RainyRefreshControl */; - targetProxy = C24FA562BB1A7FBEC8844E1D86AF1150 /* PBXContainerItemProxy */; + target = DF75062C53A3BA790E8409B42895F92B /* RainyRefreshControl */; + targetProxy = F9F9FBE882B8A97E79DC04BDBBDD5887 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -737,45 +424,41 @@ }; name = Debug; }; - 14836ED309A1BCAA3640743C09C46BF9 /* Debug */ = { + 59864CA2C1BF16D1575C8DD1BE9B5BBA /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9B1B9452E1150161A96FE6B82E4B2F30 /* Pods-RainyRefreshControl Demo.debug.xcconfig */; + baseConfigurationReference = 75CF1B3AAE05B60F257A819AA5E75B91 /* RainyRefreshControl.xcconfig */; buildSettings = { "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "Target Support Files/Pods-RainyRefreshControl Demo/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/RainyRefreshControl/RainyRefreshControl-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/RainyRefreshControl/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-RainyRefreshControl Demo/Pods-RainyRefreshControl Demo.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_RainyRefreshControl_Demo; + MODULEMAP_FILE = "Target Support Files/RainyRefreshControl/RainyRefreshControl.modulemap"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = RainyRefreshControl; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Debug; + name = Release; }; - 3FEA00FBCA8CF8384B498BA495397F09 /* Debug */ = { + 87C7FA2E57116C0BBF4D68F30530542B /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 72938AF3D7458F8BBD96E89FAE218194 /* RainyRefreshControl.xcconfig */; + baseConfigurationReference = 75CF1B3AAE05B60F257A819AA5E75B91 /* RainyRefreshControl.xcconfig */; buildSettings = { CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/RainyRefreshControl"; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -788,43 +471,11 @@ TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = bundle; }; - name = Debug; - }; - 4DFFDE64E20D5EF1B650A2DF5EB2ED45 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 0247BE33682E23682D447246A126E710 /* pop.xcconfig */; - buildSettings = { - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/pop/pop-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/pop/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/pop/pop.modulemap"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = pop; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; name = Release; }; - 539A3E194F4F85856966E0B655D8DF43 /* Debug */ = { + B807D3A4E06484ADA020F16026474478 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 72938AF3D7458F8BBD96E89FAE218194 /* RainyRefreshControl.xcconfig */; + baseConfigurationReference = 9B1B9452E1150161A96FE6B82E4B2F30 /* Pods-RainyRefreshControl Demo.debug.xcconfig */; buildSettings = { "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -837,57 +488,45 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/RainyRefreshControl/RainyRefreshControl-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/RainyRefreshControl/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-RainyRefreshControl Demo/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/RainyRefreshControl/RainyRefreshControl.modulemap"; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-RainyRefreshControl Demo/Pods-RainyRefreshControl Demo.modulemap"; MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_NAME = RainyRefreshControl; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = Pods_RainyRefreshControl_Demo; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Debug; }; - 94F1C3C4B74E456ABB0D95C551C252A6 /* Release */ = { + BCA936030D278C4DB18B013DD834FB13 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 72938AF3D7458F8BBD96E89FAE218194 /* RainyRefreshControl.xcconfig */; + baseConfigurationReference = 75CF1B3AAE05B60F257A819AA5E75B91 /* RainyRefreshControl.xcconfig */; buildSettings = { - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; + CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/RainyRefreshControl"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/RainyRefreshControl/RainyRefreshControl-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/RainyRefreshControl/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + INFOPLIST_FILE = "Target Support Files/RainyRefreshControl/ResourceBundle-RainyRefreshControl-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/RainyRefreshControl/RainyRefreshControl.modulemap"; - MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = RainyRefreshControl; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; + WRAPPER_EXTENSION = bundle; }; - name = Release; + name = Debug; }; - C4EBA63271E65B36993C93F437FDADDD /* Release */ = { + E3F4D9F1DEA440838C5621088968B090 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 58B96D7DFA8DF9476B3B43E0D80B0679 /* Pods-RainyRefreshControl Demo.release.xcconfig */; buildSettings = { @@ -922,23 +561,6 @@ }; name = Release; }; - C887FCD0BC9DCBA3BB33A4041A8F81BA /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 72938AF3D7458F8BBD96E89FAE218194 /* RainyRefreshControl.xcconfig */; - buildSettings = { - CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/RainyRefreshControl"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "Target Support Files/RainyRefreshControl/ResourceBundle-RainyRefreshControl-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - PRODUCT_NAME = RainyRefreshControl; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - WRAPPER_EXTENSION = bundle; - }; - name = Release; - }; E72E7977875C2D251FC62736BBDDC389 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { @@ -979,9 +601,9 @@ }; name = Release; }; - FF35958026E11CCC201C9D84C31906DA /* Debug */ = { + F1C87226AE90BF4F4F2CAD1E98EAA68B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 0247BE33682E23682D447246A126E710 /* pop.xcconfig */; + baseConfigurationReference = 75CF1B3AAE05B60F257A819AA5E75B91 /* RainyRefreshControl.xcconfig */; buildSettings = { "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -994,16 +616,17 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/pop/pop-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/pop/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/RainyRefreshControl/RainyRefreshControl-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/RainyRefreshControl/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/pop/pop.modulemap"; + MODULEMAP_FILE = "Target Support Files/RainyRefreshControl/RainyRefreshControl.modulemap"; MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_NAME = pop; + PRODUCT_NAME = RainyRefreshControl; SDKROOT = iphoneos; SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; @@ -1023,38 +646,29 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 35CA76BB00496AD04DD4C1B3547C8A91 /* Build configuration list for PBXNativeTarget "pop" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - FF35958026E11CCC201C9D84C31906DA /* Debug */, - 4DFFDE64E20D5EF1B650A2DF5EB2ED45 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 5CE05AD3C9B469B715BBDBEC70BC043E /* Build configuration list for PBXNativeTarget "Pods-RainyRefreshControl Demo" */ = { + 4F17AEE43743209E016BCBBA22BCAAF3 /* Build configuration list for PBXNativeTarget "Pods-RainyRefreshControl Demo" */ = { isa = XCConfigurationList; buildConfigurations = ( - 14836ED309A1BCAA3640743C09C46BF9 /* Debug */, - C4EBA63271E65B36993C93F437FDADDD /* Release */, + B807D3A4E06484ADA020F16026474478 /* Debug */, + E3F4D9F1DEA440838C5621088968B090 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - E84DC696E82BA7573CA1917FD4573306 /* Build configuration list for PBXNativeTarget "RainyRefreshControl" */ = { + 544D3B386656A79A9A5C4331B1BAB7E5 /* Build configuration list for PBXNativeTarget "RainyRefreshControl" */ = { isa = XCConfigurationList; buildConfigurations = ( - 539A3E194F4F85856966E0B655D8DF43 /* Debug */, - 94F1C3C4B74E456ABB0D95C551C252A6 /* Release */, + F1C87226AE90BF4F4F2CAD1E98EAA68B /* Debug */, + 59864CA2C1BF16D1575C8DD1BE9B5BBA /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - E9E639511F63A2225C9EA39AD1460F3C /* Build configuration list for PBXNativeTarget "RainyRefreshControl-RainyRefreshControl" */ = { + 9FB216EACB41A97A45BF3E66B1106867 /* Build configuration list for PBXNativeTarget "RainyRefreshControl-RainyRefreshControl" */ = { isa = XCConfigurationList; buildConfigurations = ( - 3FEA00FBCA8CF8384B498BA495397F09 /* Debug */, - C887FCD0BC9DCBA3BB33A4041A8F81BA /* Release */, + BCA936030D278C4DB18B013DD834FB13 /* Debug */, + 87C7FA2E57116C0BBF4D68F30530542B /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Example/Pods/RainyRefreshControl/README.md b/Example/Pods/RainyRefreshControl/README.md index 6e7b451..f4fd744 100644 --- a/Example/Pods/RainyRefreshControl/README.md +++ b/Example/Pods/RainyRefreshControl/README.md @@ -10,6 +10,38 @@ Project inspired by [concept](https://dribbble.com/shots/2242263--1-Pull-to-refr ![capture_umbrella_refresh](gif/umbrella_refresh.gif "capture_umbrella_refresh") +## Installation + +## Installation with CocoaPods + +To integrate RainyRefreshControl into your Xcode project using CocoaPods, specify it in your `Podfile`: + +```ruby +source 'https://github.com/CocoaPods/Specs.git' +platform :ios, '9.0' + +target 'TargetName' do +pod 'RainyRefreshControl' +end +``` + +Then, run the following command: + +```bash +$ pod install +``` + +## Usage + +Just import RainyRefreshControl framework into your class and add it to UITableView or UICollectionView: + +```swift +let refresh = RainyRefreshControl() +refresh.addTarget(self, action: #selector(ViewController.doRefresh), for: .valueChanged) +tableView.addSubview(refresh) + +``` + ## License RainyRefreshControl is released under the MIT license. See [LICENSE](LICENSE) for details. diff --git a/Example/Pods/RainyRefreshControl/Sources/Umbrella.swift b/Example/Pods/RainyRefreshControl/Sources/Umbrella.swift index cad0b97..8f5ff9b 100644 --- a/Example/Pods/RainyRefreshControl/Sources/Umbrella.swift +++ b/Example/Pods/RainyRefreshControl/Sources/Umbrella.swift @@ -6,7 +6,7 @@ // Copyright © 2016 Onix Systems. All rights reserved. // -import pop +import UIKit enum UmbrellaState { case closed @@ -18,11 +18,64 @@ enum UmbrellaState { final class UmbrellaView:UIView { - var lineWidth:CGFloat = 3.0 - var strokeColor: UIColor = .red + var lineWidth:CGFloat = 1.0 + var strokeColor: UIColor = .white + + private(set) var state = UmbrellaState.closed + private var animationValue: CGFloat { + set { + if let layer = layer as? UmbrellaLayer { + layer.animationValue = newValue + } + } + get { + if let layer = layer as? UmbrellaLayer { + return layer.animationValue + } + return 0.0 + } + } - //A,B,C,D,E - origin coords - //a,b,c,d,e - control points + override class var layerClass : AnyClass { + return UmbrellaLayer.self + } + + override init(frame: CGRect) { + super.init(frame: frame) + if let layer = layer as? UmbrellaLayer { + layer.contentsScale = UIScreen.main.scale + layer.lineWidth = lineWidth + layer.strokeColor = strokeColor + } + animationValue = 1 + } + + required init?(coder aDecoder: NSCoder) { + super.init(coder: aDecoder) + } + + // MARK: - Methods + func setButtonState(state: UmbrellaState, animated: Bool) { + if self.state == state { + return + } + self.state = state + + let toValue: CGFloat = state.value + if animated { + UIView.animate(withDuration: 0.25, animations: { + self.animationValue = toValue + }) + } else { + animationValue = toValue + } + } +} + +final class UmbrellaLayer:CALayer { + @NSManaged var animationValue: CGFloat + var lineWidth:CGFloat = 1.0 + var strokeColor:UIColor = .white private var APoint:CGPoint! private var aPoint:CGPoint! @@ -45,50 +98,31 @@ final class UmbrellaView:UIView { private var FPoint:CGPoint! - private(set) var state = UmbrellaState.closed - private var animationValue: CGFloat = 1.0 { - didSet { - setNeedsDisplay() - } + fileprivate class func isCustomAnimKey(_ key: String) -> Bool { + return key == "animationValue" } - // MARK: - Methods - func setButtonState(state: UmbrellaState, animated: Bool) { - if self.state == state { - return - } - self.state = state - if pop_animation(forKey: "animationValue") != nil { - pop_removeAnimation(forKey: "animationValue") + override class func needsDisplay(forKey key: String) -> Bool { + if self.isCustomAnimKey(key) { + return true } - - let toValue: CGFloat = state.value - if animated { - let animation: POPBasicAnimation = POPBasicAnimation() - if let property = POPAnimatableProperty.property(withName: "animationValue", initializer: { prop in - prop?.readBlock = { (object: Any?, values: UnsafeMutablePointer?) -> Void in - if let view = object as? UmbrellaView { - values?[0] = view.animationValue - } - } - prop?.writeBlock = { (object: Any?, values: UnsafePointer?) -> Void in - if let button = object as? UmbrellaView, - let values = values { - button.animationValue = values[0] - } + return super.needsDisplay(forKey: key) + } + + override func action(forKey event: String) -> CAAction? { + if UmbrellaLayer.isCustomAnimKey(event) { + if let animation = super.action(forKey: "backgroundColor") as? CABasicAnimation { + animation.keyPath = event + if let pLayer = presentation() { + animation.fromValue = pLayer.animationValue } - prop?.threshold = 0.01 - }) as? POPAnimatableProperty { - animation.property = property + animation.toValue = nil + return animation } - animation.fromValue = NSNumber(value: Float(self.animationValue)) - animation.toValue = NSNumber(value: Float(toValue)) - animation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut) - animation.duration = 0.25 - pop_add(animation, forKey: "percentage") - } else { - animationValue = toValue + setNeedsDisplay() + return nil } + return super.action(forKey: event) } func update() { @@ -118,18 +152,16 @@ final class UmbrellaView:UIView { FPoint = CGPoint(x: midX, y: (midY-height*0.3683)-(0.0016*animationValue)) } - override func draw(_ rect: CGRect) { - super.draw(rect) - update() + override func draw(in ctx: CGContext) { + super.draw(in: ctx) + ctx.setStrokeColor(strokeColor.cgColor) + ctx.setLineWidth(lineWidth) + update() //// Draw a handle let bezierPath = UIBezierPath() bezierPath.move(to: CGPoint(x: bounds.midX, y: bounds.midY+bounds.height*0.4266)) bezierPath.addLine(to: CGPoint(x: bounds.midX, y: bounds.midY-bounds.height*0.415)) - strokeColor.setStroke() - bezierPath.lineWidth = lineWidth - bezierPath.lineCapStyle = .round - bezierPath.stroke() let arrayOfDots:[(CGPoint,CGPoint,CGPoint,CGPoint)] = [(APoint,FPoint,aPoint,FPoint), (FPoint,EPoint,FPoint,ePoint), @@ -141,13 +173,12 @@ final class UmbrellaView:UIView { (DPoint,EPoint,DPoint,e1Point)] arrayOfDots.forEach { (a,b,c,d) in - let path = UIBezierPath() - path.move(to: a) - path.addCurve(to: b, controlPoint1: c, controlPoint2: d) - strokeColor.setStroke() - path.lineWidth = lineWidth - path.lineCapStyle = .round - path.stroke() + bezierPath.move(to: a) + bezierPath.addCurve(to: b, controlPoint1: c, controlPoint2: d) } + ctx.addPath(bezierPath.cgPath) + ctx.setLineCap(.round) + ctx.strokePath() } + } diff --git a/Example/Pods/Target Support Files/Pods-RainyRefreshControl Demo/Pods-RainyRefreshControl Demo-acknowledgements.markdown b/Example/Pods/Target Support Files/Pods-RainyRefreshControl Demo/Pods-RainyRefreshControl Demo-acknowledgements.markdown index a9a431b..9a8d919 100644 --- a/Example/Pods/Target Support Files/Pods-RainyRefreshControl Demo/Pods-RainyRefreshControl Demo-acknowledgements.markdown +++ b/Example/Pods/Target Support Files/Pods-RainyRefreshControl Demo/Pods-RainyRefreshControl Demo-acknowledgements.markdown @@ -23,38 +23,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -## pop - -BSD License - -For Pop software - -Copyright (c) 2014, Facebook, Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - * Neither the name Facebook nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - Generated by CocoaPods - https://cocoapods.org diff --git a/Example/Pods/Target Support Files/Pods-RainyRefreshControl Demo/Pods-RainyRefreshControl Demo-acknowledgements.plist b/Example/Pods/Target Support Files/Pods-RainyRefreshControl Demo/Pods-RainyRefreshControl Demo-acknowledgements.plist index c9b37b2..9e6823e 100644 --- a/Example/Pods/Target Support Files/Pods-RainyRefreshControl Demo/Pods-RainyRefreshControl Demo-acknowledgements.plist +++ b/Example/Pods/Target Support Files/Pods-RainyRefreshControl Demo/Pods-RainyRefreshControl Demo-acknowledgements.plist @@ -41,46 +41,6 @@ THE SOFTWARE. Type PSGroupSpecifier - - FooterText - BSD License - -For Pop software - -Copyright (c) 2014, Facebook, Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - * Neither the name Facebook nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - License - BSD - Title - pop - Type - PSGroupSpecifier - FooterText Generated by CocoaPods - https://cocoapods.org diff --git a/Example/Pods/Target Support Files/Pods-RainyRefreshControl Demo/Pods-RainyRefreshControl Demo-frameworks.sh b/Example/Pods/Target Support Files/Pods-RainyRefreshControl Demo/Pods-RainyRefreshControl Demo-frameworks.sh index 2387dfa..d0ad1d7 100755 --- a/Example/Pods/Target Support Files/Pods-RainyRefreshControl Demo/Pods-RainyRefreshControl Demo-frameworks.sh +++ b/Example/Pods/Target Support Files/Pods-RainyRefreshControl Demo/Pods-RainyRefreshControl Demo-frameworks.sh @@ -90,11 +90,9 @@ strip_invalid_archs() { if [[ "$CONFIGURATION" == "Debug" ]]; then install_framework "$BUILT_PRODUCTS_DIR/RainyRefreshControl/RainyRefreshControl.framework" - install_framework "$BUILT_PRODUCTS_DIR/pop/pop.framework" fi if [[ "$CONFIGURATION" == "Release" ]]; then install_framework "$BUILT_PRODUCTS_DIR/RainyRefreshControl/RainyRefreshControl.framework" - install_framework "$BUILT_PRODUCTS_DIR/pop/pop.framework" fi if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then wait diff --git a/Example/Pods/Target Support Files/Pods-RainyRefreshControl Demo/Pods-RainyRefreshControl Demo.debug.xcconfig b/Example/Pods/Target Support Files/Pods-RainyRefreshControl Demo/Pods-RainyRefreshControl Demo.debug.xcconfig index 7ef955c..66a2282 100644 --- a/Example/Pods/Target Support Files/Pods-RainyRefreshControl Demo/Pods-RainyRefreshControl Demo.debug.xcconfig +++ b/Example/Pods/Target Support Files/Pods-RainyRefreshControl Demo/Pods-RainyRefreshControl Demo.debug.xcconfig @@ -1,9 +1,9 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES -FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/RainyRefreshControl" "$PODS_CONFIGURATION_BUILD_DIR/pop" +FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/RainyRefreshControl" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/RainyRefreshControl/RainyRefreshControl.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/pop/pop.framework/Headers" -OTHER_LDFLAGS = $(inherited) -framework "RainyRefreshControl" -framework "pop" +OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/RainyRefreshControl/RainyRefreshControl.framework/Headers" +OTHER_LDFLAGS = $(inherited) -framework "RainyRefreshControl" OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" PODS_BUILD_DIR = $BUILD_DIR PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) diff --git a/Example/Pods/Target Support Files/Pods-RainyRefreshControl Demo/Pods-RainyRefreshControl Demo.release.xcconfig b/Example/Pods/Target Support Files/Pods-RainyRefreshControl Demo/Pods-RainyRefreshControl Demo.release.xcconfig index 7ef955c..66a2282 100644 --- a/Example/Pods/Target Support Files/Pods-RainyRefreshControl Demo/Pods-RainyRefreshControl Demo.release.xcconfig +++ b/Example/Pods/Target Support Files/Pods-RainyRefreshControl Demo/Pods-RainyRefreshControl Demo.release.xcconfig @@ -1,9 +1,9 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES -FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/RainyRefreshControl" "$PODS_CONFIGURATION_BUILD_DIR/pop" +FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/RainyRefreshControl" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/RainyRefreshControl/RainyRefreshControl.framework/Headers" -iquote "$PODS_CONFIGURATION_BUILD_DIR/pop/pop.framework/Headers" -OTHER_LDFLAGS = $(inherited) -framework "RainyRefreshControl" -framework "pop" +OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/RainyRefreshControl/RainyRefreshControl.framework/Headers" +OTHER_LDFLAGS = $(inherited) -framework "RainyRefreshControl" OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" PODS_BUILD_DIR = $BUILD_DIR PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) diff --git a/Example/Pods/Target Support Files/RainyRefreshControl/RainyRefreshControl.xcconfig b/Example/Pods/Target Support Files/RainyRefreshControl/RainyRefreshControl.xcconfig index d4998e4..0cf29fe 100644 --- a/Example/Pods/Target Support Files/RainyRefreshControl/RainyRefreshControl.xcconfig +++ b/Example/Pods/Target Support Files/RainyRefreshControl/RainyRefreshControl.xcconfig @@ -1,5 +1,4 @@ CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/RainyRefreshControl -FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/pop" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public" OTHER_LDFLAGS = -framework "SpriteKit" diff --git a/Example/Pods/Target Support Files/pop/Info.plist b/Example/Pods/Target Support Files/pop/Info.plist deleted file mode 100644 index e366a71..0000000 --- a/Example/Pods/Target Support Files/pop/Info.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - ${PRODUCT_BUNDLE_IDENTIFIER} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0.9 - CFBundleSignature - ???? - CFBundleVersion - ${CURRENT_PROJECT_VERSION} - NSPrincipalClass - - - diff --git a/Example/Pods/Target Support Files/pop/pop-dummy.m b/Example/Pods/Target Support Files/pop/pop-dummy.m deleted file mode 100644 index 19ed261..0000000 --- a/Example/Pods/Target Support Files/pop/pop-dummy.m +++ /dev/null @@ -1,5 +0,0 @@ -#import -@interface PodsDummy_pop : NSObject -@end -@implementation PodsDummy_pop -@end diff --git a/Example/Pods/Target Support Files/pop/pop-prefix.pch b/Example/Pods/Target Support Files/pop/pop-prefix.pch deleted file mode 100644 index beb2a24..0000000 --- a/Example/Pods/Target Support Files/pop/pop-prefix.pch +++ /dev/null @@ -1,12 +0,0 @@ -#ifdef __OBJC__ -#import -#else -#ifndef FOUNDATION_EXPORT -#if defined(__cplusplus) -#define FOUNDATION_EXPORT extern "C" -#else -#define FOUNDATION_EXPORT extern -#endif -#endif -#endif - diff --git a/Example/Pods/Target Support Files/pop/pop-umbrella.h b/Example/Pods/Target Support Files/pop/pop-umbrella.h deleted file mode 100644 index 5f69622..0000000 --- a/Example/Pods/Target Support Files/pop/pop-umbrella.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifdef __OBJC__ -#import -#else -#ifndef FOUNDATION_EXPORT -#if defined(__cplusplus) -#define FOUNDATION_EXPORT extern "C" -#else -#define FOUNDATION_EXPORT extern -#endif -#endif -#endif - -#import "POP.h" -#import "POPAnimatableProperty.h" -#import "POPAnimation.h" -#import "POPAnimationEvent.h" -#import "POPAnimationExtras.h" -#import "POPAnimationTracer.h" -#import "POPAnimator.h" -#import "POPBasicAnimation.h" -#import "POPCustomAnimation.h" -#import "POPDecayAnimation.h" -#import "POPDefines.h" -#import "POPGeometry.h" -#import "POPLayerExtras.h" -#import "POPPropertyAnimation.h" -#import "POPSpringAnimation.h" - -FOUNDATION_EXPORT double popVersionNumber; -FOUNDATION_EXPORT const unsigned char popVersionString[]; - diff --git a/Example/Pods/Target Support Files/pop/pop.modulemap b/Example/Pods/Target Support Files/pop/pop.modulemap deleted file mode 100644 index 6197485..0000000 --- a/Example/Pods/Target Support Files/pop/pop.modulemap +++ /dev/null @@ -1,6 +0,0 @@ -framework module pop { - umbrella header "pop-umbrella.h" - - export * - module * { export * } -} diff --git a/Example/Pods/Target Support Files/pop/pop.xcconfig b/Example/Pods/Target Support Files/pop/pop.xcconfig deleted file mode 100644 index d4a05ae..0000000 --- a/Example/Pods/Target Support Files/pop/pop.xcconfig +++ /dev/null @@ -1,12 +0,0 @@ -CLANG_CXX_LANGUAGE_STANDARD = c++11 -CLANG_CXX_LIBRARY = libc++ -CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/pop -GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public" -OTHER_LDFLAGS = -l"c++" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) -PODS_ROOT = ${SRCROOT} -PODS_TARGET_SRCROOT = ${PODS_ROOT}/pop -PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} -SKIP_INSTALL = YES diff --git a/Example/Pods/pop/LICENSE b/Example/Pods/pop/LICENSE deleted file mode 100644 index 642126f..0000000 --- a/Example/Pods/pop/LICENSE +++ /dev/null @@ -1,30 +0,0 @@ -BSD License - -For Pop software - -Copyright (c) 2014, Facebook, Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - * Neither the name Facebook nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Example/Pods/pop/README.md b/Example/Pods/pop/README.md deleted file mode 100644 index 705a0fd..0000000 --- a/Example/Pods/pop/README.md +++ /dev/null @@ -1,203 +0,0 @@ -![pop](https://github.com/facebook/pop/blob/master/Images/pop.gif?raw=true) - -Pop is an extensible animation engine for iOS, tvOS, and OS X. In addition to basic static animations, it supports spring and decay dynamic animations, making it useful for building realistic, physics-based interactions. The API allows quick integration with existing Objective-C codebases and enables the animation of any property on any object. It's a mature and well-tested framework that drives all the animations and transitions in [Paper](http://www.facebook.com/paper). - -[![Build Status](https://travis-ci.org/facebook/pop.svg)](https://travis-ci.org/facebook/pop) - -## Installation - -Pop is available on [CocoaPods](http://cocoapods.org). Just add the following to your project Podfile: - -```ruby -pod 'pop', '~> 1.0' -``` - -Bugs are first fixed in master and then made available via a designated release. If you tend to live on the bleeding edge, you can use Pop from master with the following Podfile entry: - -```ruby -pod 'pop', :git => 'https://github.com/facebook/pop.git' -``` - -## Non-CocoaPods Installation - -### iOS 8 Embedded Framework -By adding the project to your project and adding pop.embedded framework to the Embedded Binaries section on the General tab of your app's target, you can set up pop in seconds! This also enables `@import pop` syntax with header modules. - -**Note**: because of some awkward limitations with Xcode, embedded binaries must share the same name as the module and must have `.framework` as an extension. This means that you'll see three pop.frameworks when adding embedded binaries (one for OS X, one for tvOS, and one for iOS). You'll need to be sure to add the iOS one, and since this list is populated in order of targets, it's safe to assume it's the second one. You can verify the correct one was chosen by checking the path next to the framework listed: `Debug-iphoneos`. The same principle applies on tvOS but instead of `Debug-iphoneos` look for `Debug-appletvos`. - -![Embedded Binaries](Images/EmbeddedBinaries.png?raw=true) - -**Note 2**: this method does not currently play nicely with workspaces. For some unknown reason, Xcode simply rejects adding pop.framework as an embedded binary when pop.xcodeproj is placed in the workspace. This only works when pop.xcodeproj is added as a subproject to the current target's project. - -### Advanced -Alternatively, you can add the project to your workspace and adopt the provided configuration files or manually copy the files under the pop subdirectory into your project. If installing manually, ensure the C++ standard library is also linked by including `-lc++` to your project linker flags. - -## Usage - -Pop adopts the Core Animation explicit animation programming model. Use by including the following import: - -```objective-c -#import -``` - -or if you're using the embedded framework: - -```objective-c -@import pop; -``` - -### Start, Stop & Update - -To start an animation, add it to the object you wish to animate: - -```objective-c -POPSpringAnimation *anim = [POPSpringAnimation animation]; -... -[layer pop_addAnimation:anim forKey:@"myKey"]; -``` - -To stop an animation, remove it from the object referencing the key specified on start: - -```objective-c -[layer pop_removeAnimationForKey:@"myKey"]; -``` - -The key can also be used to query for the existence of an animation. Updating the toValue of a running animation can provide the most seamless way to change course: - -```objective-c -anim = [layer pop_animationForKey:@"myKey"]; -if (anim) { - /* update to value to new destination */ - anim.toValue = @(42.0); -} else { - /* create and start a new animation */ - .... -} -``` - -While a layer was used in the above examples, the Pop interface is implemented as a category addition on NSObject. Any NSObject or subclass can be animated. - -### Types - -There are four concrete animation types: spring, decay, basic and custom. - -Spring animations can be used to give objects a delightful bounce. In this example, we use a spring animation to animate a layer's bounds from its current value to (0, 0, 400, 400): - -```objective-c -POPSpringAnimation *anim = [POPSpringAnimation animationWithPropertyNamed:kPOPLayerBounds]; -anim.toValue = [NSValue valueWithCGRect:CGRectMake(0, 0, 400, 400)]; -[layer pop_addAnimation:anim forKey:@"size"]; -``` -Decay animations can be used to gradually slow an object to a halt. In this example, we decay a layer's positionX from it's current value and velocity 1000pts per second: - -```objective-c -POPDecayAnimation *anim = [POPDecayAnimation animationWithPropertyNamed:kPOPLayerPositionX]; -anim.velocity = @(1000.); -[layer pop_addAnimation:anim forKey:@"slide"]; -``` - -Basic animations can be used to interpolate values over a specified time period. To use an ease-in ease-out animation to animate a view's alpha from 0.0 to 1.0 over the default duration: -```objective-c -POPBasicAnimation *anim = [POPBasicAnimation animationWithPropertyNamed:kPOPViewAlpha]; -anim.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; -anim.fromValue = @(0.0); -anim.toValue = @(1.0); -[view pop_addAnimation:anim forKey:@"fade"]; -``` -`POPCustomAnimation` makes creating custom animations and transitions easier by handling CADisplayLink and associated time-step management. See header for more details. - - -### Properties - -The property animated is specified by the `POPAnimatableProperty` class. In this example we create a spring animation and explicitly set the animatable property corresponding to `-[CALayer bounds]`: - -```objective-c -POPSpringAnimation *anim = [POPSpringAnimation animation]; -anim.property = [POPAnimatableProperty propertyWithName:kPOPLayerBounds]; -``` - -The framework provides many common layer and view animatable properties out of box. You can animate a custom property by creating a new instance of the class. In this example, we declare a custom volume property: - -```objective-c -prop = [POPAnimatableProperty propertyWithName:@"com.foo.radio.volume" initializer:^(POPMutableAnimatableProperty *prop) { - // read value - prop.readBlock = ^(id obj, CGFloat values[]) { - values[0] = [obj volume]; - }; - // write value - prop.writeBlock = ^(id obj, const CGFloat values[]) { - [obj setVolume:values[0]]; - }; - // dynamics threshold - prop.threshold = 0.01; -}]; - -anim.property = prop; -``` - -For a complete listing of provided animatable properties, as well more information on declaring custom properties see `POPAnimatableProperty.h`. - - -### Debugging - -Here are a few tips when debugging. Pop obeys the Simulator's Toggle Slow Animations setting. Try enabling it to slow down animations and more easily observe interactions. - -Consider naming your animations. This will allow you to more easily identify them when referencing them, either via logging or in the debugger: - -```objective-c -anim.name = @"springOpen"; -``` - -Each animation comes with an associated tracer. The tracer allows you to record all animation-related events, in a fast and efficient manner, allowing you to query and analyze them after animation completion. The below example starts the tracer and configures it to log all events on animation completion: - -```objective-c -POPAnimationTracer *tracer = anim.tracer; -tracer.shouldLogAndResetOnCompletion = YES; -[tracer start]; -``` - -See `POPAnimationTracer.h` for more details. - -## Testing - -Pop has extensive unit test coverage. To install test dependencies, navigate to the root pop directory and type: - -```sh -pod install -``` - -Assuming CocoaPods is installed, this will include the necessary OCMock dependency to the unit test targets. - -## SceneKit - -Due to SceneKit requiring iOS 8 and OS X 10.9, POP's SceneKit extensions aren't provided out of box. Unfortunately, [weakly linked frameworks](https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/WeakLinking.html) cannot be used due to issues mentioned in the [Xcode 6.1 Release Notes](https://developer.apple.com/library/ios/releasenotes/DeveloperTools/RN-Xcode/Chapters/xc6_release_notes.html). - -To remedy this, you can easily opt-in to use SceneKit! Simply add this to the Preprocessor Macros section of your Xcode Project: - -``` -POP_USE_SCENEKIT=1 -``` - -## Resources - -A collection of links to external resources that may prove valuable: - -* [AGGeometryKit+POP - Animating Quadrilaterals with Pop](https://github.com/hfossli/aggeometrykit-pop) -* [Apple – Core Animation Programming Guide](https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/CoreAnimation_guide/Introduction/Introduction.html) -* [iOS Development Tips – UIScrollView-like deceleration with Pop](http://iosdevtips.co/post/84571595353/replicating-uiscrollviews-deceleration-with-facebook) -* [Pop Playground – Repository of Pop animation examples](https://github.com/callmeed/pop-playground) -* [Pop Playground 2 – Playing with Facebook's framework](http://victorbaro.com/2014/05/pop-playground-playing-with-facebooks-framework/) -* [POP-MCAnimate – Concise syntax for the Pop animation framework](https://github.com/matthewcheok/POP-MCAnimate) -* [Popping - Great examples in one project](https://github.com/schneiderandre/popping) -* [Rebound – Spring Animations for Android](http://facebook.github.io/rebound/) -* [Tapity Tutorial – Getting Started with Pop](http://tapity.com/tutorial-getting-started-with-pop/) -* [Tweaks – Easily adjust parameters for iOS apps in development](https://github.com/facebook/tweaks) -* [POP Tutorial in 5 steps](https://github.com/maxmyers/FacebookPop) -* [VBFPopFlatButton – Flat animatable button, using Pop to transition between states](https://github.com/victorBaro/VBFPopFlatButton) - -## Contributing -See the CONTRIBUTING file for how to help out. - -## License - -Pop is released under a BSD License. See LICENSE file for details. diff --git a/Example/Pods/pop/pop/POP.h b/Example/Pods/pop/pop/POP.h deleted file mode 100644 index 72adba7..0000000 --- a/Example/Pods/pop/pop/POP.h +++ /dev/null @@ -1,29 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#ifndef POP_POP_H -#define POP_POP_H - -#import - -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import - -#endif /* POP_POP_H */ diff --git a/Example/Pods/pop/pop/POPAction.h b/Example/Pods/pop/pop/POPAction.h deleted file mode 100644 index 85cca19..0000000 --- a/Example/Pods/pop/pop/POPAction.h +++ /dev/null @@ -1,67 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#ifndef POPACTION_H -#define POPACTION_H - -#import - -#import - -#ifdef __cplusplus - -namespace POP { - - /** - @abstract Disables Core Animation actions using RAII. - @discussion The disablement of actions is scoped to the current transaction. - */ - class ActionDisabler - { - BOOL state; - - public: - ActionDisabler() POP_NOTHROW - { - state = [CATransaction disableActions]; - [CATransaction setDisableActions:YES]; - } - - ~ActionDisabler() - { - [CATransaction setDisableActions:state]; - } - }; - - /** - @abstract Enables Core Animation actions using RAII. - @discussion The enablement of actions is scoped to the current transaction. - */ - class ActionEnabler - { - BOOL state; - - public: - ActionEnabler() POP_NOTHROW - { - state = [CATransaction disableActions]; - [CATransaction setDisableActions:NO]; - } - - ~ActionEnabler() - { - [CATransaction setDisableActions:state]; - } - }; - -} - -#endif /* __cplusplus */ - -#endif /* POPACTION_H */ diff --git a/Example/Pods/pop/pop/POPAnimatableProperty.h b/Example/Pods/pop/pop/POPAnimatableProperty.h deleted file mode 100644 index 4b5cec9..0000000 --- a/Example/Pods/pop/pop/POPAnimatableProperty.h +++ /dev/null @@ -1,251 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import - -#import - -#import - -@class POPMutableAnimatableProperty; - -/** - @abstract Describes an animatable property. - */ -@interface POPAnimatableProperty : NSObject - -/** - @abstract Property accessor. - @param name The name of the property. - @return The animatable property with that name or nil if it does not exist. - @discussion Common animatable properties are included by default. Use the provided constants to reference. - */ -+ (id)propertyWithName:(NSString *)name; - -/** - @abstract The designated initializer. - @param name The name of the property. - @param block The block used to configure the property on creation. - @return The animatable property with name if it exists, otherwise a newly created instance configured by block. - @discussion Custom properties should use reverse-DNS naming. A newly created instance is only mutable in the scope of block. Once constructed, a property becomes immutable. - */ -+ (id)propertyWithName:(NSString *)name initializer:(void (^)(POPMutableAnimatableProperty *prop))block; - -/** - @abstract The name of the property. - @discussion Used to uniquely identify an animatable property. - */ -@property (readonly, nonatomic, copy) NSString *name; - -/** - @abstract Block used to read values from a property into an array of floats. - */ -@property (readonly, nonatomic, copy) void (^readBlock)(id obj, CGFloat values[]); - -/** - @abstract Block used to write values from an array of floats into a property. - */ -@property (readonly, nonatomic, copy) void (^writeBlock)(id obj, const CGFloat values[]); - -/** - @abstract The threshold value used when determining completion of dynamics simulations. - */ -@property (readonly, nonatomic, assign) CGFloat threshold; - -@end - -/** - @abstract A mutable animatable property intended for configuration. - */ -@interface POPMutableAnimatableProperty : POPAnimatableProperty - -/** - @abstract A read-write version of POPAnimatableProperty name property. - */ -@property (readwrite, nonatomic, copy) NSString *name; - -/** - @abstract A read-write version of POPAnimatableProperty readBlock property. - */ -@property (readwrite, nonatomic, copy) void (^readBlock)(id obj, CGFloat values[]); - -/** - @abstract A read-write version of POPAnimatableProperty writeBlock property. - */ -@property (readwrite, nonatomic, copy) void (^writeBlock)(id obj, const CGFloat values[]); - -/** - @abstract A read-write version of POPAnimatableProperty threshold property. - */ -@property (readwrite, nonatomic, assign) CGFloat threshold; - -@end - -/** - Common CALayer property names. - */ -extern NSString * const kPOPLayerBackgroundColor; -extern NSString * const kPOPLayerBounds; -extern NSString * const kPOPLayerCornerRadius; -extern NSString * const kPOPLayerBorderWidth; -extern NSString * const kPOPLayerBorderColor; -extern NSString * const kPOPLayerOpacity; -extern NSString * const kPOPLayerPosition; -extern NSString * const kPOPLayerPositionX; -extern NSString * const kPOPLayerPositionY; -extern NSString * const kPOPLayerRotation; -extern NSString * const kPOPLayerRotationX; -extern NSString * const kPOPLayerRotationY; -extern NSString * const kPOPLayerScaleX; -extern NSString * const kPOPLayerScaleXY; -extern NSString * const kPOPLayerScaleY; -extern NSString * const kPOPLayerSize; -extern NSString * const kPOPLayerSubscaleXY; -extern NSString * const kPOPLayerSubtranslationX; -extern NSString * const kPOPLayerSubtranslationXY; -extern NSString * const kPOPLayerSubtranslationY; -extern NSString * const kPOPLayerSubtranslationZ; -extern NSString * const kPOPLayerTranslationX; -extern NSString * const kPOPLayerTranslationXY; -extern NSString * const kPOPLayerTranslationY; -extern NSString * const kPOPLayerTranslationZ; -extern NSString * const kPOPLayerZPosition; -extern NSString * const kPOPLayerShadowColor; -extern NSString * const kPOPLayerShadowOffset; -extern NSString * const kPOPLayerShadowOpacity; -extern NSString * const kPOPLayerShadowRadius; - -/** - Common CAShapeLayer property names. - */ -extern NSString * const kPOPShapeLayerStrokeStart; -extern NSString * const kPOPShapeLayerStrokeEnd; -extern NSString * const kPOPShapeLayerStrokeColor; -extern NSString * const kPOPShapeLayerFillColor; -extern NSString * const kPOPShapeLayerLineWidth; -extern NSString * const kPOPShapeLayerLineDashPhase; - -/** - Common NSLayoutConstraint property names. - */ -extern NSString * const kPOPLayoutConstraintConstant; - - -#if TARGET_OS_IPHONE - -/** - Common UIView property names. - */ -extern NSString * const kPOPViewAlpha; -extern NSString * const kPOPViewBackgroundColor; -extern NSString * const kPOPViewBounds; -extern NSString * const kPOPViewCenter; -extern NSString * const kPOPViewFrame; -extern NSString * const kPOPViewScaleX; -extern NSString * const kPOPViewScaleXY; -extern NSString * const kPOPViewScaleY; -extern NSString * const kPOPViewSize; -extern NSString * const kPOPViewTintColor; - -/** - Common UIScrollView property names. - */ -extern NSString * const kPOPScrollViewContentOffset; -extern NSString * const kPOPScrollViewContentSize; -extern NSString * const kPOPScrollViewZoomScale; -extern NSString * const kPOPScrollViewContentInset; -extern NSString * const kPOPScrollViewScrollIndicatorInsets; - -/** - Common UITableView property names. - */ -extern NSString * const kPOPTableViewContentOffset; -extern NSString * const kPOPTableViewContentSize; - -/** - Common UICollectionView property names. - */ -extern NSString * const kPOPCollectionViewContentOffset; -extern NSString * const kPOPCollectionViewContentSize; - -/** - Common UINavigationBar property names. - */ -extern NSString * const kPOPNavigationBarBarTintColor; - -/** - Common UIToolbar property names. - */ -extern NSString * const kPOPToolbarBarTintColor; - -/** - Common UITabBar property names. - */ -extern NSString * const kPOPTabBarBarTintColor; - -/** - Common UILabel property names. - */ -extern NSString * const kPOPLabelTextColor; - -#else - -/** - Common NSView property names. - */ -extern NSString * const kPOPViewFrame; -extern NSString * const kPOPViewBounds; -extern NSString * const kPOPViewAlphaValue; -extern NSString * const kPOPViewFrameRotation; -extern NSString * const kPOPViewFrameCenterRotation; -extern NSString * const kPOPViewBoundsRotation; - -/** - Common NSWindow property names. - */ -extern NSString * const kPOPWindowFrame; -extern NSString * const kPOPWindowAlphaValue; -extern NSString * const kPOPWindowBackgroundColor; - -#endif - -#if SCENEKIT_SDK_AVAILABLE - -/** - Common SceneKit property names. - */ -extern NSString * const kPOPSCNNodePosition; -extern NSString * const kPOPSCNNodePositionX; -extern NSString * const kPOPSCNNodePositionY; -extern NSString * const kPOPSCNNodePositionZ; -extern NSString * const kPOPSCNNodeTranslation; -extern NSString * const kPOPSCNNodeTranslationX; -extern NSString * const kPOPSCNNodeTranslationY; -extern NSString * const kPOPSCNNodeTranslationZ; -extern NSString * const kPOPSCNNodeRotation; -extern NSString * const kPOPSCNNodeRotationX; -extern NSString * const kPOPSCNNodeRotationY; -extern NSString * const kPOPSCNNodeRotationZ; -extern NSString * const kPOPSCNNodeRotationW; -extern NSString * const kPOPSCNNodeEulerAngles; -extern NSString * const kPOPSCNNodeEulerAnglesX; -extern NSString * const kPOPSCNNodeEulerAnglesY; -extern NSString * const kPOPSCNNodeEulerAnglesZ; -extern NSString * const kPOPSCNNodeOrientation; -extern NSString * const kPOPSCNNodeOrientationX; -extern NSString * const kPOPSCNNodeOrientationY; -extern NSString * const kPOPSCNNodeOrientationZ; -extern NSString * const kPOPSCNNodeOrientationW; -extern NSString * const kPOPSCNNodeScale; -extern NSString * const kPOPSCNNodeScaleX; -extern NSString * const kPOPSCNNodeScaleY; -extern NSString * const kPOPSCNNodeScaleZ; -extern NSString * const kPOPSCNNodeScaleXY; - -#endif diff --git a/Example/Pods/pop/pop/POPAnimatableProperty.mm b/Example/Pods/pop/pop/POPAnimatableProperty.mm deleted file mode 100644 index 91fd90a..0000000 --- a/Example/Pods/pop/pop/POPAnimatableProperty.mm +++ /dev/null @@ -1,1307 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import "POPAnimatableProperty.h" - -#import - -#import "POPAnimationRuntime.h" -#import "POPCGUtils.h" -#import "POPDefines.h" -#import "POPLayerExtras.h" - -// common threshold definitions -static CGFloat const kPOPThresholdColor = 0.01; -static CGFloat const kPOPThresholdPoint = 1.0; -static CGFloat const kPOPThresholdOpacity = 0.01; -static CGFloat const kPOPThresholdScale = 0.005; -static CGFloat const kPOPThresholdRotation = 0.01; -static CGFloat const kPOPThresholdRadius = 0.01; - -#pragma mark - Static - -// CALayer -NSString * const kPOPLayerBackgroundColor = @"backgroundColor"; -NSString * const kPOPLayerBounds = @"bounds"; -NSString * const kPOPLayerCornerRadius = @"cornerRadius"; -NSString * const kPOPLayerBorderWidth = @"borderWidth"; -NSString * const kPOPLayerBorderColor = @"borderColor"; -NSString * const kPOPLayerOpacity = @"opacity"; -NSString * const kPOPLayerPosition = @"position"; -NSString * const kPOPLayerPositionX = @"positionX"; -NSString * const kPOPLayerPositionY = @"positionY"; -NSString * const kPOPLayerRotation = @"rotation"; -NSString * const kPOPLayerRotationX = @"rotationX"; -NSString * const kPOPLayerRotationY = @"rotationY"; -NSString * const kPOPLayerScaleX = @"scaleX"; -NSString * const kPOPLayerScaleXY = @"scaleXY"; -NSString * const kPOPLayerScaleY = @"scaleY"; -NSString * const kPOPLayerSize = @"size"; -NSString * const kPOPLayerSubscaleXY = @"subscaleXY"; -NSString * const kPOPLayerSubtranslationX = @"subtranslationX"; -NSString * const kPOPLayerSubtranslationXY = @"subtranslationXY"; -NSString * const kPOPLayerSubtranslationY = @"subtranslationY"; -NSString * const kPOPLayerSubtranslationZ = @"subtranslationZ"; -NSString * const kPOPLayerTranslationX = @"translationX"; -NSString * const kPOPLayerTranslationXY = @"translationXY"; -NSString * const kPOPLayerTranslationY = @"translationY"; -NSString * const kPOPLayerTranslationZ = @"translationZ"; -NSString * const kPOPLayerZPosition = @"zPosition"; -NSString * const kPOPLayerShadowColor = @"shadowColor"; -NSString * const kPOPLayerShadowOffset = @"shadowOffset"; -NSString * const kPOPLayerShadowOpacity = @"shadowOpacity"; -NSString * const kPOPLayerShadowRadius = @"shadowRadius"; - -// CAShapeLayer -NSString * const kPOPShapeLayerStrokeStart = @"shapeLayer.strokeStart"; -NSString * const kPOPShapeLayerStrokeEnd = @"shapeLayer.strokeEnd"; -NSString * const kPOPShapeLayerStrokeColor = @"shapeLayer.strokeColor"; -NSString * const kPOPShapeLayerFillColor = @"shapeLayer.fillColor"; -NSString * const kPOPShapeLayerLineWidth = @"shapeLayer.lineWidth"; -NSString * const kPOPShapeLayerLineDashPhase = @"shapeLayer.lineDashPhase"; - -// NSLayoutConstraint -NSString * const kPOPLayoutConstraintConstant = @"layoutConstraint.constant"; - -#if TARGET_OS_IPHONE - -// UIView -NSString * const kPOPViewAlpha = @"view.alpha"; -NSString * const kPOPViewBackgroundColor = @"view.backgroundColor"; -NSString * const kPOPViewBounds = kPOPLayerBounds; -NSString * const kPOPViewCenter = @"view.center"; -NSString * const kPOPViewFrame = @"view.frame"; -NSString * const kPOPViewScaleX = @"view.scaleX"; -NSString * const kPOPViewScaleXY = @"view.scaleXY"; -NSString * const kPOPViewScaleY = @"view.scaleY"; -NSString * const kPOPViewSize = kPOPLayerSize; -NSString * const kPOPViewTintColor = @"view.tintColor"; - -// UIScrollView -NSString * const kPOPScrollViewContentOffset = @"scrollView.contentOffset"; -NSString * const kPOPScrollViewContentSize = @"scrollView.contentSize"; -NSString * const kPOPScrollViewZoomScale = @"scrollView.zoomScale"; -NSString * const kPOPScrollViewContentInset = @"scrollView.contentInset"; -NSString * const kPOPScrollViewScrollIndicatorInsets = @"scrollView.scrollIndicatorInsets"; - -// UITableView -NSString * const kPOPTableViewContentOffset = kPOPScrollViewContentOffset; -NSString * const kPOPTableViewContentSize = kPOPScrollViewContentSize; - -// UICollectionView -NSString * const kPOPCollectionViewContentOffset = kPOPScrollViewContentOffset; -NSString * const kPOPCollectionViewContentSize = kPOPScrollViewContentSize; - -// UINavigationBar -NSString * const kPOPNavigationBarBarTintColor = @"navigationBar.barTintColor"; - -// UIToolbar -NSString * const kPOPToolbarBarTintColor = kPOPNavigationBarBarTintColor; - -// UITabBar -NSString * const kPOPTabBarBarTintColor = kPOPNavigationBarBarTintColor; - -// UILabel -NSString * const kPOPLabelTextColor = @"label.textColor"; - -#else - -// NSView -NSString * const kPOPViewFrame = @"view.frame"; -NSString * const kPOPViewBounds = @"view.bounds"; -NSString * const kPOPViewAlphaValue = @"view.alphaValue"; -NSString * const kPOPViewFrameRotation = @"view.frameRotation"; -NSString * const kPOPViewFrameCenterRotation = @"view.frameCenterRotation"; -NSString * const kPOPViewBoundsRotation = @"view.boundsRotation"; - -// NSWindow -NSString * const kPOPWindowFrame = @"window.frame"; -NSString * const kPOPWindowAlphaValue = @"window.alphaValue"; -NSString * const kPOPWindowBackgroundColor = @"window.backgroundColor"; - -#endif - -#if SCENEKIT_SDK_AVAILABLE - -// SceneKit -NSString * const kPOPSCNNodePosition = @"scnode.position"; -NSString * const kPOPSCNNodePositionX = @"scnnode.position.x"; -NSString * const kPOPSCNNodePositionY = @"scnnode.position.y"; -NSString * const kPOPSCNNodePositionZ = @"scnnode.position.z"; -NSString * const kPOPSCNNodeTranslation = @"scnnode.translation"; -NSString * const kPOPSCNNodeTranslationX = @"scnnode.translation.x"; -NSString * const kPOPSCNNodeTranslationY = @"scnnode.translation.y"; -NSString * const kPOPSCNNodeTranslationZ = @"scnnode.translation.z"; -NSString * const kPOPSCNNodeRotation = @"scnnode.rotation"; -NSString * const kPOPSCNNodeRotationX = @"scnnode.rotation.x"; -NSString * const kPOPSCNNodeRotationY = @"scnnode.rotation.y"; -NSString * const kPOPSCNNodeRotationZ = @"scnnode.rotation.z"; -NSString * const kPOPSCNNodeRotationW = @"scnnode.rotation.w"; -NSString * const kPOPSCNNodeEulerAngles = @"scnnode.eulerAngles"; -NSString * const kPOPSCNNodeEulerAnglesX = @"scnnode.eulerAngles.x"; -NSString * const kPOPSCNNodeEulerAnglesY = @"scnnode.eulerAngles.y"; -NSString * const kPOPSCNNodeEulerAnglesZ = @"scnnode.eulerAngles.z"; -NSString * const kPOPSCNNodeOrientation = @"scnnode.orientation"; -NSString * const kPOPSCNNodeOrientationX = @"scnnode.orientation.x"; -NSString * const kPOPSCNNodeOrientationY = @"scnnode.orientation.y"; -NSString * const kPOPSCNNodeOrientationZ = @"scnnode.orientation.z"; -NSString * const kPOPSCNNodeOrientationW = @"scnnode.orientation.w"; -NSString * const kPOPSCNNodeScale = @"scnnode.scale"; -NSString * const kPOPSCNNodeScaleX = @"scnnode.scale.x"; -NSString * const kPOPSCNNodeScaleY = @"scnnode.scale.y"; -NSString * const kPOPSCNNodeScaleZ = @"scnnode.scale.z"; -NSString * const kPOPSCNNodeScaleXY = @"scnnode.scale.xy"; - -#endif - -/** - State structure internal to static animatable property. - */ -typedef struct -{ - NSString *name; - pop_animatable_read_block readBlock; - pop_animatable_write_block writeBlock; - CGFloat threshold; -} _POPStaticAnimatablePropertyState; -typedef _POPStaticAnimatablePropertyState POPStaticAnimatablePropertyState; - -static POPStaticAnimatablePropertyState _staticStates[] = -{ - /* CALayer */ - - {kPOPLayerBackgroundColor, - ^(CALayer *obj, CGFloat values[]) { - POPCGColorGetRGBAComponents(obj.backgroundColor, values); - }, - ^(CALayer *obj, const CGFloat values[]) { - CGColorRef color = POPCGColorRGBACreate(values); - [obj setBackgroundColor:color]; - CGColorRelease(color); - }, - kPOPThresholdColor - }, - - {kPOPLayerBounds, - ^(CALayer *obj, CGFloat values[]) { - values_from_rect(values, [obj bounds]); - }, - ^(CALayer *obj, const CGFloat values[]) { - [obj setBounds:values_to_rect(values)]; - }, - kPOPThresholdPoint - }, - - {kPOPLayerCornerRadius, - ^(CALayer *obj, CGFloat values[]) { - values[0] = [obj cornerRadius]; - }, - ^(CALayer *obj, const CGFloat values[]) { - [obj setCornerRadius:values[0]]; - }, - kPOPThresholdRadius - }, - - {kPOPLayerBorderWidth, - ^(CALayer *obj, CGFloat values[]) { - values[0] = [obj borderWidth]; - }, - ^(CALayer *obj, const CGFloat values[]) { - [obj setBorderWidth:values[0]]; - }, - 0.01 - }, - - {kPOPLayerBorderColor, - ^(CALayer *obj, CGFloat values[]) { - POPCGColorGetRGBAComponents(obj.borderColor, values); - }, - ^(CALayer *obj, const CGFloat values[]) { - CGColorRef color = POPCGColorRGBACreate(values); - [obj setBorderColor:color]; - CGColorRelease(color); - }, - kPOPThresholdColor - }, - - {kPOPLayerPosition, - ^(CALayer *obj, CGFloat values[]) { - values_from_point(values, [(CALayer *)obj position]); - }, - ^(CALayer *obj, const CGFloat values[]) { - [obj setPosition:values_to_point(values)]; - }, - kPOPThresholdPoint - }, - - {kPOPLayerPositionX, - ^(CALayer *obj, CGFloat values[]) { - values[0] = [(CALayer *)obj position].x; - }, - ^(CALayer *obj, const CGFloat values[]) { - CGPoint p = [(CALayer *)obj position]; - p.x = values[0]; - [obj setPosition:p]; - }, - kPOPThresholdPoint - }, - - {kPOPLayerPositionY, - ^(CALayer *obj, CGFloat values[]) { - values[0] = [(CALayer *)obj position].y; - }, - ^(CALayer *obj, const CGFloat values[]) { - CGPoint p = [(CALayer *)obj position]; - p.y = values[0]; - [obj setPosition:p]; - }, - kPOPThresholdPoint - }, - - {kPOPLayerOpacity, - ^(CALayer *obj, CGFloat values[]) { - values[0] = [obj opacity]; - }, - ^(CALayer *obj, const CGFloat values[]) { - [obj setOpacity:((float)values[0])]; - }, - kPOPThresholdOpacity - }, - - {kPOPLayerScaleX, - ^(CALayer *obj, CGFloat values[]) { - values[0] = POPLayerGetScaleX(obj); - }, - ^(CALayer *obj, const CGFloat values[]) { - POPLayerSetScaleX(obj, values[0]); - }, - kPOPThresholdScale - }, - - {kPOPLayerScaleY, - ^(CALayer *obj, CGFloat values[]) { - values[0] = POPLayerGetScaleY(obj); - }, - ^(CALayer *obj, const CGFloat values[]) { - POPLayerSetScaleY(obj, values[0]); - }, - kPOPThresholdScale - }, - - {kPOPLayerScaleXY, - ^(CALayer *obj, CGFloat values[]) { - values_from_point(values, POPLayerGetScaleXY(obj)); - }, - ^(CALayer *obj, const CGFloat values[]) { - POPLayerSetScaleXY(obj, values_to_point(values)); - }, - kPOPThresholdScale - }, - - {kPOPLayerSubscaleXY, - ^(CALayer *obj, CGFloat values[]) { - values_from_point(values, POPLayerGetSubScaleXY(obj)); - }, - ^(CALayer *obj, const CGFloat values[]) { - POPLayerSetSubScaleXY(obj, values_to_point(values)); - }, - kPOPThresholdScale - }, - - {kPOPLayerTranslationX, - ^(CALayer *obj, CGFloat values[]) { - values[0] = POPLayerGetTranslationX(obj); - }, - ^(CALayer *obj, const CGFloat values[]) { - POPLayerSetTranslationX(obj, values[0]); - }, - kPOPThresholdPoint - }, - - {kPOPLayerTranslationY, - ^(CALayer *obj, CGFloat values[]) { - values[0] = POPLayerGetTranslationY(obj); - }, - ^(CALayer *obj, const CGFloat values[]) { - POPLayerSetTranslationY(obj, values[0]); - }, - kPOPThresholdPoint - }, - - {kPOPLayerTranslationZ, - ^(CALayer *obj, CGFloat values[]) { - values[0] = POPLayerGetTranslationZ(obj); - }, - ^(CALayer *obj, const CGFloat values[]) { - POPLayerSetTranslationZ(obj, values[0]); - }, - kPOPThresholdPoint - }, - - {kPOPLayerTranslationXY, - ^(CALayer *obj, CGFloat values[]) { - values_from_point(values, POPLayerGetTranslationXY(obj)); - }, - ^(CALayer *obj, const CGFloat values[]) { - POPLayerSetTranslationXY(obj, values_to_point(values)); - }, - kPOPThresholdPoint - }, - - {kPOPLayerSubtranslationX, - ^(CALayer *obj, CGFloat values[]) { - values[0] = POPLayerGetSubTranslationX(obj); - }, - ^(CALayer *obj, const CGFloat values[]) { - POPLayerSetSubTranslationX(obj, values[0]); - }, - kPOPThresholdPoint - }, - - {kPOPLayerSubtranslationY, - ^(CALayer *obj, CGFloat values[]) { - values[0] = POPLayerGetSubTranslationY(obj); - }, - ^(CALayer *obj, const CGFloat values[]) { - POPLayerSetSubTranslationY(obj, values[0]); - }, - kPOPThresholdPoint - }, - - {kPOPLayerSubtranslationZ, - ^(CALayer *obj, CGFloat values[]) { - values[0] = POPLayerGetSubTranslationZ(obj); - }, - ^(CALayer *obj, const CGFloat values[]) { - POPLayerSetSubTranslationZ(obj, values[0]); - }, - kPOPThresholdPoint - }, - - {kPOPLayerSubtranslationXY, - ^(CALayer *obj, CGFloat values[]) { - values_from_point(values, POPLayerGetSubTranslationXY(obj)); - }, - ^(CALayer *obj, const CGFloat values[]) { - POPLayerSetSubTranslationXY(obj, values_to_point(values)); - }, - kPOPThresholdPoint - }, - - {kPOPLayerZPosition, - ^(CALayer *obj, CGFloat values[]) { - values[0] = [obj zPosition]; - }, - ^(CALayer *obj, const CGFloat values[]) { - [obj setZPosition:values[0]]; - }, - kPOPThresholdPoint - }, - - {kPOPLayerSize, - ^(CALayer *obj, CGFloat values[]) { - values_from_size(values, [obj bounds].size); - }, - ^(CALayer *obj, const CGFloat values[]) { - CGSize size = values_to_size(values); - if (size.width < 0. || size.height < 0.) - return; - - CGRect b = [obj bounds]; - b.size = size; - [obj setBounds:b]; - }, - kPOPThresholdPoint - }, - - {kPOPLayerRotation, - ^(CALayer *obj, CGFloat values[]) { - values[0] = POPLayerGetRotation(obj); - }, - ^(CALayer *obj, const CGFloat values[]) { - POPLayerSetRotation(obj, values[0]); - }, - kPOPThresholdRotation - }, - - {kPOPLayerRotationY, - ^(CALayer *obj, CGFloat values[]) { - values[0] = POPLayerGetRotationY(obj); - }, - ^(id obj, const CGFloat values[]) { - POPLayerSetRotationY(obj, values[0]); - }, - kPOPThresholdRotation - }, - - {kPOPLayerRotationX, - ^(CALayer *obj, CGFloat values[]) { - values[0] = POPLayerGetRotationX(obj); - }, - ^(CALayer *obj, const CGFloat values[]) { - POPLayerSetRotationX(obj, values[0]); - }, - kPOPThresholdRotation - }, - - {kPOPLayerShadowColor, - ^(CALayer *obj, CGFloat values[]) { - POPCGColorGetRGBAComponents(obj.shadowColor, values); - }, - ^(CALayer *obj, const CGFloat values[]) { - CGColorRef color = POPCGColorRGBACreate(values); - [obj setShadowColor:color]; - CGColorRelease(color); - }, - 0.01 - }, - - {kPOPLayerShadowOffset, - ^(CALayer *obj, CGFloat values[]) { - values_from_size(values, [obj shadowOffset]); - }, - ^(CALayer *obj, const CGFloat values[]) { - CGSize size = values_to_size(values); - [obj setShadowOffset:size]; - }, - 0.01 - }, - - {kPOPLayerShadowOpacity, - ^(CALayer *obj, CGFloat values[]) { - values[0] = [obj shadowOpacity]; - }, - ^(CALayer *obj, const CGFloat values[]) { - [obj setShadowOpacity:values[0]]; - }, - kPOPThresholdOpacity - }, - - {kPOPLayerShadowRadius, - ^(CALayer *obj, CGFloat values[]) { - values[0] = [obj shadowRadius]; - }, - ^(CALayer *obj, const CGFloat values[]) { - [obj setShadowRadius:values[0]]; - }, - kPOPThresholdRadius - }, - - /* CAShapeLayer */ - - {kPOPShapeLayerStrokeStart, - ^(CAShapeLayer *obj, CGFloat values[]) { - values[0] = obj.strokeStart; - }, - ^(CAShapeLayer *obj, const CGFloat values[]) { - obj.strokeStart = values[0]; - }, - 0.01 - }, - - {kPOPShapeLayerStrokeEnd, - ^(CAShapeLayer *obj, CGFloat values[]) { - values[0] = obj.strokeEnd; - }, - ^(CAShapeLayer *obj, const CGFloat values[]) { - obj.strokeEnd = values[0]; - }, - 0.01 - }, - - {kPOPShapeLayerStrokeColor, - ^(CAShapeLayer *obj, CGFloat values[]) { - POPCGColorGetRGBAComponents(obj.strokeColor, values); - }, - ^(CAShapeLayer *obj, const CGFloat values[]) { - CGColorRef color = POPCGColorRGBACreate(values); - [obj setStrokeColor:color]; - CGColorRelease(color); - }, - kPOPThresholdColor - }, - - {kPOPShapeLayerFillColor, - ^(CAShapeLayer *obj, CGFloat values[]) { - POPCGColorGetRGBAComponents(obj.fillColor, values); - }, - ^(CAShapeLayer *obj, const CGFloat values[]) { - CGColorRef color = POPCGColorRGBACreate(values); - [obj setFillColor:color]; - CGColorRelease(color); - }, - kPOPThresholdColor - }, - - {kPOPShapeLayerLineWidth, - ^(CAShapeLayer *obj, CGFloat values[]) { - values[0] = obj.lineWidth; - }, - ^(CAShapeLayer *obj, const CGFloat values[]) { - obj.lineWidth = values[0]; - }, - 0.01 - }, - - {kPOPShapeLayerLineDashPhase, - ^(CAShapeLayer *obj, CGFloat values[]) { - values[0] = obj.lineDashPhase; - }, - ^(CAShapeLayer *obj, const CGFloat values[]) { - obj.lineDashPhase = values[0]; - }, - 0.01 - }, - - {kPOPLayoutConstraintConstant, - ^(NSLayoutConstraint *obj, CGFloat values[]) { - values[0] = obj.constant; - }, - ^(NSLayoutConstraint *obj, const CGFloat values[]) { - obj.constant = values[0]; - }, - 0.01 - }, - -#if TARGET_OS_IPHONE - - /* UIView */ - - {kPOPViewAlpha, - ^(UIView *obj, CGFloat values[]) { - values[0] = obj.alpha; - }, - ^(UIView *obj, const CGFloat values[]) { - obj.alpha = values[0]; - }, - kPOPThresholdOpacity - }, - - {kPOPViewBackgroundColor, - ^(UIView *obj, CGFloat values[]) { - POPUIColorGetRGBAComponents(obj.backgroundColor, values); - }, - ^(UIView *obj, const CGFloat values[]) { - obj.backgroundColor = POPUIColorRGBACreate(values); - }, - kPOPThresholdColor - }, - - {kPOPViewCenter, - ^(UIView *obj, CGFloat values[]) { - values_from_point(values, obj.center); - }, - ^(UIView *obj, const CGFloat values[]) { - obj.center = values_to_point(values); - }, - kPOPThresholdPoint - }, - - {kPOPViewFrame, - ^(UIView *obj, CGFloat values[]) { - values_from_rect(values, obj.frame); - }, - ^(UIView *obj, const CGFloat values[]) { - obj.frame = values_to_rect(values); - }, - kPOPThresholdPoint - }, - - {kPOPViewScaleX, - ^(UIView *obj, CGFloat values[]) { - values[0] = POPLayerGetScaleX(obj.layer); - }, - ^(UIView *obj, const CGFloat values[]) { - POPLayerSetScaleX(obj.layer, values[0]); - }, - kPOPThresholdScale - }, - - {kPOPViewScaleY, - ^(UIView *obj, CGFloat values[]) { - values[0] = POPLayerGetScaleY(obj.layer); - }, - ^(UIView *obj, const CGFloat values[]) { - POPLayerSetScaleY(obj.layer, values[0]); - }, - kPOPThresholdScale - }, - - {kPOPViewScaleXY, - ^(UIView *obj, CGFloat values[]) { - values_from_point(values, POPLayerGetScaleXY(obj.layer)); - }, - ^(UIView *obj, const CGFloat values[]) { - POPLayerSetScaleXY(obj.layer, values_to_point(values)); - }, - kPOPThresholdScale - }, - - {kPOPViewTintColor, - ^(UIView *obj, CGFloat values[]) { - POPUIColorGetRGBAComponents(obj.tintColor, values); - }, - ^(UIView *obj, const CGFloat values[]) { - obj.tintColor = POPUIColorRGBACreate(values); - }, - kPOPThresholdColor - }, - - /* UIScrollView */ - - {kPOPScrollViewContentOffset, - ^(UIScrollView *obj, CGFloat values[]) { - values_from_point(values, obj.contentOffset); - }, - ^(UIScrollView *obj, const CGFloat values[]) { - [obj setContentOffset:values_to_point(values) animated:NO]; - }, - kPOPThresholdPoint - }, - - {kPOPScrollViewContentSize, - ^(UIScrollView *obj, CGFloat values[]) { - values_from_size(values, obj.contentSize); - }, - ^(UIScrollView *obj, const CGFloat values[]) { - obj.contentSize = values_to_size(values); - }, - kPOPThresholdPoint - }, - - {kPOPScrollViewZoomScale, - ^(UIScrollView *obj, CGFloat values[]) { - values[0]=obj.zoomScale; - }, - ^(UIScrollView *obj, const CGFloat values[]) { - obj.zoomScale=values[0]; - }, - kPOPThresholdScale - }, - - {kPOPScrollViewContentInset, - ^(UIScrollView *obj, CGFloat values[]) { - values[0] = obj.contentInset.top; - values[1] = obj.contentInset.left; - values[2] = obj.contentInset.bottom; - values[3] = obj.contentInset.right; - }, - ^(UIScrollView *obj, const CGFloat values[]) { - obj.contentInset = values_to_edge_insets(values); - }, - kPOPThresholdPoint - }, - - {kPOPScrollViewScrollIndicatorInsets, - ^(UIScrollView *obj, CGFloat values[]) { - values[0] = obj.scrollIndicatorInsets.top; - values[1] = obj.scrollIndicatorInsets.left; - values[2] = obj.scrollIndicatorInsets.bottom; - values[3] = obj.scrollIndicatorInsets.right; - }, - ^(UIScrollView *obj, const CGFloat values[]) { - obj.scrollIndicatorInsets = values_to_edge_insets(values); - }, - kPOPThresholdPoint - }, - - /* UINavigationBar */ - - {kPOPNavigationBarBarTintColor, - ^(UINavigationBar *obj, CGFloat values[]) { - POPUIColorGetRGBAComponents(obj.barTintColor, values); - }, - ^(UINavigationBar *obj, const CGFloat values[]) { - obj.barTintColor = POPUIColorRGBACreate(values); - }, - kPOPThresholdColor - }, - - /* UILabel */ - - {kPOPLabelTextColor, - ^(UILabel *obj, CGFloat values[]) { - POPUIColorGetRGBAComponents(obj.textColor, values); - }, - ^(UILabel *obj, const CGFloat values[]) { - obj.textColor = POPUIColorRGBACreate(values); - }, - kPOPThresholdColor - }, - -#else - - /* NSView */ - - {kPOPViewFrame, - ^(NSView *obj, CGFloat values[]) { - values_from_rect(values, NSRectToCGRect(obj.frame)); - }, - ^(NSView *obj, const CGFloat values[]) { - obj.frame = NSRectFromCGRect(values_to_rect(values)); - }, - kPOPThresholdPoint - }, - - {kPOPViewBounds, - ^(NSView *obj, CGFloat values[]) { - values_from_rect(values, NSRectToCGRect(obj.frame)); - }, - ^(NSView *obj, const CGFloat values[]) { - obj.bounds = NSRectFromCGRect(values_to_rect(values)); - }, - kPOPThresholdPoint - }, - - {kPOPViewAlphaValue, - ^(NSView *obj, CGFloat values[]) { - values[0] = obj.alphaValue; - }, - ^(NSView *obj, const CGFloat values[]) { - obj.alphaValue = values[0]; - }, - kPOPThresholdOpacity - }, - - {kPOPViewFrameRotation, - ^(NSView *obj, CGFloat values[]) { - values[0] = obj.frameRotation; - }, - ^(NSView *obj, const CGFloat values[]) { - obj.frameRotation = values[0]; - }, - kPOPThresholdRotation - }, - - {kPOPViewFrameCenterRotation, - ^(NSView *obj, CGFloat values[]) { - values[0] = obj.frameCenterRotation; - }, - ^(NSView *obj, const CGFloat values[]) { - obj.frameCenterRotation = values[0]; - }, - kPOPThresholdRotation - }, - - {kPOPViewBoundsRotation, - ^(NSView *obj, CGFloat values[]) { - values[0] = obj.boundsRotation; - }, - ^(NSView *obj, const CGFloat values[]) { - obj.boundsRotation = values[0]; - }, - kPOPThresholdRotation - }, - - /* NSWindow */ - - {kPOPWindowFrame, - ^(NSWindow *obj, CGFloat values[]) { - values_from_rect(values, NSRectToCGRect(obj.frame)); - }, - ^(NSWindow *obj, const CGFloat values[]) { - [obj setFrame:NSRectFromCGRect(values_to_rect(values)) display:YES]; - }, - kPOPThresholdPoint - }, - - {kPOPWindowAlphaValue, - ^(NSWindow *obj, CGFloat values[]) { - values[0] = obj.alphaValue; - }, - ^(NSWindow *obj, const CGFloat values[]) { - obj.alphaValue = values[0]; - }, - kPOPThresholdOpacity - }, - - {kPOPWindowBackgroundColor, - ^(NSWindow *obj, CGFloat values[]) { - POPNSColorGetRGBAComponents(obj.backgroundColor, values); - }, - ^(NSWindow *obj, const CGFloat values[]) { - obj.backgroundColor = POPNSColorRGBACreate(values); - }, - kPOPThresholdColor - }, - -#endif - -#if SCENEKIT_SDK_AVAILABLE - - /* SceneKit */ - - {kPOPSCNNodePosition, - ^(SCNNode *obj, CGFloat values[]) { - values_from_vec3(values, obj.position); - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.position = values_to_vec3(values); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodePositionX, - ^(SCNNode *obj, CGFloat values[]) { - values[0] = obj.position.x; - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.position = SCNVector3Make(values[0], obj.position.y, obj.position.z); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodePositionY, - ^(SCNNode *obj, CGFloat values[]) { - values[0] = obj.position.y; - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.position = SCNVector3Make(obj.position.x, values[0], obj.position.z); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodePositionZ, - ^(SCNNode *obj, CGFloat values[]) { - values[0] = obj.position.z; - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.position = SCNVector3Make(obj.position.x, obj.position.y, values[0]); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodeTranslation, - ^(SCNNode *obj, CGFloat values[]) { - values[0] = obj.transform.m41; - values[1] = obj.transform.m42; - values[2] = obj.transform.m43; - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.transform = SCNMatrix4MakeTranslation(values[0], values[1], values[2]); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodeTranslationX, - ^(SCNNode *obj, CGFloat values[]) { - values[0] = obj.transform.m41; - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.transform = SCNMatrix4MakeTranslation(values[0], obj.transform.m42, obj.transform.m43); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodeTranslationY, - ^(SCNNode *obj, CGFloat values[]) { - values[0] = obj.transform.m42; - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.transform = SCNMatrix4MakeTranslation(obj.transform.m41, values[0], obj.transform.m43); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodeTranslationY, - ^(SCNNode *obj, CGFloat values[]) { - values[0] = obj.transform.m43; - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.transform = SCNMatrix4MakeTranslation(obj.transform.m41, obj.transform.m42, values[0]); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodeRotation, - ^(SCNNode *obj, CGFloat values[]) { - values_from_vec4(values, obj.rotation); - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.rotation = values_to_vec4(values); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodeRotationX, - ^(SCNNode *obj, CGFloat values[]) { - values[0] = obj.rotation.x; - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.rotation = SCNVector4Make(1.0, obj.rotation.y, obj.rotation.z, values[0]); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodeRotationY, - ^(SCNNode *obj, CGFloat values[]) { - values[0] = obj.rotation.y; - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.rotation = SCNVector4Make(obj.rotation.x, 1.0, obj.rotation.z, values[0]); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodeRotationZ, - ^(SCNNode *obj, CGFloat values[]) { - values[0] = obj.rotation.z; - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.rotation = SCNVector4Make(obj.rotation.x, obj.rotation.y, 1.0, values[0]); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodeRotationW, - ^(SCNNode *obj, CGFloat values[]) { - values[0] = obj.rotation.w; - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.rotation = SCNVector4Make(obj.rotation.x, obj.rotation.y, obj.rotation.z, values[0]); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodeEulerAngles, - ^(SCNNode *obj, CGFloat values[]) { - values_from_vec3(values, obj.eulerAngles); - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.eulerAngles = values_to_vec3(values); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodeEulerAnglesX, - ^(SCNNode *obj, CGFloat values[]) { - values[0] = obj.eulerAngles.x; - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.eulerAngles = SCNVector3Make(values[0], obj.eulerAngles.y, obj.eulerAngles.z); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodeEulerAnglesY, - ^(SCNNode *obj, CGFloat values[]) { - values[0] = obj.eulerAngles.y; - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.eulerAngles = SCNVector3Make(obj.eulerAngles.x, values[0], obj.eulerAngles.z); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodeEulerAnglesZ, - ^(SCNNode *obj, CGFloat values[]) { - values[0] = obj.eulerAngles.z; - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.eulerAngles = SCNVector3Make(obj.eulerAngles.x, obj.eulerAngles.y, values[0]); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodeOrientation, - ^(SCNNode *obj, CGFloat values[]) { - values_from_vec4(values, obj.orientation); - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.orientation = values_to_vec4(values); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodeOrientationX, - ^(SCNNode *obj, CGFloat values[]) { - values[0] = obj.orientation.x; - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.orientation = SCNVector4Make(values[0], obj.orientation.y, obj.orientation.z, obj.orientation.w); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodeOrientationY, - ^(SCNNode *obj, CGFloat values[]) { - values[0] = obj.orientation.y; - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.orientation = SCNVector4Make(obj.orientation.x, values[0], obj.orientation.z, obj.orientation.w); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodeOrientationZ, - ^(SCNNode *obj, CGFloat values[]) { - values[0] = obj.orientation.z; - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.orientation = SCNVector4Make(obj.orientation.x, obj.orientation.y, values[0], obj.orientation.w); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodeOrientationW, - ^(SCNNode *obj, CGFloat values[]) { - values[0] = obj.orientation.w; - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.orientation = SCNVector4Make(obj.orientation.x, obj.orientation.y, obj.orientation.z, values[0]); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodeScale, - ^(SCNNode *obj, CGFloat values[]) { - values_from_vec3(values, obj.scale); - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.scale = values_to_vec3(values); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodeScaleX, - ^(SCNNode *obj, CGFloat values[]) { - values[0] = obj.scale.x; - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.scale = SCNVector3Make(values[0], obj.scale.y, obj.scale.z); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodeScaleY, - ^(SCNNode *obj, CGFloat values[]) { - values[0] = obj.scale.y; - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.position = SCNVector3Make(obj.scale.x, values[0], obj.scale.z); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodeScaleZ, - ^(SCNNode *obj, CGFloat values[]) { - values[0] = obj.scale.z; - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.scale = SCNVector3Make(obj.scale.x, obj.scale.y, values[0]); - }, - kPOPThresholdScale - }, - - {kPOPSCNNodeScaleXY, - ^(SCNNode *obj, CGFloat values[]) { - values[0] = obj.scale.x; - values[1] = obj.scale.y; - }, - ^(SCNNode *obj, const CGFloat values[]) { - obj.scale = SCNVector3Make(values[0], values[1], obj.scale.z); - }, - kPOPThresholdScale - }, - -#endif - -}; - -static NSUInteger staticIndexWithName(NSString *aName) -{ - NSUInteger idx = 0; - - while (idx < POP_ARRAY_COUNT(_staticStates)) { - if ([_staticStates[idx].name isEqualToString:aName]) - return idx; - idx++; - } - - return NSNotFound; -} - -/** - Concrete static property class. - */ -@interface POPStaticAnimatableProperty : POPAnimatableProperty -{ -@public - POPStaticAnimatablePropertyState *_state; -} -@end - -@implementation POPStaticAnimatableProperty - -- (NSString *)name -{ - return _state->name; -} - -- (pop_animatable_read_block)readBlock -{ - return _state->readBlock; -} - -- (pop_animatable_write_block)writeBlock -{ - return _state->writeBlock; -} - -- (CGFloat)threshold -{ - return _state->threshold; -} - -@end - -#pragma mark - Concrete - -/** - Concrete immutable property class. - */ -@interface POPConcreteAnimatableProperty : POPAnimatableProperty -- (instancetype)initWithName:(NSString *)name readBlock:(pop_animatable_read_block)read writeBlock:(pop_animatable_write_block)write threshold:(CGFloat)threshold; -@end - -@implementation POPConcreteAnimatableProperty - -// default synthesis -@synthesize name, readBlock, writeBlock, threshold; - -- (instancetype)initWithName:(NSString *)aName readBlock:(pop_animatable_read_block)aReadBlock writeBlock:(pop_animatable_write_block)aWriteBlock threshold:(CGFloat)aThreshold -{ - self = [super init]; - if (nil != self) { - name = [aName copy]; - readBlock = [aReadBlock copy]; - writeBlock = [aWriteBlock copy]; - threshold = aThreshold; - } - return self; -} -@end - -#pragma mark - Mutable - -@implementation POPMutableAnimatableProperty - -// default synthesis -@synthesize name, readBlock, writeBlock, threshold; - -@end - -#pragma mark - Cluster - -/** - Singleton placeholder property class to support class cluster. - */ -@interface POPPlaceholderAnimatableProperty : POPAnimatableProperty - -@end - -@implementation POPPlaceholderAnimatableProperty - -// default synthesis -@synthesize name, readBlock, writeBlock, threshold; - -@end - -/** - Cluster class. - */ -@implementation POPAnimatableProperty - -// avoid creating backing ivars -@dynamic name, readBlock, writeBlock, threshold; - -static POPAnimatableProperty *placeholder = nil; - -+ (void)initialize -{ - if (self == [POPAnimatableProperty class]) { - placeholder = [POPPlaceholderAnimatableProperty alloc]; - } -} - -+ (id)allocWithZone:(struct _NSZone *)zone -{ - if (self == [POPAnimatableProperty class]) { - if (nil == placeholder) { - placeholder = [super allocWithZone:zone]; - } - return placeholder; - } - return [super allocWithZone:zone]; -} - -- (id)copyWithZone:(NSZone *)zone -{ - if ([self isKindOfClass:[POPMutableAnimatableProperty class]]) { - POPConcreteAnimatableProperty *copyProperty = [[POPConcreteAnimatableProperty alloc] initWithName:self.name readBlock:self.readBlock writeBlock:self.writeBlock threshold:self.threshold]; - return copyProperty; - } else { - return self; - } -} - -- (id)mutableCopyWithZone:(NSZone *)zone -{ - POPMutableAnimatableProperty *copyProperty = [[POPMutableAnimatableProperty alloc] init]; - copyProperty.name = self.name; - copyProperty.readBlock = self.readBlock; - copyProperty.writeBlock = self.writeBlock; - copyProperty.threshold = self.threshold; - return copyProperty; -} - -+ (id)propertyWithName:(NSString *)aName -{ - return [self propertyWithName:aName initializer:NULL]; -} - -+ (id)propertyWithName:(NSString *)aName initializer:(void (^)(POPMutableAnimatableProperty *prop))aBlock -{ - POPAnimatableProperty *prop = nil; - - static NSMutableDictionary *_propertyDict = nil; - if (nil == _propertyDict) { - _propertyDict = [[NSMutableDictionary alloc] initWithCapacity:10]; - } - - prop = _propertyDict[aName]; - if (nil != prop) { - return prop; - } - - NSUInteger staticIdx = staticIndexWithName(aName); - - if (NSNotFound != staticIdx) { - POPStaticAnimatableProperty *staticProp = [[POPStaticAnimatableProperty alloc] init]; - staticProp->_state = &_staticStates[staticIdx]; - _propertyDict[aName] = staticProp; - prop = staticProp; - } else if (NULL != aBlock) { - POPMutableAnimatableProperty *mutableProp = [[POPMutableAnimatableProperty alloc] init]; - mutableProp.name = aName; - mutableProp.threshold = 1.0; - aBlock(mutableProp); - prop = [mutableProp copy]; - } - - return prop; -} - -- (NSString *)description -{ - NSMutableString *s = [NSMutableString stringWithFormat:@"%@ name:%@ threshold:%f", super.description, self.name, self.threshold]; - return s; -} - -@end diff --git a/Example/Pods/pop/pop/POPAnimation.h b/Example/Pods/pop/pop/POPAnimation.h deleted file mode 100644 index 3c710f2..0000000 --- a/Example/Pods/pop/pop/POPAnimation.h +++ /dev/null @@ -1,188 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import - -#import -#import - -@class CAMediaTimingFunction; - -/** - @abstract The abstract animation base class. - @discussion Instantiate and use one of the concrete animation subclasses. - */ -@interface POPAnimation : NSObject - -/** - @abstract The name of the animation. - @discussion Optional property to help identify the animation. - */ -@property (copy, nonatomic) NSString *name; - -/** - @abstract The beginTime of the animation in media time. - @discussion Defaults to 0 and starts immediately. - */ -@property (assign, nonatomic) CFTimeInterval beginTime; - -/** - @abstract The animation delegate. - @discussion See {@ref POPAnimationDelegate} for details. - */ -@property (weak, nonatomic) id delegate; - -/** - @abstract The animation tracer. - @discussion Returns the existing tracer, creating one if needed. Call start/stop on the tracer to toggle event collection. - */ -@property (readonly, nonatomic) POPAnimationTracer *tracer; - -/** - @abstract Optional block called on animation start. - */ -@property (copy, nonatomic) void (^animationDidStartBlock)(POPAnimation *anim); - -/** - @abstract Optional block called when value meets or exceeds to value. - */ -@property (copy, nonatomic) void (^animationDidReachToValueBlock)(POPAnimation *anim); - -/** - @abstract Optional block called on animation completion. - */ -@property (copy, nonatomic) void (^completionBlock)(POPAnimation *anim, BOOL finished); - -/** - @abstract Optional block called each frame animation is applied. - */ -@property (copy, nonatomic) void (^animationDidApplyBlock)(POPAnimation *anim); - -/** - @abstract Flag indicating whether animation should be removed on completion. - @discussion Setting to NO can facilitate animation reuse. Defaults to YES. - */ -@property (assign, nonatomic) BOOL removedOnCompletion; - -/** - @abstract Flag indicating whether animation is paused. - @discussion A paused animation is excluded from the list of active animations. On initial creation, defaults to YES. On animation addition, the animation is implicity unpaused. On animation completion, the animation is implicity paused including for animations with removedOnCompletion set to NO. - */ -@property (assign, nonatomic, getter = isPaused) BOOL paused; - -/** - @abstract Flag indicating whether animation autoreverses. - @discussion An animation that autoreverses will have twice the duration before it is considered finished. It will animate to the toValue, stop, then animate back to the original fromValue. The delegate methods are called as follows: - - 1) animationDidStart: is called at the beginning, as usual, and then after each toValue is reached and the autoreverse is going to start. - 2) animationDidReachToValue: is called every time the toValue is reached. The toValue is swapped with the fromValue at the end of each animation segment. This means that with autoreverses set to YES, the animationDidReachToValue: delegate method will be called a minimum of twice. - 3) animationDidStop:finished: is called every time the toValue is reached, the finished argument will be NO if the autoreverse is not yet complete. - */ -@property (assign, nonatomic) BOOL autoreverses; - -/** - @abstract The number of times to repeat the animation. - @discussion A repeatCount of 0 or 1 means that the animation will not repeat, just like Core Animation. A repeatCount of 2 or greater means that the animation will run that many times before stopping. The delegate methods are called as follows: - - 1) animationDidStart: is called at the beginning of each animation repeat. - 2) animationDidReachToValue: is called every time the toValue is reached. - 3) animationDidStop:finished: is called every time the toValue is reached, the finished argument will be NO if the autoreverse is not yet complete. - -When combined with the autoreverses property, a singular animation is effectively twice as long. - */ -@property (assign, nonatomic) NSInteger repeatCount; - -/** - @abstract Repeat the animation forever. - @discussion This property will make the animation repeat forever. The value of the repeatCount property is undefined when this property is set. The finished parameter of the delegate callback animationDidStop:finished: will always be NO. - */ -@property (assign, nonatomic) BOOL repeatForever; - -@end - -/** - @abstract The animation delegate. - */ -@protocol POPAnimationDelegate -@optional - -/** - @abstract Called on animation start. - @param anim The relevant animation. - */ -- (void)pop_animationDidStart:(POPAnimation *)anim; - -/** - @abstract Called when value meets or exceeds to value. - @param anim The relevant animation. - */ -- (void)pop_animationDidReachToValue:(POPAnimation *)anim; - -/** - @abstract Called on animation stop. - @param anim The relevant animation. - @param finished Flag indicating finished state. Flag is true if the animation reached completion before being removed. - */ -- (void)pop_animationDidStop:(POPAnimation *)anim finished:(BOOL)finished; - -/** - @abstract Called each frame animation is applied. - @param anim The relevant animation. - */ -- (void)pop_animationDidApply:(POPAnimation *)anim; - -@end - - -@interface NSObject (POP) - -/** - @abstract Add an animation to the reciver. - @param anim The animation to add. - @param key The key used to identify the animation. - @discussion The 'key' may be any string such that only one animation per unique key is added per object. - */ -- (void)pop_addAnimation:(POPAnimation *)anim forKey:(NSString *)key; - -/** - @abstract Remove all animations attached to the receiver. - */ -- (void)pop_removeAllAnimations; - -/** - @abstract Remove any animation attached to the receiver for 'key'. - @param key The key used to identify the animation. - */ -- (void)pop_removeAnimationForKey:(NSString *)key; - -/** - @abstract Returns an array containing the keys of all animations currently attached to the receiver. - @param The order of keys reflects the order in which animations will be applied. - */ -- (NSArray *)pop_animationKeys; - -/** - @abstract Returns any animation attached to the receiver. - @param key The key used to identify the animation. - @returns The animation currently attached, or nil if no such animation exists. - */ -- (id)pop_animationForKey:(NSString *)key; - -@end - -/** - * This implementation of NSCopying does not do any copying of animation's state, but only configuration. - * i.e. you cannot copy an animation and expect to apply it to a view and have the copied animation pick up where the original left off. - * Two common uses of copying animations: - * * you need to apply the same animation to multiple different views. - * * you need to absolutely ensure that the the caller of your function cannot mutate the animation once it's been passed in. - */ -@interface POPAnimation (NSCopying) - -@end diff --git a/Example/Pods/pop/pop/POPAnimation.mm b/Example/Pods/pop/pop/POPAnimation.mm deleted file mode 100644 index 75bdeb1..0000000 --- a/Example/Pods/pop/pop/POPAnimation.mm +++ /dev/null @@ -1,303 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import "POPAnimationExtras.h" -#import "POPAnimationInternal.h" - -#import - -#import "POPAction.h" -#import "POPAnimationRuntime.h" -#import "POPAnimationTracerInternal.h" -#import "POPAnimatorPrivate.h" - -using namespace POP; - -#pragma mark - POPAnimation - -@implementation POPAnimation -@synthesize solver = _solver; -@synthesize currentValue = _currentValue; -@synthesize progressMarkers = _progressMarkers; - -#pragma mark - Lifecycle - -- (id)init -{ - [NSException raise:NSStringFromClass([self class]) format:@"Attempting to instantiate an abstract class. Use a concrete subclass instead."]; - return nil; -} - -- (id)_init -{ - self = [super init]; - if (nil != self) { - [self _initState]; - } - return self; -} - -- (void)_initState -{ - _state = new POPAnimationState(self); -} - -- (void)dealloc -{ - if (_state) { - delete _state; - _state = NULL; - }; -} - -#pragma mark - Properties - -- (id)delegate -{ - return _state->delegate; -} - -- (void)setDelegate:(id)delegate -{ - _state->setDelegate(delegate); -} - -- (BOOL)isPaused -{ - return _state->paused; -} - -- (void)setPaused:(BOOL)paused -{ - _state->setPaused(paused ? true : false); -} - -- (NSInteger)repeatCount -{ - if (_state->autoreverses) { - return _state->repeatCount / 2; - } else { - return _state->repeatCount; - } -} - -- (void)setRepeatCount:(NSInteger)repeatCount -{ - if (repeatCount > 0) { - if (repeatCount > NSIntegerMax / 2) { - repeatCount = NSIntegerMax / 2; - } - - if (_state->autoreverses) { - _state->repeatCount = (repeatCount * 2); - } else { - _state->repeatCount = repeatCount; - } - } -} - -- (BOOL)autoreverses -{ - return _state->autoreverses; -} - -- (void)setAutoreverses:(BOOL)autoreverses -{ - _state->autoreverses = autoreverses; - if (autoreverses) { - if (_state->repeatCount == 0) { - [self setRepeatCount:1]; - } - } -} - -FB_PROPERTY_GET(POPAnimationState, type, POPAnimationType); -DEFINE_RW_PROPERTY_OBJ_COPY(POPAnimationState, animationDidStartBlock, setAnimationDidStartBlock:, POPAnimationDidStartBlock); -DEFINE_RW_PROPERTY_OBJ_COPY(POPAnimationState, animationDidReachToValueBlock, setAnimationDidReachToValueBlock:, POPAnimationDidReachToValueBlock); -DEFINE_RW_PROPERTY_OBJ_COPY(POPAnimationState, completionBlock, setCompletionBlock:, POPAnimationCompletionBlock); -DEFINE_RW_PROPERTY_OBJ_COPY(POPAnimationState, animationDidApplyBlock, setAnimationDidApplyBlock:, POPAnimationDidApplyBlock); -DEFINE_RW_PROPERTY_OBJ_COPY(POPAnimationState, name, setName:, NSString*); -DEFINE_RW_PROPERTY(POPAnimationState, beginTime, setBeginTime:, CFTimeInterval); -DEFINE_RW_FLAG(POPAnimationState, removedOnCompletion, removedOnCompletion, setRemovedOnCompletion:); -DEFINE_RW_FLAG(POPAnimationState, repeatForever, repeatForever, setRepeatForever:); - -- (id)valueForUndefinedKey:(NSString *)key -{ - return _state->dict[key]; -} - -- (void)setValue:(id)value forUndefinedKey:(NSString *)key -{ - if (!value) { - [_state->dict removeObjectForKey:key]; - } else { - if (!_state->dict) - _state->dict = [[NSMutableDictionary alloc] init]; - _state->dict[key] = value; - } -} - -- (POPAnimationTracer *)tracer -{ - if (!_state->tracer) { - _state->tracer = [[POPAnimationTracer alloc] initWithAnimation:self]; - } - return _state->tracer; -} - -- (NSString *)description -{ - NSMutableString *s = [NSMutableString stringWithFormat:@"<%@:%p", NSStringFromClass([self class]), self]; - [self _appendDescription:s debug:NO]; - [s appendString:@">"]; - return s; -} - -- (NSString *)debugDescription -{ - NSMutableString *s = [NSMutableString stringWithFormat:@"<%@:%p", NSStringFromClass([self class]), self]; - [self _appendDescription:s debug:YES]; - [s appendString:@">"]; - return s; -} - -#pragma mark - Utility - -POPAnimationState *POPAnimationGetState(POPAnimation *a) -{ - return a->_state; -} - -- (BOOL)_advance:(id)object currentTime:(CFTimeInterval)currentTime elapsedTime:(CFTimeInterval)elapsedTime -{ - return YES; -} - -- (void)_appendDescription:(NSMutableString *)s debug:(BOOL)debug -{ - if (_state->name) - [s appendFormat:@"; name = %@", _state->name]; - - if (!self.removedOnCompletion) - [s appendFormat:@"; removedOnCompletion = %@", POPStringFromBOOL(self.removedOnCompletion)]; - - if (debug) { - if (_state->active) - [s appendFormat:@"; active = %@", POPStringFromBOOL(_state->active)]; - - if (_state->paused) - [s appendFormat:@"; paused = %@", POPStringFromBOOL(_state->paused)]; - } - - if (_state->beginTime) { - [s appendFormat:@"; beginTime = %f", _state->beginTime]; - } - - for (NSString *key in _state->dict) { - [s appendFormat:@"; %@ = %@", key, _state->dict[key]]; - } -} - -@end - - -#pragma mark - POPPropertyAnimation - -#pragma mark - POPBasicAnimation - -#pragma mark - POPDecayAnimation - -@implementation NSObject (POP) - -- (void)pop_addAnimation:(POPAnimation *)anim forKey:(NSString *)key -{ - [[POPAnimator sharedAnimator] addAnimation:anim forObject:self key:key]; -} - -- (void)pop_removeAllAnimations -{ - [[POPAnimator sharedAnimator] removeAllAnimationsForObject:self]; -} - -- (void)pop_removeAnimationForKey:(NSString *)key -{ - [[POPAnimator sharedAnimator] removeAnimationForObject:self key:key]; -} - -- (NSArray *)pop_animationKeys -{ - return [[POPAnimator sharedAnimator] animationKeysForObject:self]; -} - -- (id)pop_animationForKey:(NSString *)key -{ - return [[POPAnimator sharedAnimator] animationForObject:self key:key]; -} - -@end - -@implementation NSProxy (POP) - -- (void)pop_addAnimation:(POPAnimation *)anim forKey:(NSString *)key -{ - [[POPAnimator sharedAnimator] addAnimation:anim forObject:self key:key]; -} - -- (void)pop_removeAllAnimations -{ - [[POPAnimator sharedAnimator] removeAllAnimationsForObject:self]; -} - -- (void)pop_removeAnimationForKey:(NSString *)key -{ - [[POPAnimator sharedAnimator] removeAnimationForObject:self key:key]; -} - -- (NSArray *)pop_animationKeys -{ - return [[POPAnimator sharedAnimator] animationKeysForObject:self]; -} - -- (id)pop_animationForKey:(NSString *)key -{ - return [[POPAnimator sharedAnimator] animationForObject:self key:key]; -} - -@end - -@implementation POPAnimation (NSCopying) - -- (instancetype)copyWithZone:(NSZone *)zone -{ - /* - * Must use [self class] instead of POPAnimation so that subclasses can call this via super. - * Even though POPAnimation and POPPropertyAnimation throw exceptions on init, - * it's safe to call it since you can only copy objects that have been successfully created. - */ - POPAnimation *copy = [[[self class] allocWithZone:zone] init]; - - if (copy) { - copy.name = self.name; - copy.beginTime = self.beginTime; - copy.delegate = self.delegate; - copy.animationDidStartBlock = self.animationDidStartBlock; - copy.animationDidReachToValueBlock = self.animationDidReachToValueBlock; - copy.completionBlock = self.completionBlock; - copy.animationDidApplyBlock = self.animationDidApplyBlock; - copy.removedOnCompletion = self.removedOnCompletion; - - copy.autoreverses = self.autoreverses; - copy.repeatCount = self.repeatCount; - copy.repeatForever = self.repeatForever; - } - - return copy; -} - -@end \ No newline at end of file diff --git a/Example/Pods/pop/pop/POPAnimationEvent.h b/Example/Pods/pop/pop/POPAnimationEvent.h deleted file mode 100644 index e761091..0000000 --- a/Example/Pods/pop/pop/POPAnimationEvent.h +++ /dev/null @@ -1,69 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import - -/** - @abstract Enumeraton of animation event types. - */ -typedef NS_ENUM(NSUInteger, POPAnimationEventType) { - kPOPAnimationEventPropertyRead = 0, - kPOPAnimationEventPropertyWrite, - kPOPAnimationEventToValueUpdate, - kPOPAnimationEventFromValueUpdate, - kPOPAnimationEventVelocityUpdate, - kPOPAnimationEventBouncinessUpdate, - kPOPAnimationEventSpeedUpdate, - kPOPAnimationEventFrictionUpdate, - kPOPAnimationEventMassUpdate, - kPOPAnimationEventTensionUpdate, - kPOPAnimationEventDidStart, - kPOPAnimationEventDidStop, - kPOPAnimationEventDidReachToValue, - kPOPAnimationEventAutoreversed -}; - -/** - @abstract The base animation event class. - */ -@interface POPAnimationEvent : NSObject - -/** - @abstract The event type. See {@ref POPAnimationEventType} for possible values. - */ -@property (readonly, nonatomic, assign) POPAnimationEventType type; - -/** - @abstract The time of event. - */ -@property (readonly, nonatomic, assign) CFTimeInterval time; - -/** - @abstract Optional string describing the animation at time of event. - */ -@property (readonly, nonatomic, copy) NSString *animationDescription; - -@end - -/** - @abstract An animation event subclass for recording value and velocity. - */ -@interface POPAnimationValueEvent : POPAnimationEvent - -/** - @abstract The value recorded. - */ -@property (readonly, nonatomic, strong) id value; - -/** - @abstract The velocity recorded, if any. - */ -@property (readonly, nonatomic, strong) id velocity; - -@end diff --git a/Example/Pods/pop/pop/POPAnimationEvent.mm b/Example/Pods/pop/pop/POPAnimationEvent.mm deleted file mode 100644 index d3a13b6..0000000 --- a/Example/Pods/pop/pop/POPAnimationEvent.mm +++ /dev/null @@ -1,108 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import "POPAnimationEvent.h" -#import "POPAnimationEventInternal.h" - -static NSString *stringFromType(POPAnimationEventType aType) -{ - switch (aType) { - case kPOPAnimationEventPropertyRead: - return @"read"; - case kPOPAnimationEventPropertyWrite: - return @"write"; - case kPOPAnimationEventToValueUpdate: - return @"toValue"; - case kPOPAnimationEventFromValueUpdate: - return @"fromValue"; - case kPOPAnimationEventVelocityUpdate: - return @"velocity"; - case kPOPAnimationEventSpeedUpdate: - return @"speed"; - case kPOPAnimationEventBouncinessUpdate: - return @"bounciness"; - case kPOPAnimationEventFrictionUpdate: - return @"friction"; - case kPOPAnimationEventMassUpdate: - return @"mass"; - case kPOPAnimationEventTensionUpdate: - return @"tension"; - case kPOPAnimationEventDidStart: - return @"didStart"; - case kPOPAnimationEventDidStop: - return @"didStop"; - case kPOPAnimationEventDidReachToValue: - return @"didReachToValue"; - case kPOPAnimationEventAutoreversed: - return @"autoreversed"; - default: - return nil; - } -} - -@implementation POPAnimationEvent -@synthesize type = _type; -@synthesize time = _time; -@synthesize animationDescription = _animationDescription; - -- (instancetype)initWithType:(POPAnimationEventType)aType time:(CFTimeInterval)aTime -{ - self = [super init]; - if (nil != self) { - _type = aType; - _time = aTime; - } - return self; -} - -- (NSString *)description -{ - NSMutableString *s = [NSMutableString stringWithFormat:@""]; - return s; -} - -// subclass override -- (void)_appendDescription:(NSMutableString *)s -{ - if (0 != _animationDescription.length) { - [s appendFormat:@"; animation = %@", _animationDescription]; - } -} - -@end - -@implementation POPAnimationValueEvent -@synthesize value = _value; -@synthesize velocity = _velocity; - -- (instancetype)initWithType:(POPAnimationEventType)aType time:(CFTimeInterval)aTime value:(id)aValue -{ - self = [self initWithType:aType time:aTime]; - if (nil != self) { - _value = aValue; - } - return self; -} - -- (void)_appendDescription:(NSMutableString *)s -{ - [super _appendDescription:s]; - - if (nil != _value) { - [s appendFormat:@"; value = %@", _value]; - } - - if (nil != _velocity) { - [s appendFormat:@"; velocity = %@", _velocity]; - } -} - -@end diff --git a/Example/Pods/pop/pop/POPAnimationEventInternal.h b/Example/Pods/pop/pop/POPAnimationEventInternal.h deleted file mode 100644 index 398d59b..0000000 --- a/Example/Pods/pop/pop/POPAnimationEventInternal.h +++ /dev/null @@ -1,41 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import - -#import "POPAnimationEvent.h" - -@interface POPAnimationEvent () - -/** - @abstract Default initializer. - */ -- (instancetype)initWithType:(POPAnimationEventType)type time:(CFTimeInterval)time; - -/** - @abstract Readwrite redefinition of public property. - */ -@property (readwrite, nonatomic, copy) NSString *animationDescription; - -@end - -@interface POPAnimationValueEvent () - -/** - @abstract Default initializer. - */ -- (instancetype)initWithType:(POPAnimationEventType)type time:(CFTimeInterval)time value:(id)value; - -/** - @abstract Readwrite redefinition of public property. - */ -@property (readwrite, nonatomic, strong) id velocity; - -@end - diff --git a/Example/Pods/pop/pop/POPAnimationExtras.h b/Example/Pods/pop/pop/POPAnimationExtras.h deleted file mode 100644 index 4b3d237..0000000 --- a/Example/Pods/pop/pop/POPAnimationExtras.h +++ /dev/null @@ -1,43 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import - -#import -#import - -/** - @abstract The current drag coefficient. - @discussion A value greater than 1.0 indicates Simulator slow-motion animations are enabled. Defaults to 1.0. - */ -extern CGFloat POPAnimationDragCoefficient(); - -@interface CAAnimation (POPAnimationExtras) - -/** - @abstract Apply the current drag coefficient to animation speed. - @discussion Convenience utility to respect Simulator slow-motion animation settings. - */ -- (void)pop_applyDragCoefficient; - -@end - -@interface POPSpringAnimation (POPAnimationExtras) - -/** - @abstract Converts from spring bounciness and speed to tension, friction and mass dynamics values. - */ -+ (void)convertBounciness:(CGFloat)bounciness speed:(CGFloat)speed toTension:(CGFloat *)outTension friction:(CGFloat *)outFriction mass:(CGFloat *)outMass; - -/** - @abstract Converts from dynamics tension, friction and mass to spring bounciness and speed values. - */ -+ (void)convertTension:(CGFloat)tension friction:(CGFloat)friction toBounciness:(CGFloat *)outBounciness speed:(CGFloat *)outSpeed; - -@end diff --git a/Example/Pods/pop/pop/POPAnimationExtras.mm b/Example/Pods/pop/pop/POPAnimationExtras.mm deleted file mode 100644 index 0a6d6c9..0000000 --- a/Example/Pods/pop/pop/POPAnimationExtras.mm +++ /dev/null @@ -1,117 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import "POPAnimationExtras.h" -#import "POPAnimationPrivate.h" - -#if TARGET_OS_IPHONE -#import -#endif - -#if TARGET_IPHONE_SIMULATOR -UIKIT_EXTERN float UIAnimationDragCoefficient(); // UIKit private drag coeffient, use judiciously -#endif - -#import "POPMath.h" - -CGFloat POPAnimationDragCoefficient() -{ -#if TARGET_IPHONE_SIMULATOR - return UIAnimationDragCoefficient(); -#else - return 1.0; -#endif -} - -@implementation CAAnimation (POPAnimationExtras) - -- (void)pop_applyDragCoefficient -{ - CGFloat k = POPAnimationDragCoefficient(); - if (k != 0 && k != 1) - self.speed = 1 / k; -} - -@end - -@implementation POPSpringAnimation (POPAnimationExtras) - -static const CGFloat POPBouncy3NormalizationRange = 20.0; -static const CGFloat POPBouncy3NormalizationScale = 1.7; -static const CGFloat POPBouncy3BouncinessNormalizedMin = 0.0; -static const CGFloat POPBouncy3BouncinessNormalizedMax = 0.8; -static const CGFloat POPBouncy3SpeedNormalizedMin = 0.5; -static const CGFloat POPBouncy3SpeedNormalizedMax = 200; -static const CGFloat POPBouncy3FrictionInterpolationMax = 0.01; - -+ (void)convertBounciness:(CGFloat)bounciness speed:(CGFloat)speed toTension:(CGFloat *)outTension friction:(CGFloat *)outFriction mass:(CGFloat *)outMass -{ - double b = POPNormalize(bounciness / POPBouncy3NormalizationScale, 0, POPBouncy3NormalizationRange); - b = POPProjectNormal(b, POPBouncy3BouncinessNormalizedMin, POPBouncy3BouncinessNormalizedMax); - - double s = POPNormalize(speed / POPBouncy3NormalizationScale, 0, POPBouncy3NormalizationRange); - - CGFloat tension = POPProjectNormal(s, POPBouncy3SpeedNormalizedMin, POPBouncy3SpeedNormalizedMax); - CGFloat friction = POPQuadraticOutInterpolation(b, POPBouncy3NoBounce(tension), POPBouncy3FrictionInterpolationMax); - - tension = POP_ANIMATION_TENSION_FOR_QC_TENSION(tension); - friction = POP_ANIMATION_FRICTION_FOR_QC_FRICTION(friction); - - if (outTension) { - *outTension = tension; - } - - if (outFriction) { - *outFriction = friction; - } - - if (outMass) { - *outMass = 1.0; - } -} - -+ (void)convertTension:(CGFloat)tension friction:(CGFloat)friction toBounciness:(CGFloat *)outBounciness speed:(CGFloat *)outSpeed -{ - // Convert to QC values, in which our calculations are done. - CGFloat qcFriction = QC_FRICTION_FOR_POP_ANIMATION_FRICTION(friction); - CGFloat qcTension = QC_TENSION_FOR_POP_ANIMATION_TENSION(tension); - - // Friction is a function of bounciness and tension, according to the following: - // friction = POPQuadraticOutInterpolation(b, POPBouncy3NoBounce(tension), POPBouncy3FrictionInterpolationMax); - // Solve for bounciness, given a tension and friction. - - CGFloat nobounceTension = POPBouncy3NoBounce(qcTension); - CGFloat bounciness1, bounciness2; - - POPQuadraticSolve((nobounceTension - POPBouncy3FrictionInterpolationMax), // a - 2 * (POPBouncy3FrictionInterpolationMax - nobounceTension), // b - (nobounceTension - qcFriction), // c - bounciness1, // x1 - bounciness2); // x2 - - - // Choose the quadratic solution within the normalized bounciness range - CGFloat projectedNormalizedBounciness = (bounciness2 < POPBouncy3BouncinessNormalizedMax) ? bounciness2 : bounciness1; - CGFloat projectedNormalizedSpeed = qcTension; - - // Reverse projection + normalization - CGFloat bounciness = ((POPBouncy3NormalizationRange * POPBouncy3NormalizationScale) / (POPBouncy3BouncinessNormalizedMax - POPBouncy3BouncinessNormalizedMin)) * (projectedNormalizedBounciness - POPBouncy3BouncinessNormalizedMin); - CGFloat speed = ((POPBouncy3NormalizationRange * POPBouncy3NormalizationScale) / (POPBouncy3SpeedNormalizedMax - POPBouncy3SpeedNormalizedMin)) * (projectedNormalizedSpeed - POPBouncy3SpeedNormalizedMin); - - // Write back results - if (outBounciness) { - *outBounciness = bounciness; - } - - if (outSpeed) { - *outSpeed = speed; - } -} - -@end diff --git a/Example/Pods/pop/pop/POPAnimationInternal.h b/Example/Pods/pop/pop/POPAnimationInternal.h deleted file mode 100644 index 317364f..0000000 --- a/Example/Pods/pop/pop/POPAnimationInternal.h +++ /dev/null @@ -1,505 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import "POPAnimation.h" - -#import - -#import "POPAction.h" -#import "POPAnimationRuntime.h" -#import "POPAnimationTracerInternal.h" -#import "POPSpringSolver.h" - -using namespace POP; - -/** - Enumeration of supported animation types. - */ -enum POPAnimationType -{ - kPOPAnimationSpring, - kPOPAnimationDecay, - kPOPAnimationBasic, - kPOPAnimationCustom, -}; - -typedef struct -{ - CGFloat progress; - bool reached; -} POPProgressMarker; - -typedef void (^POPAnimationDidStartBlock)(POPAnimation *anim); -typedef void (^POPAnimationDidReachToValueBlock)(POPAnimation *anim); -typedef void (^POPAnimationCompletionBlock)(POPAnimation *anim, BOOL finished); -typedef void (^POPAnimationDidApplyBlock)(POPAnimation *anim); - -@interface POPAnimation() -- (instancetype)_init; - -@property (assign, nonatomic) SpringSolver4d *solver; -@property (readonly, nonatomic) POPAnimationType type; - -/** - The current animation value, updated while animation is progressing. - */ -@property (copy, nonatomic, readonly) id currentValue; - -/** - An array of optional progress markers. For each marker specified, the animation delegate will be informed when progress meets or exceeds the value specified. Specifying values outside of the [0, 1] range will give undefined results. - */ -@property (copy, nonatomic) NSArray *progressMarkers; - -/** - Return YES to indicate animation should continue animating. - */ -- (BOOL)_advance:(id)object currentTime:(CFTimeInterval)currentTime elapsedTime:(CFTimeInterval)elapsedTime; - -/** - Subclass override point to append animation description. - */ -- (void)_appendDescription:(NSMutableString *)s debug:(BOOL)debug; - -@end - -NS_INLINE NSString *describe(VectorConstRef vec) -{ - return NULL == vec ? @"null" : vec->toString(); -} - -NS_INLINE Vector4r vector4(VectorConstRef vec) -{ - return NULL == vec ? Vector4r::Zero() : vec->vector4r(); -} - -NS_INLINE Vector4d vector4d(VectorConstRef vec) -{ - if (NULL == vec) { - return Vector4d::Zero(); - } else { - return vec->vector4r().cast(); - } -} - -NS_INLINE bool vec_equal(VectorConstRef v1, VectorConstRef v2) -{ - if (v1 == v2) { - return true; - } - if (!v1 || !v2) { - return false; - } - return *v1 == *v2; -} - -NS_INLINE CGFloat * vec_data(VectorRef vec) -{ - return NULL == vec ? NULL : vec->data(); -} - -template -struct ComputeProgressFunctor { - CGFloat operator()(const T &value, const T &start, const T &end) const { - return 0; - } -}; - -template<> -struct ComputeProgressFunctor { - CGFloat operator()(const Vector4r &value, const Vector4r &start, const Vector4r &end) const { - CGFloat s = (value - start).squaredNorm(); // distance from start - CGFloat e = (value - end).squaredNorm(); // distance from end - CGFloat d = (end - start).squaredNorm(); // distance from start to end - - if (0 == d) { - return 1; - } else if (s > e) { - // s -------- p ---- e OR s ------- e ---- p - return sqrtr(s/d); - } else { - // s --- p --------- e OR p ---- s ------- e - return 1 - sqrtr(e/d); - } - } -}; - -struct _POPAnimationState; -struct _POPDecayAnimationState; -struct _POPPropertyAnimationState; - -extern _POPAnimationState *POPAnimationGetState(POPAnimation *a); - - -#define FB_FLAG_GET(stype, flag, getter) \ -- (BOOL)getter { \ - return ((stype *)_state)->flag; \ -} - -#define FB_FLAG_SET(stype, flag, mutator) \ -- (void)mutator (BOOL)value { \ - if (value == ((stype *)_state)->flag) \ - return; \ - ((stype *)_state)->flag = value; \ -} - -#define DEFINE_RW_FLAG(stype, flag, getter, mutator) \ - FB_FLAG_GET (stype, flag, getter) \ - FB_FLAG_SET (stype, flag, mutator) - -#define FB_PROPERTY_GET(stype, property, ctype) \ -- (ctype)property { \ - return ((stype *)_state)->property; \ -} - -#define FB_PROPERTY_SET(stype, property, mutator, ctype, ...) \ -- (void)mutator (ctype)value { \ - if (value == ((stype *)_state)->property) \ - return; \ - ((stype *)_state)->property = value; \ - __VA_ARGS__ \ -} - -#define FB_PROPERTY_SET_OBJ_COPY(stype, property, mutator, ctype, ...) \ -- (void)mutator (ctype)value { \ - if (value == ((stype *)_state)->property) \ - return; \ - ((stype *)_state)->property = [value copy]; \ - __VA_ARGS__ \ -} - -#define DEFINE_RW_PROPERTY(stype, flag, mutator, ctype, ...) \ - FB_PROPERTY_GET (stype, flag, ctype) \ - FB_PROPERTY_SET (stype, flag, mutator, ctype, __VA_ARGS__) - -#define DEFINE_RW_PROPERTY_OBJ(stype, flag, mutator, ctype, ...) \ - FB_PROPERTY_GET (stype, flag, ctype) \ - FB_PROPERTY_SET (stype, flag, mutator, ctype, __VA_ARGS__) - -#define DEFINE_RW_PROPERTY_OBJ_COPY(stype, flag, mutator, ctype, ...) \ - FB_PROPERTY_GET (stype, flag, ctype) \ - FB_PROPERTY_SET_OBJ_COPY (stype, flag, mutator, ctype, __VA_ARGS__) - - -/** - Internal delegate definition. - */ -@interface NSObject (POPAnimationDelegateInternal) -- (void)pop_animation:(POPAnimation *)anim didReachProgress:(CGFloat)progress; -@end - -struct _POPAnimationState -{ - id __unsafe_unretained self; - POPAnimationType type; - NSString *name; - NSUInteger ID; - CFTimeInterval beginTime; - CFTimeInterval startTime; - CFTimeInterval lastTime; - id __weak delegate; - POPAnimationDidStartBlock animationDidStartBlock; - POPAnimationDidReachToValueBlock animationDidReachToValueBlock; - POPAnimationCompletionBlock completionBlock; - POPAnimationDidApplyBlock animationDidApplyBlock; - NSMutableDictionary *dict; - POPAnimationTracer *tracer; - CGFloat progress; - NSInteger repeatCount; - - bool active:1; - bool paused:1; - bool removedOnCompletion:1; - - bool delegateDidStart:1; - bool delegateDidStop:1; - bool delegateDidProgress:1; - bool delegateDidApply:1; - bool delegateDidReachToValue:1; - - bool additive:1; - bool didReachToValue:1; - bool tracing:1; // corresponds to tracer started - bool userSpecifiedDynamics:1; - bool autoreverses:1; - bool repeatForever:1; - bool customFinished:1; - - _POPAnimationState(id __unsafe_unretained anim) : - self(anim), - type((POPAnimationType)0), - name(nil), - ID(0), - beginTime(0), - startTime(0), - lastTime(0), - delegate(nil), - animationDidStartBlock(nil), - animationDidReachToValueBlock(nil), - completionBlock(nil), - animationDidApplyBlock(nil), - dict(nil), - tracer(nil), - progress(0), - repeatCount(0), - active(false), - paused(true), - removedOnCompletion(true), - delegateDidStart(false), - delegateDidStop(false), - delegateDidProgress(false), - delegateDidApply(false), - delegateDidReachToValue(false), - additive(false), - didReachToValue(false), - tracing(false), - userSpecifiedDynamics(false), - autoreverses(false), - repeatForever(false), - customFinished(false) {} - - virtual ~_POPAnimationState() - { - name = nil; - dict = nil; - tracer = nil; - animationDidStartBlock = NULL; - animationDidReachToValueBlock = NULL; - completionBlock = NULL; - animationDidApplyBlock = NULL; - } - - bool isCustom() { - return kPOPAnimationCustom == type; - } - - bool isStarted() { - return 0 != startTime; - } - - id getDelegate() { - return delegate; - } - - void setDelegate(id d) { - if (d != delegate) { - delegate = d; - delegateDidStart = [d respondsToSelector:@selector(pop_animationDidStart:)]; - delegateDidStop = [d respondsToSelector:@selector(pop_animationDidStop:finished:)]; - delegateDidProgress = [d respondsToSelector:@selector(pop_animation:didReachProgress:)]; - delegateDidApply = [d respondsToSelector:@selector(pop_animationDidApply:)]; - delegateDidReachToValue = [d respondsToSelector:@selector(pop_animationDidReachToValue:)]; - } - } - - bool getPaused() { - return paused; - } - - void setPaused(bool f) { - if (f != paused) { - paused = f; - if (!paused) { - reset(false); - } - } - } - - CGFloat getProgress() { - return progress; - } - - /* returns true if started */ - bool startIfNeeded(id obj, CFTimeInterval time, CFTimeInterval offset) - { - bool started = false; - - // detect start based on time - if (0 == startTime && time >= beginTime + offset) { - - // activate & unpause - active = true; - setPaused(false); - - // note start time - startTime = lastTime = time; - started = true; - } - - // ensure values for running animation - bool running = active && !paused; - if (running) { - willRun(started, obj); - } - - // handle start - if (started) { - handleDidStart(); - } - - return started; - } - - void stop(bool removing, bool done) { - if (active) - { - // delegate progress one last time - if (done) { - delegateProgress(); - } - - if (removing) { - active = false; - } - - handleDidStop(done); - } else { - - // stopped before even started - // delegate start and stop regardless; matches CA behavior - if (!isStarted()) { - handleDidStart(); - handleDidStop(false); - } - } - - setPaused(true); - } - - virtual void handleDidStart() - { - if (delegateDidStart) { - ActionEnabler enabler; - [delegate pop_animationDidStart:self]; - } - - POPAnimationDidStartBlock block = animationDidStartBlock; - if (block != NULL) { - ActionEnabler enabler; - block(self); - } - - if (tracing) { - [tracer didStart]; - } - } - - void handleDidStop(BOOL done) - { - if (delegateDidStop) { - ActionEnabler enabler; - [delegate pop_animationDidStop:self finished:done]; - } - - // add another strong reference to completion block before callout - POPAnimationCompletionBlock block = completionBlock; - if (block != NULL) { - ActionEnabler enabler; - block(self, done); - } - - if (tracing) { - [tracer didStop:done]; - } - } - - /* virtual functions */ - virtual bool isDone() { - if (isCustom()) { - return customFinished; - } - - return false; - } - - bool advanceTime(CFTimeInterval time, id obj) { - bool advanced = false; - bool computedProgress = false; - CFTimeInterval dt = time - lastTime; - - switch (type) { - case kPOPAnimationSpring: - advanced = advance(time, dt, obj); - break; - case kPOPAnimationDecay: - advanced = advance(time, dt, obj); - break; - case kPOPAnimationBasic: { - advanced = advance(time, dt, obj); - computedProgress = true; - break; - } - case kPOPAnimationCustom: { - customFinished = [self _advance:obj currentTime:time elapsedTime:dt] ? false : true; - advanced = true; - break; - } - default: - break; - } - - if (advanced) { - - // estimate progress - if (!computedProgress) { - computeProgress(); - } - - // delegate progress - delegateProgress(); - - // update time - lastTime = time; - } - - return advanced; - } - - virtual void willRun(bool started, id obj) {} - virtual bool advance(CFTimeInterval time, CFTimeInterval dt, id obj) { return false; } - virtual void computeProgress() {} - virtual void delegateProgress() {} - - virtual void delegateApply() { - if (delegateDidApply) { - ActionEnabler enabler; - [delegate pop_animationDidApply:self]; - } - - POPAnimationDidApplyBlock block = animationDidApplyBlock; - if (block != NULL) { - ActionEnabler enabler; - block(self); - } - } - - virtual void reset(bool all) { - startTime = 0; - lastTime = 0; - } -}; - -typedef struct _POPAnimationState POPAnimationState; - - -@interface POPAnimation () -{ -@protected - struct _POPAnimationState *_state; -} - -@end - -// NSProxy extensions, for testing pursposes -@interface NSProxy (POP) -- (void)pop_addAnimation:(POPAnimation *)anim forKey:(NSString *)key; -- (void)pop_removeAllAnimations; -- (void)pop_removeAnimationForKey:(NSString *)key; -- (NSArray *)pop_animationKeys; -- (POPAnimation *)pop_animationForKey:(NSString *)key; -@end diff --git a/Example/Pods/pop/pop/POPAnimationPrivate.h b/Example/Pods/pop/pop/POPAnimationPrivate.h deleted file mode 100644 index c0f06c5..0000000 --- a/Example/Pods/pop/pop/POPAnimationPrivate.h +++ /dev/null @@ -1,16 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import - -#define POP_ANIMATION_FRICTION_FOR_QC_FRICTION(qcFriction) (25.0 + (((qcFriction - 8.0) / 2.0) * (25.0 - 19.0))) -#define POP_ANIMATION_TENSION_FOR_QC_TENSION(qcTension) (194.0 + (((qcTension - 30.0) / 50.0) * (375.0 - 194.0))) - -#define QC_FRICTION_FOR_POP_ANIMATION_FRICTION(fbFriction) (8.0 + 2.0 * ((fbFriction - 25.0)/(25.0 - 19.0))) -#define QC_TENSION_FOR_POP_ANIMATION_TENSION(fbTension) (30.0 + 50.0 * ((fbTension - 194.0)/(375.0 - 194.0))) diff --git a/Example/Pods/pop/pop/POPAnimationRuntime.h b/Example/Pods/pop/pop/POPAnimationRuntime.h deleted file mode 100644 index 902c312..0000000 --- a/Example/Pods/pop/pop/POPAnimationRuntime.h +++ /dev/null @@ -1,103 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import - -#import - -#import "POPVector.h" - -enum POPValueType -{ - kPOPValueUnknown = 0, - kPOPValueInteger, - kPOPValueFloat, - kPOPValuePoint, - kPOPValueSize, - kPOPValueRect, - kPOPValueEdgeInsets, - kPOPValueAffineTransform, - kPOPValueTransform, - kPOPValueRange, - kPOPValueColor, - kPOPValueSCNVector3, - kPOPValueSCNVector4, -}; - -using namespace POP; - -/** - Returns value type based on objc type description, given list of supported value types and length. - */ -extern POPValueType POPSelectValueType(const char *objctype, const POPValueType *types, size_t length); - -/** - Returns value type based on objc object, given a list of supported value types and length. - */ -extern POPValueType POPSelectValueType(id obj, const POPValueType *types, size_t length); - -/** - Array of all value types. - */ -extern const POPValueType kPOPAnimatableAllTypes[12]; - -/** - Array of all value types supported for animation. - */ -extern const POPValueType kPOPAnimatableSupportTypes[10]; - -/** - Returns a string description of a value type. - */ -extern NSString *POPValueTypeToString(POPValueType t); - -/** - Returns a mutable dictionary of weak pointer keys to weak pointer values. - */ -extern CFMutableDictionaryRef POPDictionaryCreateMutableWeakPointerToWeakPointer(NSUInteger capacity) CF_RETURNS_RETAINED; - -/** - Returns a mutable dictionary of weak pointer keys to weak pointer values. - */ -extern CFMutableDictionaryRef POPDictionaryCreateMutableWeakPointerToStrongObject(NSUInteger capacity) CF_RETURNS_RETAINED; - -/** - Box a vector. - */ -extern id POPBox(VectorConstRef vec, POPValueType type, bool force = false); - -/** - Unbox a vector. - */ -extern VectorRef POPUnbox(id value, POPValueType &type, NSUInteger &count, bool validate); - -/** - Read/write block typedefs for convenience. - */ -typedef void(^pop_animatable_read_block)(id obj, CGFloat *value); -typedef void(^pop_animatable_write_block)(id obj, const CGFloat *value); - -/** - Read object value and return a Vector4r. - */ -NS_INLINE Vector4r read_values(pop_animatable_read_block read, id obj, size_t count) -{ - Vector4r vec = Vector4r::Zero(); - if (0 == count) - return vec; - - read(obj, vec.data()); - - return vec; -} - -NS_INLINE NSString *POPStringFromBOOL(BOOL value) -{ - return value ? @"YES" : @"NO"; -} diff --git a/Example/Pods/pop/pop/POPAnimationRuntime.mm b/Example/Pods/pop/pop/POPAnimationRuntime.mm deleted file mode 100644 index 371e009..0000000 --- a/Example/Pods/pop/pop/POPAnimationRuntime.mm +++ /dev/null @@ -1,329 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import "POPAnimationRuntime.h" - -#import - -#import - -#if TARGET_OS_IPHONE -#import -#endif - -#import "POPCGUtils.h" -#import "POPDefines.h" -#import "POPGeometry.h" -#import "POPVector.h" - -static Boolean pointerEqual(const void *ptr1, const void *ptr2) { - return ptr1 == ptr2; -} - -static CFHashCode pointerHash(const void *ptr) { - return (CFHashCode)(ptr); -} - -CFMutableDictionaryRef POPDictionaryCreateMutableWeakPointerToWeakPointer(NSUInteger capacity) -{ - CFDictionaryKeyCallBacks kcb = kCFTypeDictionaryKeyCallBacks; - - // weak, pointer keys - kcb.retain = NULL; - kcb.release = NULL; - kcb.equal = pointerEqual; - kcb.hash = pointerHash; - - CFDictionaryValueCallBacks vcb = kCFTypeDictionaryValueCallBacks; - - // weak, pointer values - vcb.retain = NULL; - vcb.release = NULL; - vcb.equal = pointerEqual; - - return CFDictionaryCreateMutable(NULL, capacity, &kcb, &vcb); -} - -CFMutableDictionaryRef POPDictionaryCreateMutableWeakPointerToStrongObject(NSUInteger capacity) -{ - CFDictionaryKeyCallBacks kcb = kCFTypeDictionaryKeyCallBacks; - - // weak, pointer keys - kcb.retain = NULL; - kcb.release = NULL; - kcb.equal = pointerEqual; - kcb.hash = pointerHash; - - // strong, object values - CFDictionaryValueCallBacks vcb = kCFTypeDictionaryValueCallBacks; - - return CFDictionaryCreateMutable(NULL, capacity, &kcb, &vcb); -} - -static bool FBCompareTypeEncoding(const char *objctype, POPValueType type) -{ - switch (type) - { - case kPOPValueFloat: - return (strcmp(objctype, @encode(float)) == 0 - || strcmp(objctype, @encode(double)) == 0 - ); - - case kPOPValuePoint: - return (strcmp(objctype, @encode(CGPoint)) == 0 -#if !TARGET_OS_IPHONE - || strcmp(objctype, @encode(NSPoint)) == 0 -#endif - ); - - case kPOPValueSize: - return (strcmp(objctype, @encode(CGSize)) == 0 -#if !TARGET_OS_IPHONE - || strcmp(objctype, @encode(NSSize)) == 0 -#endif - ); - - case kPOPValueRect: - return (strcmp(objctype, @encode(CGRect)) == 0 -#if !TARGET_OS_IPHONE - || strcmp(objctype, @encode(NSRect)) == 0 -#endif - ); - case kPOPValueEdgeInsets: -#if TARGET_OS_IPHONE - return strcmp(objctype, @encode(UIEdgeInsets)) == 0; -#else - return false; -#endif - - case kPOPValueAffineTransform: - return strcmp(objctype, @encode(CGAffineTransform)) == 0; - - case kPOPValueTransform: - return strcmp(objctype, @encode(CATransform3D)) == 0; - - case kPOPValueRange: - return strcmp(objctype, @encode(CFRange)) == 0 - || strcmp(objctype, @encode (NSRange)) == 0; - - case kPOPValueInteger: - return (strcmp(objctype, @encode(int)) == 0 - || strcmp(objctype, @encode(unsigned int)) == 0 - || strcmp(objctype, @encode(short)) == 0 - || strcmp(objctype, @encode(unsigned short)) == 0 - || strcmp(objctype, @encode(long)) == 0 - || strcmp(objctype, @encode(unsigned long)) == 0 - || strcmp(objctype, @encode(long long)) == 0 - || strcmp(objctype, @encode(unsigned long long)) == 0 - ); - - case kPOPValueSCNVector3: -#if SCENEKIT_SDK_AVAILABLE - return strcmp(objctype, @encode(SCNVector3)) == 0; -#else - return false; -#endif - - case kPOPValueSCNVector4: -#if SCENEKIT_SDK_AVAILABLE - return strcmp(objctype, @encode(SCNVector4)) == 0; -#else - return false; -#endif - - default: - return false; - } -} - -POPValueType POPSelectValueType(const char *objctype, const POPValueType *types, size_t length) -{ - if (NULL != objctype) { - for (size_t idx = 0; idx < length; idx++) { - if (FBCompareTypeEncoding(objctype, types[idx])) - return types[idx]; - } - } - return kPOPValueUnknown; -} - -POPValueType POPSelectValueType(id obj, const POPValueType *types, size_t length) -{ - if ([obj isKindOfClass:[NSValue class]]) { - return POPSelectValueType([obj objCType], types, length); - } else if (NULL != POPCGColorWithColor(obj)) { - return kPOPValueColor; - } - return kPOPValueUnknown; -} - -const POPValueType kPOPAnimatableAllTypes[12] = {kPOPValueInteger, kPOPValueFloat, kPOPValuePoint, kPOPValueSize, kPOPValueRect, kPOPValueEdgeInsets, kPOPValueAffineTransform, kPOPValueTransform, kPOPValueRange, kPOPValueColor, kPOPValueSCNVector3, kPOPValueSCNVector4}; - -const POPValueType kPOPAnimatableSupportTypes[10] = {kPOPValueInteger, kPOPValueFloat, kPOPValuePoint, kPOPValueSize, kPOPValueRect, kPOPValueEdgeInsets, kPOPValueColor, kPOPValueSCNVector3, kPOPValueSCNVector4}; - -NSString *POPValueTypeToString(POPValueType t) -{ - switch (t) { - case kPOPValueUnknown: - return @"unknown"; - case kPOPValueInteger: - return @"int"; - case kPOPValueFloat: - return @"CGFloat"; - case kPOPValuePoint: - return @"CGPoint"; - case kPOPValueSize: - return @"CGSize"; - case kPOPValueRect: - return @"CGRect"; - case kPOPValueEdgeInsets: - return @"UIEdgeInsets"; - case kPOPValueAffineTransform: - return @"CGAffineTransform"; - case kPOPValueTransform: - return @"CATransform3D"; - case kPOPValueRange: - return @"CFRange"; - case kPOPValueColor: - return @"CGColorRef"; - case kPOPValueSCNVector3: - return @"SCNVector3"; - case kPOPValueSCNVector4: - return @"SCNVector4"; - default: - return nil; - } -} - -id POPBox(VectorConstRef vec, POPValueType type, bool force) -{ - if (NULL == vec) - return nil; - - switch (type) { - case kPOPValueInteger: - case kPOPValueFloat: - return @(vec->data()[0]); - break; - case kPOPValuePoint: - return [NSValue valueWithCGPoint:vec->cg_point()]; - break; - case kPOPValueSize: - return [NSValue valueWithCGSize:vec->cg_size()]; - break; - case kPOPValueRect: - return [NSValue valueWithCGRect:vec->cg_rect()]; - break; -#if TARGET_OS_IPHONE - case kPOPValueEdgeInsets: - return [NSValue valueWithUIEdgeInsets:vec->ui_edge_insets()]; - break; -#endif - case kPOPValueColor: { - return (__bridge_transfer id)vec->cg_color(); - break; - } -#if SCENEKIT_SDK_AVAILABLE - case kPOPValueSCNVector3: { - return [NSValue valueWithSCNVector3:vec->scn_vector3()]; - break; - } - case kPOPValueSCNVector4: { - return [NSValue valueWithSCNVector4:vec->scn_vector4()]; - break; - } -#endif - default: - return force ? [NSValue valueWithCGPoint:vec->cg_point()] : nil; - break; - } -} - -static VectorRef vectorize(id value, POPValueType type) -{ - Vector *vec = NULL; - - switch (type) { - case kPOPValueInteger: - case kPOPValueFloat: -#if CGFLOAT_IS_DOUBLE - vec = Vector::new_cg_float([value doubleValue]); -#else - vec = Vector::new_cg_float([value floatValue]); -#endif - break; - case kPOPValuePoint: - vec = Vector::new_cg_point([value CGPointValue]); - break; - case kPOPValueSize: - vec = Vector::new_cg_size([value CGSizeValue]); - break; - case kPOPValueRect: - vec = Vector::new_cg_rect([value CGRectValue]); - break; -#if TARGET_OS_IPHONE - case kPOPValueEdgeInsets: - vec = Vector::new_ui_edge_insets([value UIEdgeInsetsValue]); - break; -#endif - case kPOPValueAffineTransform: - vec = Vector::new_cg_affine_transform([value CGAffineTransformValue]); - break; - case kPOPValueColor: - vec = Vector::new_cg_color(POPCGColorWithColor(value)); - break; -#if SCENEKIT_SDK_AVAILABLE - case kPOPValueSCNVector3: - vec = Vector::new_scn_vector3([value SCNVector3Value]); - break; - case kPOPValueSCNVector4: - vec = Vector::new_scn_vector4([value SCNVector4Value]); - break; -#endif - default: - break; - } - - return VectorRef(vec); -} - -VectorRef POPUnbox(id value, POPValueType &animationType, NSUInteger &count, bool validate) -{ - if (nil == value) { - count = 0; - return VectorRef(NULL); - } - - // determine type of value - POPValueType valueType = POPSelectValueType(value, kPOPAnimatableSupportTypes, POP_ARRAY_COUNT(kPOPAnimatableSupportTypes)); - - // handle unknown types - if (kPOPValueUnknown == valueType) { - NSString *valueDesc = [[value class] description]; - [NSException raise:@"Unsuported value" format:@"Animating %@ values is not supported", valueDesc]; - } - - // vectorize - VectorRef vec = vectorize(value, valueType); - - if (kPOPValueUnknown == animationType || 0 == count) { - // update animation type based on value type - animationType = valueType; - if (NULL != vec) { - count = vec->size(); - } - } else if (validate) { - // allow for mismatched types, so long as vector size matches - if (count != vec->size()) { - [NSException raise:@"Invalid value" format:@"%@ should be of type %@", value, POPValueTypeToString(animationType)]; - } - } - - return vec; -} diff --git a/Example/Pods/pop/pop/POPAnimationTracer.h b/Example/Pods/pop/pop/POPAnimationTracer.h deleted file mode 100644 index 72b26c3..0000000 --- a/Example/Pods/pop/pop/POPAnimationTracer.h +++ /dev/null @@ -1,60 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import - -#import - -@class POPAnimation; - -/** - @abstract Tracer of animation events to fasciliate unit testing & debugging. - */ -@interface POPAnimationTracer : NSObject - -/** - @abstract Start recording events. - */ -- (void)start; - -/** - @abstract Stop recording events. - */ -- (void)stop; - -/** - @abstract Resets any recoded events. Continues recording events if already started. - */ -- (void)reset; - -/** - @abstract Property representing all recorded events. - @discussion Events are returned in order of occurence. - */ -@property (nonatomic, assign, readonly) NSArray *allEvents; - -/** - @abstract Property representing all recorded write events for convenience. - @discussion Events are returned in order of occurence. - */ -@property (nonatomic, assign, readonly) NSArray *writeEvents; - -/** - @abstract Queries for events of specified type. - @param type The type of event to return. - @returns An array of events of specified type in order of occurence. - */ -- (NSArray *)eventsWithType:(POPAnimationEventType)type; - -/** - @abstract Property indicating whether tracer should automatically log events and reset collection on animation completion. - */ -@property (nonatomic, assign) BOOL shouldLogAndResetOnCompletion; - -@end diff --git a/Example/Pods/pop/pop/POPAnimationTracer.mm b/Example/Pods/pop/pop/POPAnimationTracer.mm deleted file mode 100644 index 243fb9b..0000000 --- a/Example/Pods/pop/pop/POPAnimationTracer.mm +++ /dev/null @@ -1,191 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import "POPAnimationTracer.h" - -#import - -#import "POPAnimationEventInternal.h" -#import "POPAnimationInternal.h" -#import "POPSpringAnimation.h" - -@implementation POPAnimationTracer -{ - __weak POPAnimation *_animation; - POPAnimationState *_animationState; - NSMutableArray *_events; - BOOL _animationHasVelocity; -} -@synthesize shouldLogAndResetOnCompletion = _shouldLogAndResetOnCompletion; - -static POPAnimationEvent *create_event(POPAnimationTracer *self, POPAnimationEventType type, id value = nil, bool recordAnimation = false) -{ - bool useLocalTime = 0 != self->_animationState->startTime; - CFTimeInterval time = useLocalTime - ? self->_animationState->lastTime - self->_animationState->startTime - : self->_animationState->lastTime; - - POPAnimationEvent *event; - - if (!value) { - event = [[POPAnimationEvent alloc] initWithType:type time:time]; - } else { - event = [[POPAnimationValueEvent alloc] initWithType:type time:time value:value]; - if (self->_animationHasVelocity) { - [(POPAnimationValueEvent *)event setVelocity:[(POPSpringAnimation *)self->_animation velocity]]; - } - } - - if (recordAnimation) { - event.animationDescription = [self->_animation description]; - } - - return event; -} - -- (id)initWithAnimation:(POPAnimation *)anAnim -{ - self = [super init]; - if (nil != self) { - _animation = anAnim; - _animationState = POPAnimationGetState(anAnim); - _events = [[NSMutableArray alloc] initWithCapacity:50]; - _animationHasVelocity = [anAnim respondsToSelector:@selector(velocity)]; - } - return self; -} - -- (void)readPropertyValue:(id)aValue -{ - POPAnimationEvent *event = create_event(self, kPOPAnimationEventPropertyRead, aValue); - [_events addObject:event]; -} - -- (void)writePropertyValue:(id)aValue -{ - POPAnimationEvent *event = create_event(self, kPOPAnimationEventPropertyWrite, aValue); - [_events addObject:event]; -} - -- (void)updateToValue:(id)aValue -{ - POPAnimationEvent *event = create_event(self, kPOPAnimationEventToValueUpdate, aValue); - [_events addObject:event]; -} - -- (void)updateFromValue:(id)aValue -{ - POPAnimationEvent *event = create_event(self, kPOPAnimationEventFromValueUpdate, aValue); - [_events addObject:event]; -} - -- (void)updateVelocity:(id)aValue -{ - POPAnimationEvent *event = create_event(self, kPOPAnimationEventVelocityUpdate, aValue); - [_events addObject:event]; -} - -- (void)updateSpeed:(float)aFloat -{ - POPAnimationEvent *event = create_event(self, kPOPAnimationEventSpeedUpdate, @(aFloat)); - [_events addObject:event]; -} - -- (void)updateBounciness:(float)aFloat -{ - POPAnimationEvent *event = create_event(self, kPOPAnimationEventBouncinessUpdate, @(aFloat)); - [_events addObject:event]; -} - -- (void)updateFriction:(float)aFloat -{ - POPAnimationEvent *event = create_event(self, kPOPAnimationEventFrictionUpdate, @(aFloat)); - [_events addObject:event]; -} - -- (void)updateMass:(float)aFloat -{ - POPAnimationEvent *event = create_event(self, kPOPAnimationEventMassUpdate, @(aFloat)); - [_events addObject:event]; -} - -- (void)updateTension:(float)aFloat -{ - POPAnimationEvent *event = create_event(self, kPOPAnimationEventTensionUpdate, @(aFloat)); - [_events addObject:event]; -} - -- (void)didStart -{ - POPAnimationEvent *event = create_event(self, kPOPAnimationEventDidStart, nil, true); - [_events addObject:event]; -} - -- (void)didStop:(BOOL)finished -{ - POPAnimationEvent *event = create_event(self, kPOPAnimationEventDidStop, @(finished), true); - [_events addObject:event]; - - if (_shouldLogAndResetOnCompletion) { - NSLog(@"events:%@", self.allEvents); - [self reset]; - } -} - -- (void)didReachToValue:(id)aValue -{ - POPAnimationEvent *event = create_event(self, kPOPAnimationEventDidReachToValue, aValue); - [_events addObject:event]; -} - -- (void)autoreversed -{ - POPAnimationEvent *event = create_event(self, kPOPAnimationEventAutoreversed); - [_events addObject:event]; -} - -- (void)start -{ - POPAnimationState *s = POPAnimationGetState(_animation); - s->tracing = true; -} - -- (void)stop -{ - POPAnimationState *s = POPAnimationGetState(_animation); - s->tracing = false; -} - -- (void)reset -{ - [_events removeAllObjects]; -} - -- (NSArray *)allEvents -{ - return [_events copy]; -} - -- (NSArray *)writeEvents -{ - return [self eventsWithType:kPOPAnimationEventPropertyWrite]; -} - -- (NSArray *)eventsWithType:(POPAnimationEventType)aType -{ - NSMutableArray *array = [NSMutableArray array]; - for (POPAnimationEvent *event in _events) { - if (aType == event.type) { - [array addObject:event]; - } - } - return array; -} - -@end diff --git a/Example/Pods/pop/pop/POPAnimationTracerInternal.h b/Example/Pods/pop/pop/POPAnimationTracerInternal.h deleted file mode 100644 index 00958e1..0000000 --- a/Example/Pods/pop/pop/POPAnimationTracerInternal.h +++ /dev/null @@ -1,96 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import - -#import - -@interface POPAnimationTracer (Internal) - -/** - @abstract Designated initalizer. Pass the animation being traced. - */ -- (instancetype)initWithAnimation:(POPAnimation *)anAnim; - -/** - @abstract Records read value. - */ -- (void)readPropertyValue:(id)aValue; - -/** - @abstract Records write value. - */ -- (void)writePropertyValue:(id)aValue; - -/** - Records to value update. - */ -- (void)updateToValue:(id)aValue; - -/** - @abstract Records from value update. - */ -- (void)updateFromValue:(id)aValue; - -/** - @abstract Records from value update. - */ -- (void)updateVelocity:(id)aValue; - -/** - @abstract Records bounciness update. - */ -- (void)updateBounciness:(float)aFloat; - -/** - @abstract Records speed update. - */ -- (void)updateSpeed:(float)aFloat; - -/** - @abstract Records friction update. - */ -- (void)updateFriction:(float)aFloat; - -/** - @abstract Records mass update. - */ -- (void)updateMass:(float)aFloat; - -/** - @abstract Records tension update. - */ -- (void)updateTension:(float)aFloat; - -/** - @abstract Records did add. - */ -- (void)didAdd; - -/** - @abstract Records did start. - */ -- (void)didStart; - -/** - @abstract Records did stop. - */ -- (void)didStop:(BOOL)finished; - -/** - @abstract Records did reach to value. - */ -- (void)didReachToValue:(id)aValue; - -/** - @abstract Records when an autoreverse animation takes place. - */ -- (void)autoreversed; - -@end diff --git a/Example/Pods/pop/pop/POPAnimator.h b/Example/Pods/pop/pop/POPAnimator.h deleted file mode 100644 index 5310bed..0000000 --- a/Example/Pods/pop/pop/POPAnimator.h +++ /dev/null @@ -1,47 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import - -@protocol POPAnimatorDelegate; - -/** - @abstract The animator class renders animations. - */ -@interface POPAnimator : NSObject - -/** - @abstract The shared animator instance. - @discussion Consumers should generally use the shared instance in lieu of creating new instances. - */ -+ (instancetype)sharedAnimator; - -/** - @abstract The optional animator delegate. - */ -@property (weak, nonatomic) id delegate; - -@end - -/** - @abstract The animator delegate. - */ -@protocol POPAnimatorDelegate - -/** - @abstract Called on each frame before animation application. - */ -- (void)animatorWillAnimate:(POPAnimator *)animator; - -/** - @abstract Called on each frame after animation application. - */ -- (void)animatorDidAnimate:(POPAnimator *)animator; - -@end diff --git a/Example/Pods/pop/pop/POPAnimator.mm b/Example/Pods/pop/pop/POPAnimator.mm deleted file mode 100644 index 6b2a770..0000000 --- a/Example/Pods/pop/pop/POPAnimator.mm +++ /dev/null @@ -1,806 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import "POPAnimator.h" -#import "POPAnimatorPrivate.h" - -#import -#import - -#if !TARGET_OS_IPHONE -#import -#endif - -#import - -#import - -#import "POPAnimation.h" -#import "POPAnimationExtras.h" -#import "POPBasicAnimationInternal.h" -#import "POPDecayAnimation.h" - -using namespace std; -using namespace POP; - -#define ENABLE_LOGGING_DEBUG 0 -#define ENABLE_LOGGING_INFO 0 - -#if ENABLE_LOGGING_DEBUG -#define FBLogAnimDebug NSLog -#else -#define FBLogAnimDebug(...) -#endif - -#if ENABLE_LOGGING_INFO -#define FBLogAnimInfo NSLog -#else -#define FBLogAnimInfo(...) -#endif - -class POPAnimatorItem -{ -public: - id __weak object; - NSString *key; - POPAnimation *animation; - NSInteger refCount; - id __unsafe_unretained unretainedObject; - - POPAnimatorItem(id o, NSString *k, POPAnimation *a) POP_NOTHROW - { - object = o; - key = [k copy]; - animation = a; - refCount = 1; - unretainedObject = o; - } - - ~POPAnimatorItem() - { - } - - bool operator==(const POPAnimatorItem& o) const { - return unretainedObject == o.unretainedObject && animation == o.animation && [key isEqualToString:o.key]; - } - -}; - -typedef std::shared_ptr POPAnimatorItemRef; -typedef std::shared_ptr POPAnimatorItemConstRef; - -typedef std::list POPAnimatorItemList; -typedef POPAnimatorItemList::iterator POPAnimatorItemListIterator; -typedef POPAnimatorItemList::const_iterator POPAnimatorItemListConstIterator; - -static BOOL _disableBackgroundThread = YES; - -@interface POPAnimator () -{ -#if TARGET_OS_IPHONE - CADisplayLink *_displayLink; -#else - CVDisplayLinkRef _displayLink; - int32_t _enqueuedRender; -#endif - POPAnimatorItemList _list; - CFMutableDictionaryRef _dict; - NSMutableArray *_observers; - POPAnimatorItemList _pendingList; - CFRunLoopObserverRef _pendingListObserver; - CFTimeInterval _slowMotionStartTime; - CFTimeInterval _slowMotionLastTime; - CFTimeInterval _slowMotionAccumulator; - CFTimeInterval _beginTime; - OSSpinLock _lock; - BOOL _disableDisplayLink; -} -@end - -@implementation POPAnimator -@synthesize delegate = _delegate; -@synthesize disableDisplayLink = _disableDisplayLink; -@synthesize beginTime = _beginTime; - -#if !TARGET_OS_IPHONE -static CVReturn displayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeStamp *now, const CVTimeStamp *outputTime, CVOptionFlags flagsIn, CVOptionFlags *flagsOut, void *context) -{ - if (_disableBackgroundThread) { - __unsafe_unretained POPAnimator *pa = (__bridge POPAnimator *)context; - int32_t* enqueuedRender = &pa->_enqueuedRender; - if (*enqueuedRender == 0) { - OSAtomicIncrement32(enqueuedRender); - dispatch_async(dispatch_get_main_queue(), ^{ - [(__bridge POPAnimator*)context render]; - OSAtomicDecrement32(enqueuedRender); - }); - } - } else { - [(__bridge POPAnimator*)context render]; - } - return kCVReturnSuccess; -} -#endif - -// call while holding lock -static void updateDisplayLink(POPAnimator *self) -{ - BOOL paused = (0 == self->_observers.count && self->_list.empty()) || self->_disableDisplayLink; - -#if TARGET_OS_IPHONE - if (paused != self->_displayLink.paused) { - FBLogAnimInfo(paused ? @"pausing display link" : @"unpausing display link"); - self->_displayLink.paused = paused; - } -#else - if (paused == CVDisplayLinkIsRunning(self->_displayLink)) { - FBLogAnimInfo(paused ? @"pausing display link" : @"unpausing display link"); - if (paused) { - CVDisplayLinkStop(self->_displayLink); - } else { - CVDisplayLinkStart(self->_displayLink); - } - } -#endif -} - -static void updateAnimatable(id obj, POPPropertyAnimationState *anim, bool shouldAvoidExtraneousWrite = false) -{ - // handle user-initiated stop or pause; hault animation - if (!anim->active || anim->paused) - return; - - if (anim->hasValue()) { - pop_animatable_write_block write = anim->property.writeBlock; - if (NULL == write) - return; - - // current animation value - VectorRef currentVec = anim->currentValue(); - - if (!anim->additive) { - - // if avoiding extraneous writes and we have a read block defined - if (shouldAvoidExtraneousWrite) { - - pop_animatable_read_block read = anim->property.readBlock; - if (read) { - // compare current animation value with object value - Vector4r currentValue = currentVec->vector4r(); - Vector4r objectValue = read_values(read, obj, anim->valueCount); - if (objectValue == currentValue) { - return; - } - } - } - - // update previous values; support animation convergence - anim->previous2Vec = anim->previousVec; - anim->previousVec = currentVec; - - // write value - write(obj, currentVec->data()); - if (anim->tracing) { - [anim->tracer writePropertyValue:POPBox(currentVec, anim->valueType, true)]; - } - } else { - pop_animatable_read_block read = anim->property.readBlock; - NSCAssert(read, @"additive requires an animatable property readBlock"); - if (NULL == read) { - return; - } - - // object value - Vector4r objectValue = read_values(read, obj, anim->valueCount); - - // current value - Vector4r currentValue = currentVec->vector4r(); - - // determine animation change - if (anim->previousVec) { - Vector4r previousValue = anim->previousVec->vector4r(); - currentValue -= previousValue; - } - - // avoid writing no change - if (shouldAvoidExtraneousWrite && currentValue == Vector4r::Zero()) { - return; - } - - // add to object value - currentValue += objectValue; - - // update previous values; support animation convergence - anim->previous2Vec = anim->previousVec; - anim->previousVec = currentVec; - - // write value - write(obj, currentValue.data()); - if (anim->tracing) { - [anim->tracer writePropertyValue:POPBox(currentVec, anim->valueType, true)]; - } - } - } -} - -static void applyAnimationTime(id obj, POPAnimationState *state, CFTimeInterval time) -{ - if (!state->advanceTime(time, obj)) { - return; - } - - POPPropertyAnimationState *ps = dynamic_cast(state); - if (NULL != ps) { - updateAnimatable(obj, ps); - } - - state->delegateApply(); -} - -static void applyAnimationToValue(id obj, POPAnimationState *state) -{ - POPPropertyAnimationState *ps = dynamic_cast(state); - - if (NULL != ps) { - - // finalize progress - ps->finalizeProgress(); - - // write to value, updating only if needed - updateAnimatable(obj, ps, true); - } - - state->delegateApply(); -} - -static POPAnimation *deleteDictEntry(POPAnimator *self, id __unsafe_unretained obj, NSString *key, BOOL cleanup = YES) -{ - POPAnimation *anim = nil; - - // lock - OSSpinLockLock(&self->_lock); - - NSMutableDictionary *keyAnimationsDict = (__bridge id)CFDictionaryGetValue(self->_dict, (__bridge void *)obj); - if (keyAnimationsDict) { - - anim = keyAnimationsDict[key]; - if (anim) { - - // remove key - [keyAnimationsDict removeObjectForKey:key]; - - // cleanup empty dictionaries - if (cleanup && 0 == keyAnimationsDict.count) { - CFDictionaryRemoveValue(self->_dict, (__bridge void *)obj); - } - } - } - - // unlock - OSSpinLockUnlock(&self->_lock); - return anim; -} - -static void stopAndCleanup(POPAnimator *self, POPAnimatorItemRef item, bool shouldRemove, bool finished) -{ - // remove - if (shouldRemove) { - deleteDictEntry(self, item->unretainedObject, item->key); - } - - // stop - POPAnimationState *state = POPAnimationGetState(item->animation); - state->stop(shouldRemove, finished); - - if (shouldRemove) { - // lock - OSSpinLockLock(&self->_lock); - - // find item in list - // may have already been removed on animationDidStop: - POPAnimatorItemListIterator find_iter = find(self->_list.begin(), self->_list.end(), item); - BOOL found = find_iter != self->_list.end(); - - if (found) { - self->_list.erase(find_iter); - } - - // unlock - OSSpinLockUnlock(&self->_lock); - } -} - -+ (id)sharedAnimator -{ - static POPAnimator* _animator = nil; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - _animator = [[POPAnimator alloc] init]; - }); - return _animator; -} - -+ (BOOL)disableBackgroundThread -{ - return _disableBackgroundThread; -} - -+ (void)setDisableBackgroundThread:(BOOL)flag -{ - _disableBackgroundThread = flag; -} - -#pragma mark - Lifecycle - -- (id)init -{ - self = [super init]; - if (nil == self) return nil; - -#if TARGET_OS_IPHONE - _displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(render)]; - _displayLink.paused = YES; - [_displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes]; -#else - CVDisplayLinkCreateWithActiveCGDisplays(&_displayLink); - CVDisplayLinkSetOutputCallback(_displayLink, displayLinkCallback, (__bridge void *)self); -#endif - - _dict = POPDictionaryCreateMutableWeakPointerToStrongObject(5); - _lock = OS_SPINLOCK_INIT; - - return self; -} - -- (void)dealloc -{ -#if TARGET_OS_IPHONE - [_displayLink invalidate]; -#else - CVDisplayLinkStop(_displayLink); - CVDisplayLinkRelease(_displayLink); -#endif - [self _clearPendingListObserver]; -} - -#pragma mark - Utility - -- (void)_processPendingList -{ - // rendering pending animations - CFTimeInterval time = [self _currentRenderTime]; - [self _renderTime:(0 != _beginTime) ? _beginTime : time items:_pendingList]; - - // lock - OSSpinLockLock(&_lock); - - // clear list and observer - _pendingList.clear(); - [self _clearPendingListObserver]; - - // unlock - OSSpinLockUnlock(&_lock); -} - -- (void)_clearPendingListObserver -{ - if (_pendingListObserver) { - CFRunLoopRemoveObserver(CFRunLoopGetMain(), _pendingListObserver, kCFRunLoopCommonModes); - CFRelease(_pendingListObserver); - _pendingListObserver = NULL; - } -} - -- (void)_scheduleProcessPendingList -{ - // see WebKit for magic numbers, eg http://trac.webkit.org/changeset/166540 - static const CFIndex CATransactionCommitRunLoopOrder = 2000000; - static const CFIndex POPAnimationApplyRunLoopOrder = CATransactionCommitRunLoopOrder - 1; - - // lock - OSSpinLockLock(&_lock); - - if (!_pendingListObserver) { - __weak POPAnimator *weakSelf = self; - - _pendingListObserver = CFRunLoopObserverCreateWithHandler(kCFAllocatorDefault, kCFRunLoopBeforeWaiting | kCFRunLoopExit, false, POPAnimationApplyRunLoopOrder, ^(CFRunLoopObserverRef observer, CFRunLoopActivity activity) { - [weakSelf _processPendingList]; - }); - - if (_pendingListObserver) { - CFRunLoopAddObserver(CFRunLoopGetMain(), _pendingListObserver, kCFRunLoopCommonModes); - } - } - - // unlock - OSSpinLockUnlock(&_lock); -} - -- (void)_renderTime:(CFTimeInterval)time items:(std::list)items -{ - // begin transaction with actions disabled - [CATransaction begin]; - [CATransaction setDisableActions:YES]; - - // notify delegate - __strong __typeof__(_delegate) delegate = _delegate; - [delegate animatorWillAnimate:self]; - - // lock - OSSpinLockLock(&_lock); - - // count active animations - const NSUInteger count = items.size(); - if (0 == count) { - // unlock - OSSpinLockUnlock(&_lock); - } else { - // copy list into vector - std::vector vector{ items.begin(), items.end() }; - - // unlock - OSSpinLockUnlock(&_lock); - - for (auto item : vector) { - [self _renderTime:time item:item]; - } - } - - // notify observers - for (id observer in self.observers) { - [observer animatorDidAnimate:(id)self]; - } - - // lock - OSSpinLockLock(&_lock); - - // update display link - updateDisplayLink(self); - - // unlock - OSSpinLockUnlock(&_lock); - - // notify delegate and commit - [delegate animatorDidAnimate:self]; - [CATransaction commit]; -} - -- (void)_renderTime:(CFTimeInterval)time item:(POPAnimatorItemRef)item -{ - id obj = item->object; - POPAnimation *anim = item->animation; - POPAnimationState *state = POPAnimationGetState(anim); - - if (nil == obj) { - // object exists not; stop animating - NSAssert(item->unretainedObject, @"object should exist"); - stopAndCleanup(self, item, true, false); - } else { - - // start if needed - state->startIfNeeded(obj, time, _slowMotionAccumulator); - - // only run active, not paused animations - if (state->active && !state->paused) { - // object exists; animate - applyAnimationTime(obj, state, time); - - FBLogAnimDebug(@"time:%f running:%@", time, item->animation); - if (state->isDone()) { - // set end value - applyAnimationToValue(obj, state); - - state->repeatCount--; - if (state->repeatForever || state->repeatCount > 0) { - if ([anim isKindOfClass:[POPPropertyAnimation class]]) { - POPPropertyAnimation *propAnim = (POPPropertyAnimation *)anim; - id oldFromValue = propAnim.fromValue; - propAnim.fromValue = propAnim.toValue; - - if (state->autoreverses) { - if (state->tracing) { - [state->tracer autoreversed]; - } - - if (state->type == kPOPAnimationDecay) { - POPDecayAnimation *decayAnimation = (POPDecayAnimation *)propAnim; - decayAnimation.velocity = [decayAnimation reversedVelocity]; - } else { - propAnim.toValue = oldFromValue; - } - } else { - if (state->type == kPOPAnimationDecay) { - POPDecayAnimation *decayAnimation = (POPDecayAnimation *)propAnim; - id originalVelocity = decayAnimation.originalVelocity; - decayAnimation.velocity = originalVelocity; - } else { - propAnim.fromValue = oldFromValue; - } - } - } - - state->stop(NO, NO); - state->reset(true); - - state->startIfNeeded(obj, time, _slowMotionAccumulator); - } else { - stopAndCleanup(self, item, state->removedOnCompletion, YES); - } - } - } - } -} - -#pragma mark - API - -- (NSArray *)observers -{ - // lock - OSSpinLockLock(&_lock); - - // get observers - NSArray *observers = 0 != _observers.count ? [_observers copy] : nil; - - // unlock - OSSpinLockUnlock(&_lock); - return observers; -} - -- (void)addAnimation:(POPAnimation *)anim forObject:(id)obj key:(NSString *)key -{ - if (!anim || !obj) { - return; - } - - // support arbitrarily many nil keys - if (!key) { - key = [[NSUUID UUID] UUIDString]; - } - - // lock - OSSpinLockLock(&_lock); - - // get key, animation dict associated with object - NSMutableDictionary *keyAnimationDict = (__bridge id)CFDictionaryGetValue(_dict, (__bridge void *)obj); - - // update associated animation state - if (nil == keyAnimationDict) { - keyAnimationDict = [NSMutableDictionary dictionary]; - CFDictionarySetValue(_dict, (__bridge void *)obj, (__bridge void *)keyAnimationDict); - } else { - // if the animation instance already exists, avoid cancelling only to restart - POPAnimation *existingAnim = keyAnimationDict[key]; - if (existingAnim) { - // unlock - OSSpinLockUnlock(&_lock); - - if (existingAnim == anim) { - return; - } - [self removeAnimationForObject:obj key:key cleanupDict:NO]; - - // lock - OSSpinLockLock(&_lock); - } - } - keyAnimationDict[key] = anim; - - // create entry after potential removal - POPAnimatorItemRef item(new POPAnimatorItem(obj, key, anim)); - - // add to list and pending list - _list.push_back(item); - _pendingList.push_back(item); - - // support animation re-use, reset all animation state - POPAnimationGetState(anim)->reset(true); - - // update display link - updateDisplayLink(self); - - // unlock - OSSpinLockUnlock(&_lock); - - // schedule runloop processing of pending animations - [self _scheduleProcessPendingList]; -} - -- (void)removeAllAnimationsForObject:(id)obj -{ - // lock - OSSpinLockLock(&_lock); - - NSArray *animations = [(__bridge id)CFDictionaryGetValue(_dict, (__bridge void *)obj) allValues]; - CFDictionaryRemoveValue(_dict, (__bridge void *)obj); - - // unlock - OSSpinLockUnlock(&_lock); - - if (0 == animations.count) { - return; - } - - NSHashTable *animationSet = [[NSHashTable alloc] initWithOptions:NSHashTableObjectPointerPersonality capacity:animations.count]; - for (id animation in animations) { - [animationSet addObject:animation]; - } - - // lock - OSSpinLockLock(&_lock); - - POPAnimatorItemRef item; - for (auto iter = _list.begin(); iter != _list.end();) { - item = *iter; - if(![animationSet containsObject:item->animation]) { - iter++; - } else { - iter = _list.erase(iter); - } - } - - // unlock - OSSpinLockUnlock(&_lock); - - for (POPAnimation *anim in animations) { - POPAnimationState *state = POPAnimationGetState(anim); - state->stop(true, !state->active); - } -} - -- (void)removeAnimationForObject:(id)obj key:(NSString *)key cleanupDict:(BOOL)cleanupDict -{ - POPAnimation *anim = deleteDictEntry(self, obj, key, cleanupDict); - if (nil == anim) { - return; - } - - // lock - OSSpinLockLock(&_lock); - - // remove from list - POPAnimatorItemRef item; - for (auto iter = _list.begin(); iter != _list.end();) { - item = *iter; - if(anim == item->animation) { - _list.erase(iter); - break; - } else { - iter++; - } - } - - // remove from pending list - for (auto iter = _pendingList.begin(); iter != _pendingList.end();) { - item = *iter; - if(anim == item->animation) { - _pendingList.erase(iter); - break; - } else { - iter++; - } - } - - // unlock - OSSpinLockUnlock(&_lock); - - // stop animation and callout - POPAnimationState *state = POPAnimationGetState(anim); - state->stop(true, (!state->active && !state->paused)); -} - -- (void)removeAnimationForObject:(id)obj key:(NSString *)key -{ - [self removeAnimationForObject:obj key:key cleanupDict:YES]; -} - -- (NSArray *)animationKeysForObject:(id)obj -{ - // lock - OSSpinLockLock(&_lock); - - // get keys - NSArray *keys = [(__bridge id)CFDictionaryGetValue(_dict, (__bridge void *)obj) allKeys]; - - // unlock - OSSpinLockUnlock(&_lock); - return keys; -} - -- (id)animationForObject:(id)obj key:(NSString *)key -{ - // lock - OSSpinLockLock(&_lock); - - // lookup animation - NSDictionary *keyAnimationsDict = (__bridge id)CFDictionaryGetValue(_dict, (__bridge void *)obj); - POPAnimation *animation = keyAnimationsDict[key]; - - // unlock - OSSpinLockUnlock(&_lock); - return animation; -} - -- (CFTimeInterval)_currentRenderTime -{ - CFTimeInterval time = CACurrentMediaTime(); - -#if TARGET_IPHONE_SIMULATOR - // support slow-motion animations - time += _slowMotionAccumulator; - float f = POPAnimationDragCoefficient(); - - if (f > 1.0) { - if (!_slowMotionStartTime) { - _slowMotionStartTime = time; - } else { - time = (time - _slowMotionStartTime) / f + _slowMotionStartTime; - _slowMotionLastTime = time; - } - } else if (_slowMotionStartTime) { - CFTimeInterval dt = (_slowMotionLastTime - time); - time += dt; - _slowMotionAccumulator += dt; - _slowMotionStartTime = 0; - } -#endif - - return time; -} - -- (void)render -{ - CFTimeInterval time = [self _currentRenderTime]; - [self renderTime:time]; -} - -- (void)renderTime:(CFTimeInterval)time -{ - [self _renderTime:time items:_list]; -} - -- (void)addObserver:(id)observer -{ - NSAssert(nil != observer, @"attempting to add nil %@ observer", self); - if (nil == observer) { - return; - } - - // lock - OSSpinLockLock(&_lock); - - if (!_observers) { - // use ordered collection for deterministic callout - _observers = [[NSMutableArray alloc] initWithCapacity:1]; - } - - [_observers addObject:observer]; - updateDisplayLink(self); - - // unlock - OSSpinLockUnlock(&_lock); -} - -- (void)removeObserver:(id)observer -{ - NSAssert(nil != observer, @"attempting to remove nil %@ observer", self); - if (nil == observer) { - return; - } - - // lock - OSSpinLockLock(&_lock); - - [_observers removeObject:observer]; - updateDisplayLink(self); - - // unlock - OSSpinLockUnlock(&_lock); -} - -@end diff --git a/Example/Pods/pop/pop/POPAnimatorPrivate.h b/Example/Pods/pop/pop/POPAnimatorPrivate.h deleted file mode 100644 index 5fba912..0000000 --- a/Example/Pods/pop/pop/POPAnimatorPrivate.h +++ /dev/null @@ -1,68 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import - -@class POPAnimation; - -@protocol POPAnimatorObserving -@required - -/** - @abstract Called on each observer after animator has advanced. Core Animation actions are disabled by default. - */ -- (void)animatorDidAnimate:(POPAnimator *)animator; - -@end - -@interface POPAnimator () - -#if !TARGET_OS_IPHONE -/** - Determines whether or not to use a high priority background thread for animation updates. Using a background thread can result in faster, more responsive updates, but may be less compatible. Defaults to YES. - */ -+ (BOOL)disableBackgroundThread; -+ (void)setDisableBackgroundThread:(BOOL)flag; -#endif - -/** - Used for externally driven animator instances. - */ -@property (assign, nonatomic) BOOL disableDisplayLink; - -/** - Time used when starting animations. Defaults to 0 meaning current media time is used. Exposed for unit testing. - */ -@property (assign, nonatomic) CFTimeInterval beginTime; - -/** - Exposed for unit testing. - */ -- (void)renderTime:(CFTimeInterval)time; - -/** - Funnel methods for category additions. - */ -- (void)addAnimation:(POPAnimation *)anim forObject:(id)obj key:(NSString *)key; -- (void)removeAllAnimationsForObject:(id)obj; -- (void)removeAnimationForObject:(id)obj key:(NSString *)key; -- (NSArray *)animationKeysForObject:(id)obj; -- (POPAnimation *)animationForObject:(id)obj key:(NSString *)key; - -/** - @abstract Add an animator observer. Observer will be notified of each subsequent animator advance until removal. - */ -- (void)addObserver:(id)observer; - -/** - @abstract Remove an animator observer. - */ -- (void)removeObserver:(id)observer; - -@end diff --git a/Example/Pods/pop/pop/POPBasicAnimation.h b/Example/Pods/pop/pop/POPBasicAnimation.h deleted file mode 100644 index ce2e23a..0000000 --- a/Example/Pods/pop/pop/POPBasicAnimation.h +++ /dev/null @@ -1,71 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import - -/** - @abstract A concrete basic animation class. - @discussion Animation is achieved through interpolation. - */ -@interface POPBasicAnimation : POPPropertyAnimation - -/** - @abstract The designated initializer. - @returns An instance of a basic animation. - */ -+ (instancetype)animation; - -/** - @abstract Convenience initializer that returns an animation with animatable property of name. - @param name The name of the animatable property. - @returns An instance of a basic animation configured with specified animatable property. - */ -+ (instancetype)animationWithPropertyNamed:(NSString *)name; - -/** - @abstract Convenience constructor. - @returns Returns a basic animation with kCAMediaTimingFunctionDefault timing function. - */ -+ (instancetype)defaultAnimation; - -/** - @abstract Convenience constructor. - @returns Returns a basic animation with kCAMediaTimingFunctionLinear timing function. - */ -+ (instancetype)linearAnimation; - -/** - @abstract Convenience constructor. - @returns Returns a basic animation with kCAMediaTimingFunctionEaseIn timing function. - */ -+ (instancetype)easeInAnimation; - -/** - @abstract Convenience constructor. - @returns Returns a basic animation with kCAMediaTimingFunctionEaseOut timing function. - */ -+ (instancetype)easeOutAnimation; - -/** - @abstract Convenience constructor. - @returns Returns a basic animation with kCAMediaTimingFunctionEaseInEaseOut timing function. - */ -+ (instancetype)easeInEaseOutAnimation; - -/** - @abstract The duration in seconds. Defaults to 0.4. - */ -@property (assign, nonatomic) CFTimeInterval duration; - -/** - @abstract A timing function defining the pacing of the animation. Defaults to nil indicating pacing according to kCAMediaTimingFunctionDefault. - */ -@property (strong, nonatomic) CAMediaTimingFunction *timingFunction; - -@end diff --git a/Example/Pods/pop/pop/POPBasicAnimation.mm b/Example/Pods/pop/pop/POPBasicAnimation.mm deleted file mode 100644 index 2843c99..0000000 --- a/Example/Pods/pop/pop/POPBasicAnimation.mm +++ /dev/null @@ -1,106 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import "POPBasicAnimationInternal.h" - -@implementation POPBasicAnimation - -#undef __state -#define __state ((POPBasicAnimationState *)_state) - -#pragma mark - Lifecycle - -+ (instancetype)animation -{ - return [[self alloc] init]; -} - -+ (instancetype)animationWithPropertyNamed:(NSString *)aName -{ - POPBasicAnimation *anim = [self animation]; - anim.property = [POPAnimatableProperty propertyWithName:aName]; - return anim; -} - -- (void)_initState -{ - _state = new POPBasicAnimationState(self); -} - -+ (instancetype)linearAnimation -{ - POPBasicAnimation *anim = [self animation]; - anim.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionLinear]; - return anim; -} - -+ (instancetype)easeInAnimation -{ - POPBasicAnimation *anim = [self animation]; - anim.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseIn]; - return anim; -} - -+ (instancetype)easeOutAnimation -{ - POPBasicAnimation *anim = [self animation]; - anim.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseOut]; - return anim; -} - -+ (instancetype)easeInEaseOutAnimation -{ - POPBasicAnimation *anim = [self animation]; - anim.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - return anim; -} - -+ (instancetype)defaultAnimation -{ - POPBasicAnimation *anim = [self animation]; - anim.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionDefault]; - return anim; -} - -- (id)init -{ - return [self _init]; -} - -#pragma mark - Properties - -DEFINE_RW_PROPERTY(POPBasicAnimationState, duration, setDuration:, CFTimeInterval); -DEFINE_RW_PROPERTY_OBJ(POPBasicAnimationState, timingFunction, setTimingFunction:, CAMediaTimingFunction*, __state->updatedTimingFunction();); - -#pragma mark - Utility - -- (void)_appendDescription:(NSMutableString *)s debug:(BOOL)debug -{ - [super _appendDescription:s debug:debug]; - if (__state->duration) - [s appendFormat:@"; duration = %f", __state->duration]; -} - -@end - -@implementation POPBasicAnimation (NSCopying) - -- (instancetype)copyWithZone:(NSZone *)zone { - - POPBasicAnimation *copy = [super copyWithZone:zone]; - - if (copy) { - copy.duration = self.duration; - copy.timingFunction = self.timingFunction; // not a 'copy', but timing functions are publicly immutable. - } - - return copy; -} - -@end \ No newline at end of file diff --git a/Example/Pods/pop/pop/POPBasicAnimationInternal.h b/Example/Pods/pop/pop/POPBasicAnimationInternal.h deleted file mode 100644 index 1027670..0000000 --- a/Example/Pods/pop/pop/POPBasicAnimationInternal.h +++ /dev/null @@ -1,97 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import "POPBasicAnimation.h" - -#import "POPPropertyAnimationInternal.h" - -// default animation duration -static CGFloat const kPOPAnimationDurationDefault = 0.4; - -// progress threshold for computing done -static CGFloat const kPOPProgressThreshold = 1e-6; - -static void interpolate(POPValueType valueType, NSUInteger count, const CGFloat *fromVec, const CGFloat *toVec, CGFloat *outVec, CGFloat p) -{ - switch (valueType) { - case kPOPValueInteger: - case kPOPValueFloat: - case kPOPValuePoint: - case kPOPValueSize: - case kPOPValueRect: - case kPOPValueEdgeInsets: - case kPOPValueColor: - POPInterpolateVector(count, outVec, fromVec, toVec, p); - break; - default: - NSCAssert(false, @"unhandled type %d", valueType); - break; - } -} - -struct _POPBasicAnimationState : _POPPropertyAnimationState -{ - CAMediaTimingFunction *timingFunction; - double timingControlPoints[4]; - CFTimeInterval duration; - CFTimeInterval timeProgress; - - _POPBasicAnimationState(id __unsafe_unretained anim) : _POPPropertyAnimationState(anim), - timingFunction(nil), - timingControlPoints{0.}, - duration(kPOPAnimationDurationDefault), - timeProgress(0.) - { - type = kPOPAnimationBasic; - } - - bool isDone() { - if (_POPPropertyAnimationState::isDone()) { - return true; - } - return timeProgress + kPOPProgressThreshold >= 1.; - } - - void updatedTimingFunction() - { - float vec[4] = {0.}; - [timingFunction getControlPointAtIndex:1 values:&vec[0]]; - [timingFunction getControlPointAtIndex:2 values:&vec[2]]; - for (NSUInteger idx = 0; idx < POP_ARRAY_COUNT(vec); idx++) { - timingControlPoints[idx] = vec[idx]; - } - } - - bool advance(CFTimeInterval time, CFTimeInterval dt, id obj) { - // default timing function - if (!timingFunction) { - ((POPBasicAnimation *)self).timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionDefault]; - } - - // solve for normalized time, aka progresss [0, 1] - CGFloat p = 1.0f; - if (duration > 0.0f) { - // cap local time to duration - CFTimeInterval t = MIN(time - startTime, duration) / duration; - p = POPTimingFunctionSolve(timingControlPoints, t, SOLVE_EPS(duration)); - timeProgress = t; - } else { - timeProgress = 1.; - } - - // interpolate and advance - interpolate(valueType, valueCount, fromVec->data(), toVec->data(), currentVec->data(), p); - progress = p; - clampCurrentValue(); - - return true; - } -}; - -typedef struct _POPBasicAnimationState POPBasicAnimationState; diff --git a/Example/Pods/pop/pop/POPCGUtils.h b/Example/Pods/pop/pop/POPCGUtils.h deleted file mode 100644 index c843947..0000000 --- a/Example/Pods/pop/pop/POPCGUtils.h +++ /dev/null @@ -1,152 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import - -#if TARGET_OS_IPHONE -#import -#else -#import -#endif - -#import "POPDefines.h" - -#if SCENEKIT_SDK_AVAILABLE -#import -#endif - -POP_EXTERN_C_BEGIN - -NS_INLINE CGPoint values_to_point(const CGFloat values[]) -{ - return CGPointMake(values[0], values[1]); -} - -NS_INLINE CGSize values_to_size(const CGFloat values[]) -{ - return CGSizeMake(values[0], values[1]); -} - -NS_INLINE CGRect values_to_rect(const CGFloat values[]) -{ - return CGRectMake(values[0], values[1], values[2], values[3]); -} - -#if SCENEKIT_SDK_AVAILABLE -NS_INLINE SCNVector3 values_to_vec3(const CGFloat values[]) -{ - return SCNVector3Make(values[0], values[1], values[2]); -} - -NS_INLINE SCNVector4 values_to_vec4(const CGFloat values[]) -{ - return SCNVector4Make(values[0], values[1], values[2], values[3]); -} -#endif - -#if TARGET_OS_IPHONE - -NS_INLINE UIEdgeInsets values_to_edge_insets(const CGFloat values[]) -{ - return UIEdgeInsetsMake(values[0], values[1], values[2], values[3]); -} - -#endif - -NS_INLINE void values_from_point(CGFloat values[], CGPoint p) -{ - values[0] = p.x; - values[1] = p.y; -} - -NS_INLINE void values_from_size(CGFloat values[], CGSize s) -{ - values[0] = s.width; - values[1] = s.height; -} - -NS_INLINE void values_from_rect(CGFloat values[], CGRect r) -{ - values[0] = r.origin.x; - values[1] = r.origin.y; - values[2] = r.size.width; - values[3] = r.size.height; -} - -#if SCENEKIT_SDK_AVAILABLE -NS_INLINE void values_from_vec3(CGFloat values[], SCNVector3 v) -{ - values[0] = v.x; - values[1] = v.y; - values[2] = v.z; -} - -NS_INLINE void values_from_vec4(CGFloat values[], SCNVector4 v) -{ - values[0] = v.x; - values[1] = v.y; - values[2] = v.z; - values[3] = v.w; -} -#endif - -#if TARGET_OS_IPHONE - -NS_INLINE void values_from_edge_insets(CGFloat values[], UIEdgeInsets i) -{ - values[0] = i.top; - values[1] = i.left; - values[2] = i.bottom; - values[3] = i.right; -} - -#endif - -/** - Takes a CGColorRef and converts it into RGBA components, if necessary. - */ -extern void POPCGColorGetRGBAComponents(CGColorRef color, CGFloat components[]); - -/** - Takes RGBA components and returns a CGColorRef. - */ -extern CGColorRef POPCGColorRGBACreate(const CGFloat components[]) CF_RETURNS_RETAINED; - -/** - Takes a color reference and returns a CGColor. - */ -extern CGColorRef POPCGColorWithColor(id color) CF_RETURNS_NOT_RETAINED; - -#if TARGET_OS_IPHONE - -/** - Takes a UIColor and converts it into RGBA components, if necessary. - */ -extern void POPUIColorGetRGBAComponents(UIColor *color, CGFloat components[]); - -/** - Takes RGBA components and returns a UIColor. - */ -extern UIColor *POPUIColorRGBACreate(const CGFloat components[]) NS_RETURNS_RETAINED; - -#else - -/** - Takes a NSColor and converts it into RGBA components, if necessary. - */ -extern void POPNSColorGetRGBAComponents(NSColor *color, CGFloat components[]); - -/** - Takes RGBA components and returns a NSColor. - */ -extern NSColor *POPNSColorRGBACreate(const CGFloat components[]) NS_RETURNS_RETAINED; - -#endif - -POP_EXTERN_C_END diff --git a/Example/Pods/pop/pop/POPCGUtils.mm b/Example/Pods/pop/pop/POPCGUtils.mm deleted file mode 100644 index 72a2d36..0000000 --- a/Example/Pods/pop/pop/POPCGUtils.mm +++ /dev/null @@ -1,150 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import "POPCGUtils.h" - -#import - -void POPCGColorGetRGBAComponents(CGColorRef color, CGFloat components[]) -{ - if (color) { - const CGFloat *colors = CGColorGetComponents(color); - size_t count = CGColorGetNumberOfComponents(color); - - if (4 == count) { - // RGB colorspace - components[0] = colors[0]; - components[1] = colors[1]; - components[2] = colors[2]; - components[3] = colors[3]; - } else if (2 == count) { - // Grey colorspace - components[0] = components[1] = components[2] = colors[0]; - components[3] = colors[1]; - } else { - // Use CI to convert - CIColor *ciColor = [CIColor colorWithCGColor:color]; - components[0] = ciColor.red; - components[1] = ciColor.green; - components[2] = ciColor.blue; - components[3] = ciColor.alpha; - } - } else { - memset(components, 0, 4 * sizeof(components[0])); - } -} - -CGColorRef POPCGColorRGBACreate(const CGFloat components[]) -{ -#if TARGET_OS_IPHONE - CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB(); - CGColorRef color = CGColorCreate(space, components); - CGColorSpaceRelease(space); - return color; -#else - return CGColorCreateGenericRGB(components[0], components[1], components[2], components[3]); -#endif -} - -CGColorRef POPCGColorWithColor(id color) -{ - if (CFGetTypeID((__bridge CFTypeRef)color) == CGColorGetTypeID()) { - return ((__bridge CGColorRef)color); - } -#if TARGET_OS_IPHONE - else if ([color isKindOfClass:[UIColor class]]) { - return [color CGColor]; - } -#else - else if ([color isKindOfClass:[NSColor class]]) { - // -[NSColor CGColor] is only supported since OSX 10.8+ - if ([color respondsToSelector:@selector(CGColor)]) { - return [color CGColor]; - } - - /* - * Otherwise create a CGColorRef manually. - * - * The original accessor is (or would be) declared as: - * @property(readonly) CGColorRef CGColor; - * - (CGColorRef)CGColor NS_RETURNS_INNER_POINTER CF_RETURNS_NOT_RETAINED; - * - * (Please note that OSX' accessor is atomic, while iOS' isn't.) - * - * The access to the NSColor object must thus be synchronized - * and the CGColorRef be stored as an associated object, - * to return a reference which doesn't need to be released manually. - */ - @synchronized(color) { - static const void* key = &key; - - CGColorRef colorRef = (__bridge CGColorRef)objc_getAssociatedObject(color, key); - - if (!colorRef) { - size_t numberOfComponents = [color numberOfComponents]; - CGFloat components[numberOfComponents]; - CGColorSpaceRef colorSpace = [[color colorSpace] CGColorSpace]; - - [color getComponents:components]; - - colorRef = CGColorCreate(colorSpace, components); - - objc_setAssociatedObject(color, key, (__bridge id)colorRef, OBJC_ASSOCIATION_RETAIN_NONATOMIC); - CGColorRelease(colorRef); - } - - return colorRef; - } - } -#endif - return nil; -} - -#if TARGET_OS_IPHONE - -void POPUIColorGetRGBAComponents(UIColor *color, CGFloat components[]) -{ - return POPCGColorGetRGBAComponents(POPCGColorWithColor(color), components); -} - -UIColor *POPUIColorRGBACreate(const CGFloat components[]) -{ - CGColorRef colorRef = POPCGColorRGBACreate(components); - UIColor *color = [[UIColor alloc] initWithCGColor:colorRef]; - CGColorRelease(colorRef); - return color; -} - -#else - -void POPNSColorGetRGBAComponents(NSColor *color, CGFloat components[]) -{ - return POPCGColorGetRGBAComponents(POPCGColorWithColor(color), components); -} - -NSColor *POPNSColorRGBACreate(const CGFloat components[]) -{ - CGColorRef colorRef = POPCGColorRGBACreate(components); - NSColor *color = nil; - - if (colorRef) { - if ([NSColor respondsToSelector:@selector(colorWithCGColor:)]) { - color = [NSColor colorWithCGColor:colorRef]; - } else { - color = [NSColor colorWithCIColor:[CIColor colorWithCGColor:colorRef]]; - } - - CGColorRelease(colorRef); - } - - return color; -} - -#endif - diff --git a/Example/Pods/pop/pop/POPCustomAnimation.h b/Example/Pods/pop/pop/POPCustomAnimation.h deleted file mode 100644 index 501a755..0000000 --- a/Example/Pods/pop/pop/POPCustomAnimation.h +++ /dev/null @@ -1,46 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import - -@class POPCustomAnimation; - -/** - @abstract POPCustomAnimationBlock is the callback block of a custom animation. - @discussion This block will be executed for each animation frame and should update the property or properties being animated based on current timing. - @param target The object being animated. Reference the passed in target to help avoid retain loops. - @param animation The custom animation instance. Use to determine the current and elapsed time since last callback. Reference the passed in animation to help avoid retain loops. - @return Flag indicating whether the animation should continue animating. Return NO to indicate animation is done. - */ -typedef BOOL (^POPCustomAnimationBlock)(id target, POPCustomAnimation *animation); - -/** - @abstract POPCustomAnimation is a concrete animation subclass for custom animations. - */ -@interface POPCustomAnimation : POPAnimation - -/** -@abstract Creates and returns an initialized custom animation instance. -@discussion This is the designated initializer. -@param block The custom animation callback block. See {@ref POPCustomAnimationBlock}. -@return The initialized custom animation instance. -*/ -+ (instancetype)animationWithBlock:(POPCustomAnimationBlock)block; - -/** - @abstract The current animation time at time of callback. - */ -@property (readonly, nonatomic) CFTimeInterval currentTime; - -/** - @abstract The elapsed animation time since last callback. - */ -@property (readonly, nonatomic) CFTimeInterval elapsedTime; - -@end diff --git a/Example/Pods/pop/pop/POPCustomAnimation.mm b/Example/Pods/pop/pop/POPCustomAnimation.mm deleted file mode 100644 index 8cb7913..0000000 --- a/Example/Pods/pop/pop/POPCustomAnimation.mm +++ /dev/null @@ -1,75 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import "POPAnimationInternal.h" - -#import "POPCustomAnimation.h" - -@interface POPCustomAnimation () -@property (nonatomic, copy) POPCustomAnimationBlock animate; -@end - -@implementation POPCustomAnimation -@synthesize currentTime = _currentTime; -@synthesize elapsedTime = _elapsedTime; -@synthesize animate = _animate; - -+ (instancetype)animationWithBlock:(BOOL(^)(id target, POPCustomAnimation *))block -{ - POPCustomAnimation *b = [[self alloc] _init]; - b.animate = block; - return b; -} - -- (id)_init -{ - self = [super _init]; - if (nil != self) { - _state->type = kPOPAnimationCustom; - } - return self; -} - -- (CFTimeInterval)beginTime -{ - POPAnimationState *s = POPAnimationGetState(self); - return s->startTime > 0 ? s->startTime : s->beginTime; -} - -- (BOOL)_advance:(id)object currentTime:(CFTimeInterval)currentTime elapsedTime:(CFTimeInterval)elapsedTime -{ - _currentTime = currentTime; - _elapsedTime = elapsedTime; - return _animate(object, self); -} - -- (void)_appendDescription:(NSMutableString *)s debug:(BOOL)debug -{ - [s appendFormat:@"; elapsedTime = %f; currentTime = %f;", _elapsedTime, _currentTime]; -} - -@end - -/** - * Note that only the animate block is copied, but not the current/elapsed times - */ -@implementation POPCustomAnimation (NSCopying) - -- (instancetype)copyWithZone:(NSZone *)zone { - - POPCustomAnimation *copy = [super copyWithZone:zone]; - - if (copy) { - copy.animate = self.animate; - } - - return copy; -} - -@end \ No newline at end of file diff --git a/Example/Pods/pop/pop/POPDecayAnimation.h b/Example/Pods/pop/pop/POPDecayAnimation.h deleted file mode 100644 index 92c6b60..0000000 --- a/Example/Pods/pop/pop/POPDecayAnimation.h +++ /dev/null @@ -1,66 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import - -/** - @abstract A concrete decay animation class. - @discussion Animation is achieved through gradual decay of animation value. - */ -@interface POPDecayAnimation : POPPropertyAnimation - -/** - @abstract The designated initializer. - @returns An instance of a decay animation. - */ -+ (instancetype)animation; - -/** - @abstract Convenience initializer that returns an animation with animatable property of name. - @param name The name of the animatable property. - @returns An instance of a decay animation configured with specified animatable property. - */ -+ (instancetype)animationWithPropertyNamed:(NSString *)name; - -/** - @abstract The current velocity value. - @discussion Set before animation start to account for initial velocity. Expressed in change of value units per second. The only POPValueTypes supported for velocity are: kPOPValuePoint, kPOPValueInteger, kPOPValueFloat, kPOPValueRect, and kPOPValueSize. - */ -@property (copy, nonatomic) id velocity; - -/** - @abstract The original velocity value. - @discussion Since the velocity property is modified as the animation progresses, this property stores the original, passed in velocity to support autoreverse and repeatCount. - */ -@property (copy, nonatomic, readonly) id originalVelocity; - -/** - @abstract The deceleration factor. - @discussion Values specifies should be in the range [0, 1]. Lower values results in faster deceleration. Defaults to 0.998. - */ -@property (assign, nonatomic) CGFloat deceleration; - -/** - @abstract The expected duration. - @discussion Derived based on input velocity and deceleration values. - */ -@property (readonly, assign, nonatomic) CFTimeInterval duration; - -/** - The to value is derived based on input velocity and deceleration. - */ -- (void)setToValue:(id)toValue NS_UNAVAILABLE; - -/** - @abstract The reversed velocity. - @discussion The reversed velocity based on the originalVelocity when the animation was set up. - */ -- (id)reversedVelocity; - -@end diff --git a/Example/Pods/pop/pop/POPDecayAnimation.mm b/Example/Pods/pop/pop/POPDecayAnimation.mm deleted file mode 100644 index 4698fd0..0000000 --- a/Example/Pods/pop/pop/POPDecayAnimation.mm +++ /dev/null @@ -1,203 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import "POPDecayAnimationInternal.h" - -#if TARGET_OS_IPHONE -#import -#endif - -const POPValueType supportedVelocityTypes[6] = { kPOPValuePoint, kPOPValueInteger, kPOPValueFloat, kPOPValueRect, kPOPValueSize, kPOPValueEdgeInsets }; - -@implementation POPDecayAnimation - -#pragma mark - Lifecycle - -#undef __state -#define __state ((POPDecayAnimationState *)_state) - -+ (instancetype)animation -{ - return [[self alloc] init]; -} - -+ (instancetype)animationWithPropertyNamed:(NSString *)aName -{ - POPDecayAnimation *anim = [self animation]; - anim.property = [POPAnimatableProperty propertyWithName:aName]; - return anim; -} - -- (id)init -{ - return [self _init]; -} - -- (void)_initState -{ - _state = new POPDecayAnimationState(self); -} - -#pragma mark - Properties - -DEFINE_RW_PROPERTY(POPDecayAnimationState, deceleration, setDeceleration:, CGFloat, __state->toVec = NULL;); - -@dynamic velocity; - -- (id)toValue -{ - [self _ensureComputedProperties]; - return POPBox(__state->toVec, __state->valueType); -} - -- (CFTimeInterval)duration -{ - [self _ensureComputedProperties]; - return __state->duration; -} - -- (void)setFromValue:(id)fromValue -{ - super.fromValue = fromValue; - [self _invalidateComputedProperties]; -} - -- (void)setToValue:(id)aValue -{ - // no-op - NSLog(@"ignoring to value on decay animation %@", self); -} - -- (id)reversedVelocity -{ - id reversedVelocity = nil; - - POPValueType velocityType = POPSelectValueType(self.originalVelocity, supportedVelocityTypes, POP_ARRAY_COUNT(supportedVelocityTypes)); - if (velocityType == kPOPValueFloat) { -#if CGFLOAT_IS_DOUBLE - CGFloat originalVelocityFloat = [(NSNumber *)self.originalVelocity doubleValue]; -#else - CGFloat originalVelocityFloat = [(NSNumber *)self.originalVelocity floatValue]; -#endif - NSNumber *negativeOriginalVelocityNumber = @(-originalVelocityFloat); - reversedVelocity = negativeOriginalVelocityNumber; - } else if (velocityType == kPOPValueInteger) { - NSInteger originalVelocityInteger = [(NSNumber *)self.originalVelocity integerValue]; - NSNumber *negativeOriginalVelocityNumber = @(-originalVelocityInteger); - reversedVelocity = negativeOriginalVelocityNumber; - } else if (velocityType == kPOPValuePoint) { - CGPoint originalVelocityPoint = [self.originalVelocity CGPointValue]; - CGPoint negativeOriginalVelocityPoint = CGPointMake(-originalVelocityPoint.x, -originalVelocityPoint.y); - reversedVelocity = [NSValue valueWithCGPoint:negativeOriginalVelocityPoint]; - } else if (velocityType == kPOPValueRect) { - CGRect originalVelocityRect = [self.originalVelocity CGRectValue]; - CGRect negativeOriginalVelocityRect = CGRectMake(-originalVelocityRect.origin.x, -originalVelocityRect.origin.y, -originalVelocityRect.size.width, -originalVelocityRect.size.height); - reversedVelocity = [NSValue valueWithCGRect:negativeOriginalVelocityRect]; - } else if (velocityType == kPOPValueSize) { - CGSize originalVelocitySize = [self.originalVelocity CGSizeValue]; - CGSize negativeOriginalVelocitySize = CGSizeMake(-originalVelocitySize.width, -originalVelocitySize.height); - reversedVelocity = [NSValue valueWithCGSize:negativeOriginalVelocitySize]; - } else if (velocityType == kPOPValueEdgeInsets) { -#if TARGET_OS_IPHONE - UIEdgeInsets originalVelocityInsets = [self.originalVelocity UIEdgeInsetsValue]; - UIEdgeInsets negativeOriginalVelocityInsets = UIEdgeInsetsMake(-originalVelocityInsets.top, -originalVelocityInsets.left, -originalVelocityInsets.bottom, -originalVelocityInsets.right); - reversedVelocity = [NSValue valueWithUIEdgeInsets:negativeOriginalVelocityInsets]; -#endif - } - - return reversedVelocity; -} - -- (id)originalVelocity -{ - return POPBox(__state->originalVelocityVec, __state->valueType); -} - -- (id)velocity -{ - return POPBox(__state->velocityVec, __state->valueType); -} - -- (void)setVelocity:(id)aValue -{ - POPValueType valueType = POPSelectValueType(aValue, supportedVelocityTypes, POP_ARRAY_COUNT(supportedVelocityTypes)); - if (valueType != kPOPValueUnknown) { - VectorRef vec = POPUnbox(aValue, __state->valueType, __state->valueCount, YES); - VectorRef origVec = POPUnbox(aValue, __state->valueType, __state->valueCount, YES); - - if (!vec_equal(vec, __state->velocityVec)) { - __state->velocityVec = vec; - __state->originalVelocityVec = origVec; - - if (__state->tracing) { - [__state->tracer updateVelocity:aValue]; - } - - [self _invalidateComputedProperties]; - - // automatically unpause active animations - if (__state->active && __state->paused) { - __state->fromVec = NULL; - __state->setPaused(false); - } - } - } else { - __state->velocityVec = NULL; - NSLog(@"Invalid velocity value for the decayAnimation: %@", aValue); - } -} - -#pragma mark - Utility - -- (void)_ensureComputedProperties -{ - if (NULL == __state->toVec) { - __state->computeDuration(); - __state->computeToValue(); - } -} - -- (void)_invalidateComputedProperties -{ - __state->toVec = NULL; - __state->duration = 0; -} - -- (void)_appendDescription:(NSMutableString *)s debug:(BOOL)debug -{ - [super _appendDescription:s debug:debug]; - - if (0 != self.duration) { - [s appendFormat:@"; duration = %f", self.duration]; - } - - if (__state->deceleration) { - [s appendFormat:@"; deceleration = %f", __state->deceleration]; - } -} - -@end - -@implementation POPDecayAnimation (NSCopying) - -- (instancetype)copyWithZone:(NSZone *)zone { - - POPDecayAnimation *copy = [super copyWithZone:zone]; - - if (copy) { - // Set the velocity to the animation's original velocity, not its current. - copy.velocity = self.originalVelocity; - copy.deceleration = self.deceleration; - - } - - return copy; -} - -@end \ No newline at end of file diff --git a/Example/Pods/pop/pop/POPDecayAnimationInternal.h b/Example/Pods/pop/pop/POPDecayAnimationInternal.h deleted file mode 100644 index c101761..0000000 --- a/Example/Pods/pop/pop/POPDecayAnimationInternal.h +++ /dev/null @@ -1,127 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import "POPDecayAnimation.h" - -#import - -#import "POPPropertyAnimationInternal.h" - -// minimal velocity factor before decay animation is considered complete, in units / s -static CGFloat kPOPAnimationDecayMinimalVelocityFactor = 5.; - -// default decay animation deceleration -static CGFloat kPOPAnimationDecayDecelerationDefault = 0.998; - -static void decay_position(CGFloat *x, CGFloat *v, NSUInteger count, CFTimeInterval dt, CGFloat deceleration) -{ - dt *= 1000; - - // v0 = v / 1000 - // v = v0 * powf(deceleration, dt); - // v = v * 1000; - - // x0 = x; - // x = x0 + v0 * deceleration * (1 - powf(deceleration, dt)) / (1 - deceleration) - float v0[count]; - float kv = powf(deceleration, dt); - float kx = deceleration * (1 - kv) / (1 - deceleration); - - for (NSUInteger idx = 0; idx < count; idx++) { - v0[idx] = v[idx] / 1000.; - v[idx] = v0[idx] * kv * 1000.; - x[idx] = x[idx] + v0[idx] * kx; - } -} - -struct _POPDecayAnimationState : _POPPropertyAnimationState -{ - double deceleration; - CFTimeInterval duration; - - _POPDecayAnimationState(id __unsafe_unretained anim) : - _POPPropertyAnimationState(anim), - deceleration(kPOPAnimationDecayDecelerationDefault), - duration(0) - { - type = kPOPAnimationDecay; - } - - bool isDone() { - if (_POPPropertyAnimationState::isDone()) { - return true; - } - - CGFloat f = dynamicsThreshold * kPOPAnimationDecayMinimalVelocityFactor; - const CGFloat *velocityValues = vec_data(velocityVec); - for (NSUInteger idx = 0; idx < valueCount; idx++) { - if (std::abs((velocityValues[idx])) >= f) - return false; - } - return true; - - } - - void computeDuration() { - - // compute duration till threshold velocity - Vector4r scaledVelocity = vector4(velocityVec) / 1000.; - - double k = dynamicsThreshold * kPOPAnimationDecayMinimalVelocityFactor / 1000.; - double vx = k / scaledVelocity.x; - double vy = k / scaledVelocity.y; - double vz = k / scaledVelocity.z; - double vw = k / scaledVelocity.w; - double d = log(deceleration) * 1000.; - duration = MAX(MAX(MAX(log(fabs(vx)) / d, log(fabs(vy)) / d), log(fabs(vz)) / d), log(fabs(vw)) / d); - - // ensure velocity threshold is exceeded - if (std::isnan(duration) || duration < 0) { - duration = 0; - } - } - - void computeToValue() { - // to value assuming final velocity as a factor of dynamics threshold - // derived from v' = v * d^dt used in decay_position - // to compute the to value with maximal dt, p' = p + (v * d) / (1 - d) - VectorRef fromValue = NULL != currentVec ? currentVec : fromVec; - if (!fromValue) { - return; - } - - // ensure duration is computed - if (0 == duration) { - computeDuration(); - } - - // compute to value - VectorRef toValue(Vector::new_vector(fromValue.get())); - Vector4r velocity = velocityVec->vector4r(); - decay_position(toValue->data(), velocity.data(), valueCount, duration, deceleration); - toVec = toValue; - } - - bool advance(CFTimeInterval time, CFTimeInterval dt, id obj) { - // advance past not yet initialized animations - if (NULL == currentVec) { - return false; - } - - decay_position(currentVec->data(), velocityVec->data(), valueCount, dt, deceleration); - - // clamp to compute end value; avoid possibility of decaying past - clampCurrentValue(kPOPAnimationClampEnd | clampMode); - - return true; - } - -}; - -typedef struct _POPDecayAnimationState POPDecayAnimationState; diff --git a/Example/Pods/pop/pop/POPDefines.h b/Example/Pods/pop/pop/POPDefines.h deleted file mode 100644 index eb28781..0000000 --- a/Example/Pods/pop/pop/POPDefines.h +++ /dev/null @@ -1,37 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#ifndef POP_POPDefines_h -#define POP_POPDefines_h - -#import - -#ifdef __cplusplus -# define POP_EXTERN_C_BEGIN extern "C" { -# define POP_EXTERN_C_END } -#else -# define POP_EXTERN_C_BEGIN -# define POP_EXTERN_C_END -#endif - -#define POP_ARRAY_COUNT(x) sizeof(x) / sizeof(x[0]) - -#if defined (__cplusplus) && defined (__GNUC__) -# define POP_NOTHROW __attribute__ ((nothrow)) -#else -# define POP_NOTHROW -#endif - -#if TARGET_OS_MAC - #define SCENEKIT_SDK_AVAILABLE defined(POP_USE_SCENEKIT) -#elif TARGET_OS_IPHONE - #define SCENEKIT_SDK_AVAILABLE defined(POP_USE_SCENEKIT) -#endif - -#endif diff --git a/Example/Pods/pop/pop/POPGeometry.h b/Example/Pods/pop/pop/POPGeometry.h deleted file mode 100644 index 8ba07e3..0000000 --- a/Example/Pods/pop/pop/POPGeometry.h +++ /dev/null @@ -1,73 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import - -#if TARGET_OS_IPHONE -#import -#endif - -#if !TARGET_OS_IPHONE - -/** NSValue extensions to support animatable types. */ -@interface NSValue (POP) - -/** - @abstract Creates an NSValue given a CGPoint. - */ -+ (NSValue *)valueWithCGPoint:(CGPoint)point; - -/** - @abstract Creates an NSValue given a CGSize. - */ -+ (NSValue *)valueWithCGSize:(CGSize)size; - -/** - @abstract Creates an NSValue given a CGRect. - */ -+ (NSValue *)valueWithCGRect:(CGRect)rect; - -/** - @abstract Creates an NSValue given a CFRange. - */ -+ (NSValue *)valueWithCFRange:(CFRange)range; - -/** - @abstract Creates an NSValue given a CGAffineTransform. - */ -+ (NSValue *)valueWithCGAffineTransform:(CGAffineTransform)transform; - -/** - @abstract Returns the underlying CGPoint value. - */ -- (CGPoint)CGPointValue; - -/** - @abstract Returns the underlying CGSize value. - */ -- (CGSize)CGSizeValue; - -/** - @abstract Returns the underlying CGRect value. - */ -- (CGRect)CGRectValue; - -/** - @abstract Returns the underlying CFRange value. - */ -- (CFRange)CFRangeValue; - -/** - @abstract Returns the underlying CGAffineTransform value. - */ -- (CGAffineTransform)CGAffineTransformValue; - -@end - -#endif diff --git a/Example/Pods/pop/pop/POPGeometry.mm b/Example/Pods/pop/pop/POPGeometry.mm deleted file mode 100644 index 41998b1..0000000 --- a/Example/Pods/pop/pop/POPGeometry.mm +++ /dev/null @@ -1,94 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import "POPGeometry.h" - -#if !TARGET_OS_IPHONE -@implementation NSValue (POP) - -+ (NSValue *)valueWithCGPoint:(CGPoint)point { - return [NSValue valueWithBytes:&point objCType:@encode(CGPoint)]; -} - -+ (NSValue *)valueWithCGSize:(CGSize)size { - return [NSValue valueWithBytes:&size objCType:@encode(CGSize)]; -} - -+ (NSValue *)valueWithCGRect:(CGRect)rect { - return [NSValue valueWithBytes:&rect objCType:@encode(CGRect)]; -} - -+ (NSValue *)valueWithCFRange:(CFRange)range { - return [NSValue valueWithBytes:&range objCType:@encode(CFRange)]; -} - -+ (NSValue *)valueWithCGAffineTransform:(CGAffineTransform)transform -{ - return [NSValue valueWithBytes:&transform objCType:@encode(CGAffineTransform)]; -} - -- (CGPoint)CGPointValue { - CGPoint result; - [self getValue:&result]; - return result; -} - -- (CGSize)CGSizeValue { - CGSize result; - [self getValue:&result]; - return result; -} - -- (CGRect)CGRectValue { - CGRect result; - [self getValue:&result]; - return result; -} - -- (CFRange)CFRangeValue { - CFRange result; - [self getValue:&result]; - return result; -} - -- (CGAffineTransform)CGAffineTransformValue { - CGAffineTransform result; - [self getValue:&result]; - return result; -} -@end - -#endif - -#if TARGET_OS_IPHONE -#import "POPDefines.h" - -#if SCENEKIT_SDK_AVAILABLE -#import - -/** - Dirty hacks because iOS is weird and decided to define both SCNVector3's and SCNVector4's objCType as "t". However @encode(SCNVector3) and @encode(SCNVector4) both return the proper definition ("{SCNVector3=fff}" and "{SCNVector4=ffff}" respectively) - - [[NSValue valueWithSCNVector3:SCNVector3Make(0.0, 0.0, 0.0)] objcType] returns "t", whereas it should return "{SCNVector3=fff}". - - *flips table* - */ -@implementation NSValue (SceneKitFixes) - -+ (NSValue *)valueWithSCNVector3:(SCNVector3)vec3 { - return [NSValue valueWithBytes:&vec3 objCType:@encode(SCNVector3)]; -} - -+ (NSValue *)valueWithSCNVector4:(SCNVector4)vec4 { - return [NSValue valueWithBytes:&vec4 objCType:@encode(SCNVector4)]; -} - -@end -#endif -#endif diff --git a/Example/Pods/pop/pop/POPLayerExtras.h b/Example/Pods/pop/pop/POPLayerExtras.h deleted file mode 100644 index ec4c29a..0000000 --- a/Example/Pods/pop/pop/POPLayerExtras.h +++ /dev/null @@ -1,196 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import - -#import - -POP_EXTERN_C_BEGIN - -#pragma mark - Scale - -/** - @abstract Returns layer scale factor for the x axis. - */ -extern CGFloat POPLayerGetScaleX(CALayer *l); - -/** - @abstract Set layer scale factor for the x axis. - */ -extern void POPLayerSetScaleX(CALayer *l, CGFloat f); - -/** - @abstract Returns layer scale factor for the y axis. - */ -extern CGFloat POPLayerGetScaleY(CALayer *l); - -/** - @abstract Set layer scale factor for the y axis. - */ -extern void POPLayerSetScaleY(CALayer *l, CGFloat f); - -/** - @abstract Returns layer scale factor for the z axis. - */ -extern CGFloat POPLayerGetScaleZ(CALayer *l); - -/** - @abstract Set layer scale factor for the z axis. - */ -extern void POPLayerSetScaleZ(CALayer *l, CGFloat f); - -/** - @abstract Returns layer scale factors for x and y access as point. - */ -extern CGPoint POPLayerGetScaleXY(CALayer *l); - -/** - @abstract Sets layer x and y scale factors given point. - */ -extern void POPLayerSetScaleXY(CALayer *l, CGPoint p); - -#pragma mark - Translation - -/** - @abstract Returns layer translation factor for the x axis. - */ -extern CGFloat POPLayerGetTranslationX(CALayer *l); - -/** - @abstract Set layer translation factor for the x axis. - */ -extern void POPLayerSetTranslationX(CALayer *l, CGFloat f); - -/** - @abstract Returns layer translation factor for the y axis. - */ -extern CGFloat POPLayerGetTranslationY(CALayer *l); - -/** - @abstract Set layer translation factor for the y axis. - */ -extern void POPLayerSetTranslationY(CALayer *l, CGFloat f); - -/** - @abstract Returns layer translation factor for the z axis. - */ -extern CGFloat POPLayerGetTranslationZ(CALayer *l); - -/** - @abstract Set layer translation factor for the z axis. - */ -extern void POPLayerSetTranslationZ(CALayer *l, CGFloat f); - -/** - @abstract Returns layer translation factors for x and y access as point. - */ -extern CGPoint POPLayerGetTranslationXY(CALayer *l); - -/** - @abstract Sets layer x and y translation factors given point. - */ -extern void POPLayerSetTranslationXY(CALayer *l, CGPoint p); - -#pragma mark - Rotation - -/** - @abstract Returns layer rotation, in radians, in the X axis. - */ -extern CGFloat POPLayerGetRotationX(CALayer *l); - -/** - @abstract Sets layer rotation, in radians, in the X axis. - */ -extern void POPLayerSetRotationX(CALayer *l, CGFloat f); - -/** - @abstract Returns layer rotation, in radians, in the Y axis. - */ -extern CGFloat POPLayerGetRotationY(CALayer *l); - -/** - @abstract Sets layer rotation, in radians, in the Y axis. - */ -extern void POPLayerSetRotationY(CALayer *l, CGFloat f); - -/** - @abstract Returns layer rotation, in radians, in the Z axis. - */ -extern CGFloat POPLayerGetRotationZ(CALayer *l); - -/** - @abstract Sets layer rotation, in radians, in the Z axis. - */ -extern void POPLayerSetRotationZ(CALayer *l, CGFloat f); - -/** - @abstract Returns layer rotation, in radians, in the Z axis. - */ -extern CGFloat POPLayerGetRotation(CALayer *l); - -/** - @abstract Sets layer rotation, in radians, in the Z axis. - */ -extern void POPLayerSetRotation(CALayer *l, CGFloat f); - -#pragma mark - Sublayer Scale - -/** - @abstract Returns sublayer scale factors for x and y access as point. - */ -extern CGPoint POPLayerGetSubScaleXY(CALayer *l); - -/** - @abstract Sets sublayer x and y scale factors given point. - */ -extern void POPLayerSetSubScaleXY(CALayer *l, CGPoint p); - -#pragma mark - Sublayer Translation - -/** - @abstract Returns sublayer translation factor for the x axis. - */ -extern CGFloat POPLayerGetSubTranslationX(CALayer *l); - -/** - @abstract Set sublayer translation factor for the x axis. - */ -extern void POPLayerSetSubTranslationX(CALayer *l, CGFloat f); - -/** - @abstract Returns sublayer translation factor for the y axis. - */ -extern CGFloat POPLayerGetSubTranslationY(CALayer *l); - -/** - @abstract Set sublayer translation factor for the y axis. - */ -extern void POPLayerSetSubTranslationY(CALayer *l, CGFloat f); - -/** - @abstract Returns sublayer translation factor for the z axis. - */ -extern CGFloat POPLayerGetSubTranslationZ(CALayer *l); - -/** - @abstract Set sublayer translation factor for the z axis. - */ -extern void POPLayerSetSubTranslationZ(CALayer *l, CGFloat f); - -/** - @abstract Returns sublayer translation factors for x and y access as point. - */ -extern CGPoint POPLayerGetSubTranslationXY(CALayer *l); - -/** - @abstract Sets sublayer x and y translation factors given point. - */ -extern void POPLayerSetSubTranslationXY(CALayer *l, CGPoint p); - -POP_EXTERN_C_END diff --git a/Example/Pods/pop/pop/POPLayerExtras.mm b/Example/Pods/pop/pop/POPLayerExtras.mm deleted file mode 100644 index c8ad7f9..0000000 --- a/Example/Pods/pop/pop/POPLayerExtras.mm +++ /dev/null @@ -1,288 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import "POPLayerExtras.h" - -#include "TransformationMatrix.h" - -using namespace WebCore; - -#define DECOMPOSE_TRANSFORM(L) \ - TransformationMatrix _m(L.transform); \ - TransformationMatrix::DecomposedType _d; \ - _m.decompose(_d); - -#define RECOMPOSE_TRANSFORM(L) \ - _m.recompose(_d); \ - L.transform = _m.transform3d(); - -#define RECOMPOSE_ROT_TRANSFORM(L) \ - _m.recompose(_d, true); \ - L.transform = _m.transform3d(); - -#define DECOMPOSE_SUBLAYER_TRANSFORM(L) \ - TransformationMatrix _m(L.sublayerTransform); \ - TransformationMatrix::DecomposedType _d; \ - _m.decompose(_d); - -#define RECOMPOSE_SUBLAYER_TRANSFORM(L) \ - _m.recompose(_d); \ - L.sublayerTransform = _m.transform3d(); - -#pragma mark - Scale - -NS_INLINE void ensureNonZeroValue(CGFloat &f) -{ - if (f == 0) { - f = 1e-6; - } -} - -NS_INLINE void ensureNonZeroValue(CGPoint &p) -{ - if (p.x == 0 && p.y == 0) { - p.x = 1e-6; - p.y = 1e-6; - } -} - -CGFloat POPLayerGetScaleX(CALayer *l) -{ - DECOMPOSE_TRANSFORM(l); - return _d.scaleX; -} - -void POPLayerSetScaleX(CALayer *l, CGFloat f) -{ - ensureNonZeroValue(f); - DECOMPOSE_TRANSFORM(l); - _d.scaleX = f; - RECOMPOSE_TRANSFORM(l); -} - -CGFloat POPLayerGetScaleY(CALayer *l) -{ - DECOMPOSE_TRANSFORM(l); - return _d.scaleY; -} - -void POPLayerSetScaleY(CALayer *l, CGFloat f) -{ - ensureNonZeroValue(f); - DECOMPOSE_TRANSFORM(l); - _d.scaleY = f; - RECOMPOSE_TRANSFORM(l); -} - -CGFloat POPLayerGetScaleZ(CALayer *l) -{ - DECOMPOSE_TRANSFORM(l); - return _d.scaleZ; -} - -void POPLayerSetScaleZ(CALayer *l, CGFloat f) -{ - ensureNonZeroValue(f); - DECOMPOSE_TRANSFORM(l); - _d.scaleZ = f; - RECOMPOSE_TRANSFORM(l); -} - -CGPoint POPLayerGetScaleXY(CALayer *l) -{ - DECOMPOSE_TRANSFORM(l); - return CGPointMake(_d.scaleX, _d.scaleY); -} - -void POPLayerSetScaleXY(CALayer *l, CGPoint p) -{ - ensureNonZeroValue(p); - DECOMPOSE_TRANSFORM(l); - _d.scaleX = p.x; - _d.scaleY = p.y; - RECOMPOSE_TRANSFORM(l); -} - -#pragma mark - Translation - -CGFloat POPLayerGetTranslationX(CALayer *l) -{ - DECOMPOSE_TRANSFORM(l); - return _d.translateX; -} - -void POPLayerSetTranslationX(CALayer *l, CGFloat f) -{ - DECOMPOSE_TRANSFORM(l); - _d.translateX = f; - RECOMPOSE_TRANSFORM(l); -} - -CGFloat POPLayerGetTranslationY(CALayer *l) -{ - DECOMPOSE_TRANSFORM(l); - return _d.translateY; -} - -void POPLayerSetTranslationY(CALayer *l, CGFloat f) -{ - DECOMPOSE_TRANSFORM(l); - _d.translateY = f; - RECOMPOSE_TRANSFORM(l); -} - -CGFloat POPLayerGetTranslationZ(CALayer *l) -{ - DECOMPOSE_TRANSFORM(l); - return _d.translateZ; -} - -void POPLayerSetTranslationZ(CALayer *l, CGFloat f) -{ - DECOMPOSE_TRANSFORM(l); - _d.translateZ = f; - RECOMPOSE_TRANSFORM(l); -} - -CGPoint POPLayerGetTranslationXY(CALayer *l) -{ - DECOMPOSE_TRANSFORM(l); - return CGPointMake(_d.translateX, _d.translateY); -} - -void POPLayerSetTranslationXY(CALayer *l, CGPoint p) -{ - DECOMPOSE_TRANSFORM(l); - _d.translateX = p.x; - _d.translateY = p.y; - RECOMPOSE_TRANSFORM(l); -} - -#pragma mark - Rotation - -CGFloat POPLayerGetRotationX(CALayer *l) -{ - DECOMPOSE_TRANSFORM(l); - return _d.rotateX; -} - -void POPLayerSetRotationX(CALayer *l, CGFloat f) -{ - DECOMPOSE_TRANSFORM(l); - _d.rotateX = f; - RECOMPOSE_ROT_TRANSFORM(l); -} - -CGFloat POPLayerGetRotationY(CALayer *l) -{ - DECOMPOSE_TRANSFORM(l); - return _d.rotateY; -} - -void POPLayerSetRotationY(CALayer *l, CGFloat f) -{ - DECOMPOSE_TRANSFORM(l); - _d.rotateY = f; - RECOMPOSE_ROT_TRANSFORM(l); -} - -CGFloat POPLayerGetRotationZ(CALayer *l) -{ - DECOMPOSE_TRANSFORM(l); - return _d.rotateZ; -} - -void POPLayerSetRotationZ(CALayer *l, CGFloat f) -{ - DECOMPOSE_TRANSFORM(l); - _d.rotateZ = f; - RECOMPOSE_ROT_TRANSFORM(l); -} - -CGFloat POPLayerGetRotation(CALayer *l) -{ - return POPLayerGetRotationZ(l); -} - -void POPLayerSetRotation(CALayer *l, CGFloat f) -{ - POPLayerSetRotationZ(l, f); -} - -#pragma mark - Sublayer Scale - -CGPoint POPLayerGetSubScaleXY(CALayer *l) -{ - DECOMPOSE_SUBLAYER_TRANSFORM(l); - return CGPointMake(_d.scaleX, _d.scaleY); -} - -void POPLayerSetSubScaleXY(CALayer *l, CGPoint p) -{ - ensureNonZeroValue(p); - DECOMPOSE_SUBLAYER_TRANSFORM(l); - _d.scaleX = p.x; - _d.scaleY = p.y; - RECOMPOSE_SUBLAYER_TRANSFORM(l); -} - -#pragma mark - Sublayer Translation - -extern CGFloat POPLayerGetSubTranslationX(CALayer *l) -{ - DECOMPOSE_SUBLAYER_TRANSFORM(l); - return _d.translateX; -} - -extern void POPLayerSetSubTranslationX(CALayer *l, CGFloat f) -{ - DECOMPOSE_SUBLAYER_TRANSFORM(l); - _d.translateX = f; - RECOMPOSE_SUBLAYER_TRANSFORM(l); -} - -extern CGFloat POPLayerGetSubTranslationY(CALayer *l) -{ - DECOMPOSE_SUBLAYER_TRANSFORM(l); - return _d.translateY; -} - -extern void POPLayerSetSubTranslationY(CALayer *l, CGFloat f) -{ - DECOMPOSE_SUBLAYER_TRANSFORM(l); - _d.translateY = f; - RECOMPOSE_SUBLAYER_TRANSFORM(l); -} - -extern CGFloat POPLayerGetSubTranslationZ(CALayer *l) -{ - DECOMPOSE_SUBLAYER_TRANSFORM(l); - return _d.translateZ; -} - -extern void POPLayerSetSubTranslationZ(CALayer *l, CGFloat f) -{ - DECOMPOSE_SUBLAYER_TRANSFORM(l); - _d.translateZ = f; - RECOMPOSE_SUBLAYER_TRANSFORM(l); -} - -extern CGPoint POPLayerGetSubTranslationXY(CALayer *l) -{ - DECOMPOSE_SUBLAYER_TRANSFORM(l); - return CGPointMake(_d.translateX, _d.translateY); -} - -extern void POPLayerSetSubTranslationXY(CALayer *l, CGPoint p) -{ - DECOMPOSE_SUBLAYER_TRANSFORM(l); - _d.translateX = p.x; - _d.translateY = p.y; - RECOMPOSE_SUBLAYER_TRANSFORM(l); -} diff --git a/Example/Pods/pop/pop/POPMath.h b/Example/Pods/pop/pop/POPMath.h deleted file mode 100644 index 0c6f5e2..0000000 --- a/Example/Pods/pop/pop/POPMath.h +++ /dev/null @@ -1,56 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import - -#import - -#import "POPDefines.h" -#import "POPVector.h" - -NS_INLINE CGFloat sqrtr(CGFloat f) -{ -#if CGFLOAT_IS_DOUBLE - return sqrt(f); -#else - return sqrtf(f); -#endif -} - -// round to nearest sub; pass 2.0 to round to every 0.5 (eg: retina pixels) -NS_INLINE CGFloat POPSubRound(CGFloat f, CGFloat sub) -{ - return round(f * sub) / sub; -} - -#define MIX(a, b, f) ((a) + (f) * ((b) - (a))) - -// the longer the duration, the higher the necessary precision -#define SOLVE_EPS(dur) (1. / (1000. * (dur))) - -#define _EQLF_(x, y, epsilon) (fabsf ((x) - (y)) < epsilon) - -extern void POPInterpolateVector(NSUInteger count, CGFloat *dst, const CGFloat *from, const CGFloat *to, CGFloat f); - -extern double POPTimingFunctionSolve(const double vec[4], double t, double eps); - -// quadratic mapping of t [0, 1] to [start, end] -extern double POPQuadraticOutInterpolation(double t, double start, double end); - -// normalize value to [0, 1] based on its range [startValue, endValue] -extern double POPNormalize(double value, double startValue, double endValue); - -// project a normalized value [0, 1] to a given range [start, end] -extern double POPProjectNormal(double n, double start, double end); - -// solve a quadratic equation of the form a * x^2 + b * x + c = 0 -extern void POPQuadraticSolve(CGFloat a, CGFloat b, CGFloat c, CGFloat &x1, CGFloat &x2); - -// for a given tension return the bouncy 3 friction that produces no bounce -extern double POPBouncy3NoBounce(double tension); diff --git a/Example/Pods/pop/pop/POPMath.mm b/Example/Pods/pop/pop/POPMath.mm deleted file mode 100644 index 69a506a..0000000 --- a/Example/Pods/pop/pop/POPMath.mm +++ /dev/null @@ -1,83 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import "POPMath.h" - -#import "POPAnimationPrivate.h" -#import "UnitBezier.h" - -void POPInterpolateVector(NSUInteger count, CGFloat *dst, const CGFloat *from, const CGFloat *to, CGFloat f) -{ - for (NSUInteger idx = 0; idx < count; idx++) { - dst[idx] = MIX(from[idx], to[idx], f); - } -} - -double POPTimingFunctionSolve(const double vec[4], double t, double eps) -{ - WebCore::UnitBezier bezier(vec[0], vec[1], vec[2], vec[3]); - return bezier.solve(t, eps); -} - -double POPNormalize(double value, double startValue, double endValue) -{ - return (value - startValue) / (endValue - startValue); -} - -double POPProjectNormal(double n, double start, double end) -{ - return start + (n * (end - start)); -} - -static double linear_interpolation(double t, double start, double end) -{ - return t * end + (1.f - t) * start; -} - -double POPQuadraticOutInterpolation(double t, double start, double end) -{ - return linear_interpolation(2*t - t*t, start, end); -} - -static double b3_friction1(double x) -{ - return (0.0007 * pow(x, 3)) - (0.031 * pow(x, 2)) + 0.64 * x + 1.28; -} - -static double b3_friction2(double x) -{ - return (0.000044 * pow(x, 3)) - (0.006 * pow(x, 2)) + 0.36 * x + 2.; -} - -static double b3_friction3(double x) -{ - return (0.00000045 * pow(x, 3)) - (0.000332 * pow(x, 2)) + 0.1078 * x + 5.84; -} - -double POPBouncy3NoBounce(double tension) -{ - double friction = 0; - if (tension <= 18.) { - friction = b3_friction1(tension); - } else if (tension > 18 && tension <= 44) { - friction = b3_friction2(tension); - } else if (tension > 44) { - friction = b3_friction3(tension); - } else { - assert(false); - } - return friction; -} - -void POPQuadraticSolve(CGFloat a, CGFloat b, CGFloat c, CGFloat &x1, CGFloat &x2) -{ - CGFloat discriminant = sqrt(b * b - 4 * a * c); - x1 = (-b + discriminant) / (2 * a); - x2 = (-b - discriminant) / (2 * a); -} diff --git a/Example/Pods/pop/pop/POPPropertyAnimation.h b/Example/Pods/pop/pop/POPPropertyAnimation.h deleted file mode 100644 index 2861665..0000000 --- a/Example/Pods/pop/pop/POPPropertyAnimation.h +++ /dev/null @@ -1,65 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import -#import - -/** - @abstract Flags for clamping animation values. - @discussion Animation values can optionally be clamped to avoid overshoot. kPOPAnimationClampStart ensures values are more than fromValue and kPOPAnimationClampEnd ensures values are less than toValue. - */ -typedef NS_OPTIONS(NSUInteger, POPAnimationClampFlags) -{ - kPOPAnimationClampNone = 0, - kPOPAnimationClampStart = 1UL << 0, - kPOPAnimationClampEnd = 1UL << 1, - kPOPAnimationClampBoth = kPOPAnimationClampStart | kPOPAnimationClampEnd, -}; - -/** - @abstract The semi-concrete property animation subclass. - */ -@interface POPPropertyAnimation : POPAnimation - -/** - @abstract The property to animate. - */ -@property (strong, nonatomic) POPAnimatableProperty *property; - -/** - @abstract The value to animate from. - @discussion The value type should match the property. If unspecified, the value is initialized to the object's current value on animation start. - */ -@property (copy, nonatomic) id fromValue; - -/** - @abstract The value to animate to. - @discussion The value type should match the property. If unspecified, the value is initialized to the object's current value on animation start. - */ -@property (copy, nonatomic) id toValue; - -/** - @abstract The rounding factor applied to the current animated value. - @discussion Specify 1.0 to animate between integral values. Defaults to 0 meaning no rounding. - */ -@property (assign, nonatomic) CGFloat roundingFactor; - -/** - @abstract The clamp mode applied to the current animated value. - @discussion See {@ref POPAnimationClampFlags} for possible values. Defaults to kPOPAnimationClampNone. - */ -@property (assign, nonatomic) NSUInteger clampMode; - -/** - @abstract The flag indicating whether values should be "added" each frame, rather than set. - @discussion Addition may be type dependent. Defaults to NO. - */ -@property (assign, nonatomic, getter = isAdditive) BOOL additive; - -@end diff --git a/Example/Pods/pop/pop/POPPropertyAnimation.mm b/Example/Pods/pop/pop/POPPropertyAnimation.mm deleted file mode 100644 index 56a9e5c..0000000 --- a/Example/Pods/pop/pop/POPPropertyAnimation.mm +++ /dev/null @@ -1,125 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import "POPPropertyAnimationInternal.h" - -@implementation POPPropertyAnimation - -#pragma mark - Lifecycle - -#undef __state -#define __state ((POPPropertyAnimationState *)_state) - -- (void)_initState -{ - _state = new POPPropertyAnimationState(self); -} - -#pragma mark - Properties - -DEFINE_RW_FLAG(POPPropertyAnimationState, additive, isAdditive, setAdditive:); -DEFINE_RW_PROPERTY(POPPropertyAnimationState, roundingFactor, setRoundingFactor:, CGFloat); -DEFINE_RW_PROPERTY(POPPropertyAnimationState, clampMode, setClampMode:, NSUInteger); -DEFINE_RW_PROPERTY_OBJ(POPPropertyAnimationState, property, setProperty:, POPAnimatableProperty*, ((POPPropertyAnimationState*)_state)->updatedDynamicsThreshold();); -DEFINE_RW_PROPERTY_OBJ_COPY(POPPropertyAnimationState, progressMarkers, setProgressMarkers:, NSArray*, ((POPPropertyAnimationState*)_state)->updatedProgressMarkers();); - -- (id)fromValue -{ - return POPBox(__state->fromVec, __state->valueType); -} - -- (void)setFromValue:(id)aValue -{ - POPPropertyAnimationState *s = __state; - VectorRef vec = POPUnbox(aValue, s->valueType, s->valueCount, YES); - if (!vec_equal(vec, s->fromVec)) { - s->fromVec = vec; - - if (s->tracing) { - [s->tracer updateFromValue:aValue]; - } - } -} - -- (id)toValue -{ - return POPBox(__state->toVec, __state->valueType); -} - -- (void)setToValue:(id)aValue -{ - POPPropertyAnimationState *s = __state; - VectorRef vec = POPUnbox(aValue, s->valueType, s->valueCount, YES); - - if (!vec_equal(vec, s->toVec)) { - s->toVec = vec; - - // invalidate to dependent state - s->didReachToValue = false; - s->distanceVec = NULL; - - if (s->tracing) { - [s->tracer updateToValue:aValue]; - } - - // automatically unpause active animations - if (s->active && s->paused) { - s->setPaused(false); - } - } -} - -- (id)currentValue -{ - return POPBox(__state->currentValue(), __state->valueType); -} - -#pragma mark - Utility - -- (void)_appendDescription:(NSMutableString *)s debug:(BOOL)debug -{ - [s appendFormat:@"; from = %@; to = %@", describe(__state->fromVec), describe(__state->toVec)]; - - if (_state->active) - [s appendFormat:@"; currentValue = %@", describe(__state->currentValue())]; - - if (__state->velocityVec && 0 != __state->velocityVec->norm()) - [s appendFormat:@"; velocity = %@", describe(__state->velocityVec)]; - - if (!self.removedOnCompletion) - [s appendFormat:@"; removedOnCompletion = %@", POPStringFromBOOL(self.removedOnCompletion)]; - - if (__state->progressMarkers) - [s appendFormat:@"; progressMarkers = [%@]", [__state->progressMarkers componentsJoinedByString:@", "]]; - - if (_state->active) - [s appendFormat:@"; progress = %f", __state->progress]; -} - -@end - -@implementation POPPropertyAnimation (NSCopying) - -- (instancetype)copyWithZone:(NSZone *)zone { - - POPPropertyAnimation *copy = [super copyWithZone:zone]; - - if (copy) { - copy.property = [self.property copyWithZone:zone]; - copy.fromValue = self.fromValue; - copy.toValue = self.toValue; - copy.roundingFactor = self.roundingFactor; - copy.clampMode = self.clampMode; - copy.additive = self.additive; - } - - return copy; -} - -@end \ No newline at end of file diff --git a/Example/Pods/pop/pop/POPPropertyAnimationInternal.h b/Example/Pods/pop/pop/POPPropertyAnimationInternal.h deleted file mode 100644 index 9f2aee4..0000000 --- a/Example/Pods/pop/pop/POPPropertyAnimationInternal.h +++ /dev/null @@ -1,359 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import "POPAnimationInternal.h" -#import "POPPropertyAnimation.h" - -static void clampValue(CGFloat &value, CGFloat fromValue, CGFloat toValue, NSUInteger clamp) -{ - BOOL increasing = (toValue > fromValue); - - // Clamp start of animation. - if ((kPOPAnimationClampStart & clamp) && - ((increasing && (value < fromValue)) || (!increasing && (value > fromValue)))) { - value = fromValue; - } - - // Clamp end of animation. - if ((kPOPAnimationClampEnd & clamp) && - ((increasing && (value > toValue)) || (!increasing && (value < toValue)))) { - value = toValue; - } -} - -struct _POPPropertyAnimationState : _POPAnimationState -{ - POPAnimatableProperty *property; - POPValueType valueType; - NSUInteger valueCount; - VectorRef fromVec; - VectorRef toVec; - VectorRef currentVec; - VectorRef previousVec; - VectorRef previous2Vec; - VectorRef velocityVec; - VectorRef originalVelocityVec; - VectorRef distanceVec; - CGFloat roundingFactor; - NSUInteger clampMode; - NSArray *progressMarkers; - POPProgressMarker *progressMarkerState; - NSUInteger progressMarkerCount; - NSUInteger nextProgressMarkerIdx; - CGFloat dynamicsThreshold; - - _POPPropertyAnimationState(id __unsafe_unretained anim) : _POPAnimationState(anim), - property(nil), - valueType((POPValueType)0), - valueCount(0), - fromVec(nullptr), - toVec(nullptr), - currentVec(nullptr), - previousVec(nullptr), - previous2Vec(nullptr), - velocityVec(nullptr), - originalVelocityVec(nullptr), - distanceVec(nullptr), - roundingFactor(0), - clampMode(0), - progressMarkers(nil), - progressMarkerState(nil), - progressMarkerCount(0), - nextProgressMarkerIdx(0), - dynamicsThreshold(0) - { - type = kPOPAnimationBasic; - } - - ~_POPPropertyAnimationState() - { - if (progressMarkerState) { - free(progressMarkerState); - progressMarkerState = NULL; - } - } - - bool canProgress() { - return hasValue(); - } - - bool shouldRound() { - return 0 != roundingFactor; - } - - bool hasValue() { - return 0 != valueCount; - } - - bool isDone() { - // inherit done - if (_POPAnimationState::isDone()) { - return true; - } - - // consider an animation with no values done - if (!hasValue() && !isCustom()) { - return true; - } - - return false; - } - - // returns a copy of the currentVec, rounding if needed - VectorRef currentValue() { - VectorRef vec = VectorRef(Vector::new_vector(currentVec.get())); - if (shouldRound()) { - vec->subRound(1 / roundingFactor); - } - return vec; - } - - void resetProgressMarkerState() - { - for (NSUInteger idx = 0; idx < progressMarkerCount; idx++) - progressMarkerState[idx].reached = false; - - nextProgressMarkerIdx = 0; - } - - void updatedProgressMarkers() - { - if (progressMarkerState) { - free(progressMarkerState); - progressMarkerState = NULL; - } - - progressMarkerCount = progressMarkers.count; - - if (0 != progressMarkerCount) { - progressMarkerState = (POPProgressMarker *)malloc(progressMarkerCount * sizeof(POPProgressMarker)); - [progressMarkers enumerateObjectsUsingBlock:^(NSNumber *progressMarker, NSUInteger idx, BOOL *stop) { - progressMarkerState[idx].reached = false; - progressMarkerState[idx].progress = [progressMarker floatValue]; - }]; - } - - nextProgressMarkerIdx = 0; - } - - virtual void updatedDynamicsThreshold() - { - dynamicsThreshold = property.threshold; - } - - void finalizeProgress() - { - progress = 1.0; - NSUInteger count = valueCount; - VectorRef outVec(Vector::new_vector(count, NULL)); - - if (outVec && toVec) { - *outVec = *toVec; - } - - currentVec = outVec; - clampCurrentValue(); - delegateProgress(); - } - - void computeProgress() { - if (!canProgress()) { - return; - } - - static ComputeProgressFunctor func; - Vector4r v = vector4(currentVec); - Vector4r f = vector4(fromVec); - Vector4r t = vector4(toVec); - progress = func(v, f, t); - } - - void delegateProgress() { - if (!canProgress()) { - return; - } - - if (delegateDidProgress && progressMarkerState) { - - while (nextProgressMarkerIdx < progressMarkerCount) { - if (progress < progressMarkerState[nextProgressMarkerIdx].progress) - break; - - if (!progressMarkerState[nextProgressMarkerIdx].reached) { - ActionEnabler enabler; - [delegate pop_animation:self didReachProgress:progressMarkerState[nextProgressMarkerIdx].progress]; - progressMarkerState[nextProgressMarkerIdx].reached = true; - } - - nextProgressMarkerIdx++; - } - } - - if (!didReachToValue) { - bool didReachToValue = false; - if (0 == valueCount) { - didReachToValue = true; - } else { - Vector4r distance = toVec->vector4r(); - distance -= currentVec->vector4r(); - - if (0 == distance.squaredNorm()) { - didReachToValue = true; - } else { - // components - if (distanceVec) { - didReachToValue = true; - const CGFloat *distanceValues = distanceVec->data(); - for (NSUInteger idx = 0; idx < valueCount; idx++) { - didReachToValue &= (signbit(distance[idx]) != signbit(distanceValues[idx])); - } - } - } - } - - if (didReachToValue) { - handleDidReachToValue(); - } - } - } - - void handleDidReachToValue() { - didReachToValue = true; - - if (delegateDidReachToValue) { - ActionEnabler enabler; - [delegate pop_animationDidReachToValue:self]; - } - - POPAnimationDidReachToValueBlock block = animationDidReachToValueBlock; - if (block != NULL) { - ActionEnabler enabler; - block(self); - } - - if (tracing) { - [tracer didReachToValue:POPBox(currentValue(), valueType, true)]; - } - } - - void readObjectValue(VectorRef *ptrVec, id obj) - { - // use current object value as from value - pop_animatable_read_block read = property.readBlock; - if (NULL != read) { - - Vector4r vec = read_values(read, obj, valueCount); - *ptrVec = VectorRef(Vector::new_vector(valueCount, vec)); - - if (tracing) { - [tracer readPropertyValue:POPBox(*ptrVec, valueType, true)]; - } - } - } - - virtual void willRun(bool started, id obj) { - // ensure from value initialized - if (NULL == fromVec) { - readObjectValue(&fromVec, obj); - } - - // ensure to value initialized - if (NULL == toVec) { - // compute decay to value - if (kPOPAnimationDecay == type) { - [self toValue]; - } else { - // read to value - readObjectValue(&toVec, obj); - } - } - - // handle one time value initialization on start - if (started) { - - // initialize current vec - if (!currentVec) { - currentVec = VectorRef(Vector::new_vector(valueCount, NULL)); - - // initialize current value with from value - // only do this on initial creation to avoid overwriting current value - // on paused animation continuation - if (currentVec && fromVec) { - *currentVec = *fromVec; - } - } - - // ensure velocity values - if (!velocityVec) { - velocityVec = VectorRef(Vector::new_vector(valueCount, NULL)); - } - if (!originalVelocityVec) { - originalVelocityVec = VectorRef(Vector::new_vector(valueCount, NULL)); - } - } - - // ensure distance value initialized - // depends on current value set on one time start - if (NULL == distanceVec) { - - // not yet started animations may not have current value - VectorRef fromVec2 = NULL != currentVec ? currentVec : fromVec; - - if (fromVec2 && toVec) { - Vector4r distance = toVec->vector4r(); - distance -= fromVec2->vector4r(); - - if (0 != distance.squaredNorm()) { - distanceVec = VectorRef(Vector::new_vector(valueCount, distance)); - } - } - } - } - - virtual void reset(bool all) { - _POPAnimationState::reset(all); - - if (all) { - currentVec = NULL; - previousVec = NULL; - previous2Vec = NULL; - } - progress = 0; - resetProgressMarkerState(); - didReachToValue = false; - distanceVec = NULL; - } - - void clampCurrentValue(NSUInteger clamp) - { - if (kPOPAnimationClampNone == clamp) - return; - - // Clamp all vector values - CGFloat *currentValues = currentVec->data(); - const CGFloat *fromValues = fromVec->data(); - const CGFloat *toValues = toVec->data(); - - for (NSUInteger idx = 0; idx < valueCount; idx++) { - clampValue(currentValues[idx], fromValues[idx], toValues[idx], clamp); - } - } - - void clampCurrentValue() - { - clampCurrentValue(clampMode); - } -}; - -typedef struct _POPPropertyAnimationState POPPropertyAnimationState; - -@interface POPPropertyAnimation () - -@end - diff --git a/Example/Pods/pop/pop/POPSpringAnimation.h b/Example/Pods/pop/pop/POPSpringAnimation.h deleted file mode 100644 index a22cd5b..0000000 --- a/Example/Pods/pop/pop/POPSpringAnimation.h +++ /dev/null @@ -1,67 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import - -/** - @abstract A concrete spring animation class. - @discussion Animation is achieved through modeling spring dynamics. - */ -@interface POPSpringAnimation : POPPropertyAnimation - -/** - @abstract The designated initializer. - @returns An instance of a spring animation. - */ -+ (instancetype)animation; - -/** - @abstract Convenience initializer that returns an animation with animatable property of name. - @param name The name of the animatable property. - @returns An instance of a spring animation configured with specified animatable property. - */ -+ (instancetype)animationWithPropertyNamed:(NSString *)name; - -/** - @abstract The current velocity value. - @discussion Set before animation start to account for initial velocity. Expressed in change of value units per second. - */ -@property (copy, nonatomic) id velocity; - -/** - @abstract The effective bounciness. - @discussion Use in conjunction with 'springSpeed' to change animation effect. Values are converted into corresponding dynamics constants. Higher values increase spring movement range resulting in more oscillations and springiness. Defined as a value in the range [0, 20]. Defaults to 4. - */ -@property (assign, nonatomic) CGFloat springBounciness; - -/** - @abstract The effective speed. - @discussion Use in conjunction with 'springBounciness' to change animation effect. Values are converted into corresponding dynamics constants. Higher values increase the dampening power of the spring resulting in a faster initial velocity and more rapid bounce slowdown. Defined as a value in the range [0, 20]. Defaults to 12. - */ -@property (assign, nonatomic) CGFloat springSpeed; - -/** - @abstract The tension used in the dynamics simulation. - @discussion Can be used over bounciness and speed for finer grain tweaking of animation effect. - */ -@property (assign, nonatomic) CGFloat dynamicsTension; - -/** - @abstract The friction used in the dynamics simulation. - @discussion Can be used over bounciness and speed for finer grain tweaking of animation effect. - */ -@property (assign, nonatomic) CGFloat dynamicsFriction; - -/** - @abstract The mass used in the dynamics simulation. - @discussion Can be used over bounciness and speed for finer grain tweaking of animation effect. - */ -@property (assign, nonatomic) CGFloat dynamicsMass; - -@end diff --git a/Example/Pods/pop/pop/POPSpringAnimation.mm b/Example/Pods/pop/pop/POPSpringAnimation.mm deleted file mode 100644 index d299770..0000000 --- a/Example/Pods/pop/pop/POPSpringAnimation.mm +++ /dev/null @@ -1,192 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import "POPSpringAnimationInternal.h" - -@implementation POPSpringAnimation - -#pragma mark - Lifecycle - -#undef __state -#define __state ((POPSpringAnimationState *)_state) - -+ (instancetype)animation -{ - return [[self alloc] init]; -} - -+ (instancetype)animationWithPropertyNamed:(NSString *)aName -{ - POPSpringAnimation *anim = [self animation]; - anim.property = [POPAnimatableProperty propertyWithName:aName]; - return anim; -} - -- (void)_initState -{ - _state = new POPSpringAnimationState(self); -} - -- (id)init -{ - self = [super _init]; - if (nil != self) { - __state->solver = new SpringSolver4d(1, 1, 1); - __state->updatedDynamicsThreshold(); - __state->updatedBouncinessAndSpeed(); - } - return self; -} - -- (void)dealloc -{ - if (__state) { - delete __state->solver; - __state->solver = NULL; - } -} - -#pragma mark - Properties - -- (id)velocity -{ - return POPBox(__state->velocityVec, __state->valueType); -} - -- (void)setVelocity:(id)aValue -{ - POPPropertyAnimationState *s = __state; - VectorRef vec = POPUnbox(aValue, s->valueType, s->valueCount, YES); - VectorRef origVec = POPUnbox(aValue, s->valueType, s->valueCount, YES); - if (!vec_equal(vec, s->velocityVec)) { - s->velocityVec = vec; - s->originalVelocityVec = origVec; - - if (s->tracing) { - [s->tracer updateVelocity:aValue]; - } - } -} - -DEFINE_RW_PROPERTY(POPSpringAnimationState, dynamicsTension, setDynamicsTension:, CGFloat, [self _updatedDynamicsTension];); -DEFINE_RW_PROPERTY(POPSpringAnimationState, dynamicsFriction, setDynamicsFriction:, CGFloat, [self _updatedDynamicsFriction];); -DEFINE_RW_PROPERTY(POPSpringAnimationState, dynamicsMass, setDynamicsMass:, CGFloat, [self _updatedDynamicsMass];); - -FB_PROPERTY_GET(POPSpringAnimationState, springSpeed, CGFloat); -- (void)setSpringSpeed:(CGFloat)aFloat -{ - POPSpringAnimationState *s = __state; - if (s->userSpecifiedDynamics || aFloat != s->springSpeed) { - s->springSpeed = aFloat; - s->userSpecifiedDynamics = false; - s->updatedBouncinessAndSpeed(); - if (s->tracing) { - [s->tracer updateSpeed:aFloat]; - } - } -} - -FB_PROPERTY_GET(POPSpringAnimationState, springBounciness, CGFloat); -- (void)setSpringBounciness:(CGFloat)aFloat -{ - POPSpringAnimationState *s = __state; - if (s->userSpecifiedDynamics || aFloat != s->springBounciness) { - s->springBounciness = aFloat; - s->userSpecifiedDynamics = false; - s->updatedBouncinessAndSpeed(); - if (s->tracing) { - [s->tracer updateBounciness:aFloat]; - } - } -} - -- (SpringSolver4d *)solver -{ - return __state->solver; -} - -- (void)setSolver:(SpringSolver4d *)aSolver -{ - if (aSolver != __state->solver) { - if (__state->solver) { - delete(__state->solver); - } - __state->solver = aSolver; - } -} - -#pragma mark - Utility - -- (void)_updatedDynamicsTension -{ - __state->userSpecifiedDynamics = true; - if(__state->tracing) { - [__state->tracer updateTension:__state->dynamicsTension]; - } - __state->updatedDynamics(); -} - -- (void)_updatedDynamicsFriction -{ - __state->userSpecifiedDynamics = true; - if(__state->tracing) { - [__state->tracer updateFriction:__state->dynamicsFriction]; - } - __state->updatedDynamics(); -} - -- (void)_updatedDynamicsMass -{ - __state->userSpecifiedDynamics = true; - if(__state->tracing) { - [__state->tracer updateMass:__state->dynamicsMass]; - } - __state->updatedDynamics(); -} - -- (void)_appendDescription:(NSMutableString *)s debug:(BOOL)debug -{ - [super _appendDescription:s debug:debug]; - - if (debug) { - if (_state->userSpecifiedDynamics) { - [s appendFormat:@"; dynamics = (tension:%f, friction:%f, mass:%f)", __state->dynamicsTension, __state->dynamicsFriction, __state->dynamicsMass]; - } else { - [s appendFormat:@"; bounciness = %f; speed = %f", __state->springBounciness, __state->springSpeed]; - } - } -} - -@end - -@implementation POPSpringAnimation (NSCopying) - -- (instancetype)copyWithZone:(NSZone *)zone { - - POPSpringAnimation *copy = [super copyWithZone:zone]; - - if (copy) { - id velocity = POPBox(__state->originalVelocityVec, __state->valueType); - - // If velocity never gets set, then POPBox will return nil, messing up __state->valueCount. - if (velocity) { - copy.velocity = velocity; - } - - copy.springBounciness = self.springBounciness; - copy.springSpeed = self.springSpeed; - copy.dynamicsTension = self.dynamicsTension; - copy.dynamicsFriction = self.dynamicsFriction; - copy.dynamicsMass = self.dynamicsMass; - } - - return copy; -} - -@end \ No newline at end of file diff --git a/Example/Pods/pop/pop/POPSpringAnimationInternal.h b/Example/Pods/pop/pop/POPSpringAnimationInternal.h deleted file mode 100644 index 6a72a43..0000000 --- a/Example/Pods/pop/pop/POPSpringAnimationInternal.h +++ /dev/null @@ -1,132 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import - -#import "POPAnimationExtras.h" -#import "POPPropertyAnimationInternal.h" - -struct _POPSpringAnimationState : _POPPropertyAnimationState -{ - SpringSolver4d *solver; - CGFloat springSpeed; - CGFloat springBounciness; // normalized springiness - CGFloat dynamicsTension; // tension - CGFloat dynamicsFriction; // friction - CGFloat dynamicsMass; // mass - - _POPSpringAnimationState(id __unsafe_unretained anim) : _POPPropertyAnimationState(anim), - solver(nullptr), - springSpeed(12.), - springBounciness(4.), - dynamicsTension(0), - dynamicsFriction(0), - dynamicsMass(0) - { - type = kPOPAnimationSpring; - } - - bool hasConverged() - { - NSUInteger count = valueCount; - if (shouldRound()) { - return vec_equal(previous2Vec, previousVec) && vec_equal(previousVec, toVec); - } else { - if (!previousVec || !previous2Vec) - return false; - - CGFloat t = dynamicsThreshold / 5; - - const CGFloat *toValues = toVec->data(); - const CGFloat *previousValues = previousVec->data(); - const CGFloat *previous2Values = previous2Vec->data(); - - for (NSUInteger idx = 0; idx < count; idx++) { - if ((std::abs(toValues[idx] - previousValues[idx]) >= t) || (std::abs(previous2Values[idx] - previousValues[idx]) >= t)) { - return false; - } - } - return true; - } - } - - bool isDone() { - if (_POPPropertyAnimationState::isDone()) { - return true; - } - return solver->started() && (hasConverged() || solver->hasConverged()); - } - - void updatedDynamics() - { - if (NULL != solver) { - solver->setConstants(dynamicsTension, dynamicsFriction, dynamicsMass); - } - } - - void updatedDynamicsThreshold() - { - _POPPropertyAnimationState::updatedDynamicsThreshold(); - if (NULL != solver) { - solver->setThreshold(dynamicsThreshold); - } - } - - void updatedBouncinessAndSpeed() { - [POPSpringAnimation convertBounciness:springBounciness speed:springSpeed toTension:&dynamicsTension friction:&dynamicsFriction mass:&dynamicsMass]; - updatedDynamics(); - } - - bool advance(CFTimeInterval time, CFTimeInterval dt, id obj) { - // advance past not yet initialized animations - if (NULL == currentVec) { - return false; - } - - CFTimeInterval localTime = time - startTime; - - Vector4d value = vector4d(currentVec); - Vector4d toValue = vector4d(toVec); - Vector4d velocity = vector4d(velocityVec); - - SSState4d state; - state.p = toValue - value; - - // the solver assumes a spring of size zero - // flip the velocity from user perspective to solver perspective - state.v = velocity * -1; - - solver->advance(state, localTime, dt); - value = toValue - state.p; - - // flip velocity back to user perspective - velocity = state.v * -1; - - *currentVec = value; - - if (velocityVec) { - *velocityVec = velocity; - } - - clampCurrentValue(); - - return true; - } - - virtual void reset(bool all) { - _POPPropertyAnimationState::reset(all); - - if (solver) { - solver->setConstants(dynamicsTension, dynamicsFriction, dynamicsMass); - solver->reset(); - } - } -}; - -typedef struct _POPSpringAnimationState POPSpringAnimationState; diff --git a/Example/Pods/pop/pop/POPSpringSolver.h b/Example/Pods/pop/pop/POPSpringSolver.h deleted file mode 100644 index df485bf..0000000 --- a/Example/Pods/pop/pop/POPSpringSolver.h +++ /dev/null @@ -1,190 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import - -#import "POPVector.h" - -namespace POP { - - template - struct SSState - { - T p; - T v; - }; - - template - struct SSDerivative - { - T dp; - T dv; - }; - - typedef SSState SSState4d; - typedef SSDerivative SSDerivative4d; - - const CFTimeInterval solverDt = 0.001f; - const CFTimeInterval maxSolverDt = 30.0f; - - /** - Templated spring solver class. - */ - template - class SpringSolver - { - double _k; // stiffness - double _b; // dampening - double _m; // mass - - double _tp; // threshold - double _tv; // threshold velocity - double _ta; // threshold acceleration - - CFTimeInterval _accumulatedTime; - SSState _lastState; - T _lastDv; - bool _started; - - public: - SpringSolver(double k, double b, double m = 1) : _k(k), _b(b), _m(m), _started(false) - { - _accumulatedTime = 0; - _lastState.p = T::Zero(); - _lastState.v = T::Zero(); - _lastDv = T::Zero(); - setThreshold(1.); - } - - ~SpringSolver() - { - } - - bool started() - { - return _started; - } - - void setConstants(double k, double b, double m) - { - _k = k; - _b = b; - _m = m; - } - - void setThreshold(double t) - { - _tp = t / 2; // half a unit - _tv = 25.0 * t; // 5 units per second, squared for comparison - _ta = 625.0 * t * t; // 5 units per second squared, squared for comparison - } - - T acceleration(const SSState &state, double t) - { - return state.p*(-_k/_m) - state.v*(_b/_m); - } - - SSDerivative evaluate(const SSState &initial, double t) - { - SSDerivative output; - output.dp = initial.v; - output.dv = acceleration(initial, t); - return output; - } - - SSDerivative evaluate(const SSState &initial, double t, double dt, const SSDerivative &d) - { - SSState state; - state.p = initial.p + d.dp*dt; - state.v = initial.v + d.dv*dt; - SSDerivative output; - output.dp = state.v; - output.dv = acceleration(state, t+dt); - return output; - } - - void integrate(SSState &state, double t, double dt) - { - SSDerivative a = evaluate(state, t); - SSDerivative b = evaluate(state, t, dt*0.5, a); - SSDerivative c = evaluate(state, t, dt*0.5, b); - SSDerivative d = evaluate(state, t, dt, c); - - T dpdt = (a.dp + (b.dp + c.dp)*2.0 + d.dp) * (1.0/6.0); - T dvdt = (a.dv + (b.dv + c.dv)*2.0 + d.dv) * (1.0/6.0); - - state.p = state.p + dpdt*dt; - state.v = state.v + dvdt*dt; - - _lastDv = dvdt; - } - - SSState interpolate(const SSState &previous, const SSState ¤t, double alpha) - { - SSState state; - state.p = current.p*alpha + previous.p*(1-alpha); - state.v = current.v*alpha + previous.v*(1-alpha); - return state; - } - - void advance(SSState &state, double t, double dt) - { - _started = true; - - if (dt > maxSolverDt) { - // excessive time step, force shut down - _lastDv = _lastState.v = _lastState.p = T::Zero(); - } else { - _accumulatedTime += dt; - - SSState previousState = state, currentState = state; - while (_accumulatedTime >= solverDt) { - previousState = currentState; - this->integrate(currentState, t, solverDt); - t += solverDt; - _accumulatedTime -= solverDt; - } - CFTimeInterval alpha = _accumulatedTime / solverDt; - _lastState = state = this->interpolate(previousState, currentState, alpha); - } - } - - bool hasConverged() - { - if (!_started) { - return false; - } - - for (size_t idx = 0; idx < _lastState.p.size(); idx++) { - if (fabs(_lastState.p(idx)) >= _tp) { - return false; - } - } - - return (_lastState.v.squaredNorm() < _tv) && (_lastDv.squaredNorm() < _ta); - } - - void reset() - { - _accumulatedTime = 0; - _lastState.p = T::Zero(); - _lastState.v = T::Zero(); - _lastDv = T::Zero(); - _started = false; - } - }; - - /** - Convenience spring solver type definitions. - */ - typedef SpringSolver SpringSolver2d; - typedef SpringSolver SpringSolver3d; - typedef SpringSolver SpringSolver4d; -} - diff --git a/Example/Pods/pop/pop/POPVector.h b/Example/Pods/pop/pop/POPVector.h deleted file mode 100644 index 44d4e9f..0000000 --- a/Example/Pods/pop/pop/POPVector.h +++ /dev/null @@ -1,394 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#ifndef __POP__FBVector__ -#define __POP__FBVector__ - -#include -#include - -#import - -#import - -#import "POPDefines.h" - -#if SCENEKIT_SDK_AVAILABLE -#import -#endif - -#if TARGET_OS_IPHONE -#import -#endif - -#import "POPMath.h" - -namespace POP { - - /** Fixed two-size vector class */ - template - struct Vector2 - { - private: - typedef T Vector2::* const _data[2]; - static const _data _v; - - public: - T x; - T y; - - // Zero vector - static const Vector2 Zero() { return Vector2(0); } - - // Constructors - Vector2() {} - explicit Vector2(T v) { x = v; y = v; }; - explicit Vector2(T x0, T y0) : x(x0), y(y0) {}; - explicit Vector2(const CGPoint &p) : x(p.x), y (p.y) {} - explicit Vector2(const CGSize &s) : x(s.width), y (s.height) {} - - // Copy constructor - template explicit Vector2(const Vector2 &v) : x(v.x), y(v.y) {} - - // Index operators - const T& operator[](size_t i) const { return this->*_v[i]; } - T& operator[](size_t i) { return this->*_v[i]; } - const T& operator()(size_t i) const { return this->*_v[i]; } - T& operator()(size_t i) { return this->*_v[i]; } - - // Backing data - T * data() { return &(this->*_v[0]); } - const T * data() const { return &(this->*_v[0]); } - - // Size - inline size_t size() const { return 2; } - - // Assignment - Vector2 &operator= (T v) { x = v; y = v; return *this;} - template Vector2 &operator= (const Vector2 &v) { x = v.x; y = v.y; return *this;} - - // Negation - Vector2 operator- (void) const { return Vector2(-x, -y); } - - // Equality - bool operator== (T v) const { return (x == v && y == v); } - bool operator== (const Vector2 &v) const { return (x == v.x && y == v.y); } - - // Inequality - bool operator!= (T v) const {return (x != v || y != v); } - bool operator!= (const Vector2 &v) const { return (x != v.x || y != v.y); } - - // Scalar Math - Vector2 operator+ (T v) const { return Vector2(x + v, y + v); } - Vector2 operator- (T v) const { return Vector2(x - v, y - v); } - Vector2 operator* (T v) const { return Vector2(x * v, y * v); } - Vector2 operator/ (T v) const { return Vector2(x / v, y / v); } - Vector2 &operator+= (T v) { x += v; y += v; return *this; }; - Vector2 &operator-= (T v) { x -= v; y -= v; return *this; }; - Vector2 &operator*= (T v) { x *= v; y *= v; return *this; }; - Vector2 &operator/= (T v) { x /= v; y /= v; return *this; }; - - // Vector Math - Vector2 operator+ (const Vector2 &v) const { return Vector2(x + v.x, y + v.y); } - Vector2 operator- (const Vector2 &v) const { return Vector2(x - v.x, y - v.y); } - Vector2 &operator+= (const Vector2 &v) { x += v.x; y += v.y; return *this; }; - Vector2 &operator-= (const Vector2 &v) { x -= v.x; y -= v.y; return *this; }; - - // Norms - CGFloat norm() const { return sqrtr(squaredNorm()); } - CGFloat squaredNorm() const { return x * x + y * y; } - - // Cast - template Vector2 cast() const { return Vector2(x, y); } - CGPoint cg_point() const { return CGPointMake(x, y); }; - }; - - template - const typename Vector2::_data Vector2::_v = { &Vector2::x, &Vector2::y }; - - /** Fixed three-size vector class */ - template - struct Vector3 - { - private: - typedef T Vector3::* const _data[3]; - static const _data _v; - - public: - T x; - T y; - T z; - - // Zero vector - static const Vector3 Zero() { return Vector3(0); }; - - // Constructors - Vector3() {} - explicit Vector3(T v) : x(v), y(v), z(v) {}; - explicit Vector3(T x0, T y0, T z0) : x(x0), y(y0), z(z0) {}; - - // Copy constructor - template explicit Vector3(const Vector3 &v) : x(v.x), y(v.y), z(v.z) {} - - // Index operators - const T& operator[](size_t i) const { return this->*_v[i]; } - T& operator[](size_t i) { return this->*_v[i]; } - const T& operator()(size_t i) const { return this->*_v[i]; } - T& operator()(size_t i) { return this->*_v[i]; } - - // Backing data - T * data() { return &(this->*_v[0]); } - const T * data() const { return &(this->*_v[0]); } - - // Size - inline size_t size() const { return 3; } - - // Assignment - Vector3 &operator= (T v) { x = v; y = v; z = v; return *this;} - template Vector3 &operator= (const Vector3 &v) { x = v.x; y = v.y; z = v.z; return *this;} - - // Negation - Vector3 operator- (void) const { return Vector3(-x, -y, -z); } - - // Equality - bool operator== (T v) const { return (x == v && y == v && z = v); } - bool operator== (const Vector3 &v) const { return (x == v.x && y == v.y && z == v.z); } - - // Inequality - bool operator!= (T v) const {return (x != v || y != v || z != v); } - bool operator!= (const Vector3 &v) const { return (x != v.x || y != v.y || z != v.z); } - - // Scalar Math - Vector3 operator+ (T v) const { return Vector3(x + v, y + v, z + v); } - Vector3 operator- (T v) const { return Vector3(x - v, y - v, z - v); } - Vector3 operator* (T v) const { return Vector3(x * v, y * v, z * v); } - Vector3 operator/ (T v) const { return Vector3(x / v, y / v, z / v); } - Vector3 &operator+= (T v) { x += v; y += v; z += v; return *this; }; - Vector3 &operator-= (T v) { x -= v; y -= v; z -= v; return *this; }; - Vector3 &operator*= (T v) { x *= v; y *= v; z *= v; return *this; }; - Vector3 &operator/= (T v) { x /= v; y /= v; z /= v; return *this; }; - - // Vector Math - Vector3 operator+ (const Vector3 &v) const { return Vector3(x + v.x, y + v.y, z + v.z); } - Vector3 operator- (const Vector3 &v) const { return Vector3(x - v.x, y - v.y, z - v.z); } - Vector3 &operator+= (const Vector3 &v) { x += v.x; y += v.y; z += v.z; return *this; }; - Vector3 &operator-= (const Vector3 &v) { x -= v.x; y -= v.y; z -= v.z; return *this; }; - - // Norms - CGFloat norm() const { return sqrtr(squaredNorm()); } - CGFloat squaredNorm() const { return x * x + y * y + z * z; } - - // Cast - template Vector3 cast() const { return Vector3(x, y, z); } - }; - - template - const typename Vector3::_data Vector3::_v = { &Vector3::x, &Vector3::y, &Vector3::z }; - - /** Fixed four-size vector class */ - template - struct Vector4 - { - private: - typedef T Vector4::* const _data[4]; - static const _data _v; - - public: - T x; - T y; - T z; - T w; - - // Zero vector - static const Vector4 Zero() { return Vector4(0); }; - - // Constructors - Vector4() {} - explicit Vector4(T v) : x(v), y(v), z(v), w(v) {}; - explicit Vector4(T x0, T y0, T z0, T w0) : x(x0), y(y0), z(z0), w(w0) {}; - - // Copy constructor - template explicit Vector4(const Vector4 &v) : x(v.x), y(v.y), z(v.z), w(v.w) {} - - // Index operators - const T& operator[](size_t i) const { return this->*_v[i]; } - T& operator[](size_t i) { return this->*_v[i]; } - const T& operator()(size_t i) const { return this->*_v[i]; } - T& operator()(size_t i) { return this->*_v[i]; } - - // Backing data - T * data() { return &(this->*_v[0]); } - const T * data() const { return &(this->*_v[0]); } - - // Size - inline size_t size() const { return 4; } - - // Assignment - Vector4 &operator= (T v) { x = v; y = v; z = v; w = v; return *this;} - template Vector4 &operator= (const Vector4 &v) { x = v.x; y = v.y; z = v.z; w = v.w; return *this;} - - // Negation - Vector4 operator- (void) const { return Vector4(-x, -y, -z, -w); } - - // Equality - bool operator== (T v) const { return (x == v && y == v && z = v, w = v); } - bool operator== (const Vector4 &v) const { return (x == v.x && y == v.y && z == v.z && w == v.w); } - - // Inequality - bool operator!= (T v) const {return (x != v || y != v || z != v || w != v); } - bool operator!= (const Vector4 &v) const { return (x != v.x || y != v.y || z != v.z || w != v.w); } - - // Scalar Math - Vector4 operator+ (T v) const { return Vector4(x + v, y + v, z + v, w + v); } - Vector4 operator- (T v) const { return Vector4(x - v, y - v, z - v, w - v); } - Vector4 operator* (T v) const { return Vector4(x * v, y * v, z * v, w * v); } - Vector4 operator/ (T v) const { return Vector4(x / v, y / v, z / v, w / v); } - Vector4 &operator+= (T v) { x += v; y += v; z += v; w += v; return *this; }; - Vector4 &operator-= (T v) { x -= v; y -= v; z -= v; w -= v; return *this; }; - Vector4 &operator*= (T v) { x *= v; y *= v; z *= v; w *= v; return *this; }; - Vector4 &operator/= (T v) { x /= v; y /= v; z /= v; w /= v; return *this; }; - - // Vector Math - Vector4 operator+ (const Vector4 &v) const { return Vector4(x + v.x, y + v.y, z + v.z, w + v.w); } - Vector4 operator- (const Vector4 &v) const { return Vector4(x - v.x, y - v.y, z - v.z, w - v.w); } - Vector4 &operator+= (const Vector4 &v) { x += v.x; y += v.y; z += v.z; w += v.w; return *this; }; - Vector4 &operator-= (const Vector4 &v) { x -= v.x; y -= v.y; z -= v.z; w -= v.w; return *this; }; - - // Norms - CGFloat norm() const { return sqrtr(squaredNorm()); } - CGFloat squaredNorm() const { return x * x + y * y + z * z + w * w; } - - // Cast - template Vector4 cast() const { return Vector4(x, y, z, w); } - }; - - template - const typename Vector4::_data Vector4::_v = { &Vector4::x, &Vector4::y, &Vector4::z, &Vector4::w }; - - /** Convenience typedefs */ - typedef Vector2 Vector2f; - typedef Vector2 Vector2d; - typedef Vector2 Vector2r; - typedef Vector3 Vector3f; - typedef Vector3 Vector3d; - typedef Vector3 Vector3r; - typedef Vector4 Vector4f; - typedef Vector4 Vector4d; - typedef Vector4 Vector4r; - - /** Variable-sized vector class */ - class Vector - { - size_t _count; - CGFloat *_values; - - private: - Vector(size_t); - Vector(const Vector& other); - - public: - ~Vector(); - - // Creates a new vector instance of count with values. Initializing a vector of size 0 returns NULL. - static Vector *new_vector(NSUInteger count, const CGFloat *values); - - // Creates a new vector given a pointer to another. Can return NULL. - static Vector *new_vector(const Vector * const other); - - // Creates a variable size vector given a static vector and count. - static Vector *new_vector(NSUInteger count, Vector4r vec); - - // Size of vector - NSUInteger size() const { return _count; } - - // Returns array of values - CGFloat *data () { return _values; } - const CGFloat *data () const { return _values; }; - - // Vector2r support - Vector2r vector2r() const; - - // Vector4r support - Vector4r vector4r() const; - - // CGFloat support - static Vector *new_cg_float(CGFloat f); - - // CGPoint support - CGPoint cg_point() const; - static Vector *new_cg_point(const CGPoint &p); - - // CGSize support - CGSize cg_size() const; - static Vector *new_cg_size(const CGSize &s); - - // CGRect support - CGRect cg_rect() const; - static Vector *new_cg_rect(const CGRect &r); - -#if TARGET_OS_IPHONE - // UIEdgeInsets support - UIEdgeInsets ui_edge_insets() const; - static Vector *new_ui_edge_insets(const UIEdgeInsets &i); -#endif - - // CGAffineTransform support - CGAffineTransform cg_affine_transform() const; - static Vector *new_cg_affine_transform(const CGAffineTransform &t); - - // CGColorRef support - CGColorRef cg_color() const CF_RETURNS_RETAINED; - static Vector *new_cg_color(CGColorRef color); - -#if SCENEKIT_SDK_AVAILABLE - // SCNVector3 support - SCNVector3 scn_vector3() const; - static Vector *new_scn_vector3(const SCNVector3 &vec3); - - // SCNVector4 support - SCNVector4 scn_vector4() const; - static Vector *new_scn_vector4(const SCNVector4 &vec4); -#endif - - // operator overloads - CGFloat &operator[](size_t i) const { - NSCAssert(size() > i, @"unexpected vector size:%lu", (unsigned long)size()); - return _values[i]; - } - - // Returns the mathematical length - CGFloat norm() const; - CGFloat squaredNorm() const; - - // Round to nearest sub - void subRound(CGFloat sub); - - // Returns string description - NSString * toString() const; - - // Operator overloads - template Vector& operator= (const Vector4& other) { - size_t count = MIN(_count, other.size()); - for (size_t i = 0; i < count; i++) { - _values[i] = other[i]; - } - return *this; - } - Vector& operator= (const Vector& other); - void swap(Vector &first, Vector &second); - bool operator==(const Vector &other) const; - bool operator!=(const Vector &other) const; - }; - - /** Convenience typedefs */ - typedef std::shared_ptr VectorRef; - typedef std::shared_ptr VectorConstRef; - -} -#endif /* defined(__POP__FBVector__) */ diff --git a/Example/Pods/pop/pop/POPVector.mm b/Example/Pods/pop/pop/POPVector.mm deleted file mode 100644 index 96cee24..0000000 --- a/Example/Pods/pop/pop/POPVector.mm +++ /dev/null @@ -1,334 +0,0 @@ -/** - Copyright (c) 2014-present, Facebook, Inc. - All rights reserved. - - This source code is licensed under the BSD-style license found in the - LICENSE file in the root directory of this source tree. An additional grant - of patent rights can be found in the PATENTS file in the same directory. - */ - -#import "POPVector.h" - -#import "POPDefines.h" -#import "POPCGUtils.h" - -namespace POP -{ - - Vector::Vector(const size_t count) - { - _count = count; - _values = 0 != count ? (CGFloat *)calloc(count, sizeof(CGFloat)) : NULL; - } - - Vector::Vector(const Vector& other) - { - _count = other.size(); - _values = 0 != _count ? (CGFloat *)calloc(_count, sizeof(CGFloat)) : NULL; - if (0 != _count) { - memcpy(_values, other.data(), _count * sizeof(CGFloat)); - } - } - - Vector::~Vector() - { - if (NULL != _values) { - free(_values); - _values = NULL; - } - _count = 0; - } - - void Vector::swap(Vector &first, Vector &second) - { - using std::swap; - swap(first._count, second._count); - swap(first._values, second._values); - } - - Vector& Vector::operator=(const Vector& other) - { - Vector temp(other); - swap(*this, temp); - return *this; - } - - bool Vector::operator==(const Vector &other) const { - if (_count != other.size()) { - return false; - } - - const CGFloat * const values = other.data(); - - for (NSUInteger idx = 0; idx < _count; idx++) { - if (_values[idx] != values[idx]) { - return false; - } - } - - return true; - } - - bool Vector::operator!=(const Vector &other) const { - if (_count == other.size()) { - return false; - } - - const CGFloat * const values = other.data(); - - for (NSUInteger idx = 0; idx < _count; idx++) { - if (_values[idx] != values[idx]) { - return false; - } - } - - return true; - } - - Vector *Vector::new_vector(NSUInteger count, const CGFloat *values) - { - if (0 == count) { - return NULL; - } - - Vector *v = new Vector(count); - if (NULL != values) { - memcpy(v->_values, values, count * sizeof(CGFloat)); - } - return v; - } - - Vector *Vector::new_vector(const Vector * const other) - { - if (NULL == other) { - return NULL; - } - - return Vector::new_vector(other->size(), other->data()); - } - - Vector *Vector::new_vector(NSUInteger count, Vector4r vec) - { - if (0 == count) { - return NULL; - } - - Vector *v = new Vector(count); - - NSCAssert(count <= 4, @"unexpected count %lu", (unsigned long)count); - for (NSUInteger i = 0; i < MIN(count, (NSUInteger)4); i++) { - v->_values[i] = vec[i]; - } - - return v; - } - - Vector4r Vector::vector4r() const - { - Vector4r v = Vector4r::Zero(); - for (size_t i = 0; i < _count; i++) { - v(i) = _values[i]; - } - return v; - } - - Vector2r Vector::vector2r() const - { - Vector2r v = Vector2r::Zero(); - if (_count > 0) v(0) = _values[0]; - if (_count > 1) v(1) = _values[1]; - return v; - } - - Vector *Vector::new_cg_float(CGFloat f) - { - Vector *v = new Vector(1); - v->_values[0] = f; - return v; - } - - CGPoint Vector::cg_point () const - { - Vector2r v = vector2r(); - return CGPointMake(v(0), v(1)); - } - - Vector *Vector::new_cg_point(const CGPoint &p) - { - Vector *v = new Vector(2); - v->_values[0] = p.x; - v->_values[1] = p.y; - return v; - } - - CGSize Vector::cg_size () const - { - Vector2r v = vector2r(); - return CGSizeMake(v(0), v(1)); - } - - Vector *Vector::new_cg_size(const CGSize &s) - { - Vector *v = new Vector(2); - v->_values[0] = s.width; - v->_values[1] = s.height; - return v; - } - - CGRect Vector::cg_rect() const - { - return _count < 4 ? CGRectZero : CGRectMake(_values[0], _values[1], _values[2], _values[3]); - } - - Vector *Vector::new_cg_rect(const CGRect &r) - { - Vector *v = new Vector(4); - v->_values[0] = r.origin.x; - v->_values[1] = r.origin.y; - v->_values[2] = r.size.width; - v->_values[3] = r.size.height; - return v; - } - -#if TARGET_OS_IPHONE - - UIEdgeInsets Vector::ui_edge_insets() const - { - return _count < 4 ? UIEdgeInsetsZero : UIEdgeInsetsMake(_values[0], _values[1], _values[2], _values[3]); - } - - Vector *Vector::new_ui_edge_insets(const UIEdgeInsets &i) - { - Vector *v = new Vector(4); - v->_values[0] = i.top; - v->_values[1] = i.left; - v->_values[2] = i.bottom; - v->_values[3] = i.right; - return v; - } - -#endif - - CGAffineTransform Vector::cg_affine_transform() const - { - if (_count < 6) { - return CGAffineTransformIdentity; - } - - NSCAssert(size() >= 6, @"unexpected vector size:%lu", (unsigned long)size()); - CGAffineTransform t; - t.a = _values[0]; - t.b = _values[1]; - t.c = _values[2]; - t.d = _values[3]; - t.tx = _values[4]; - t.ty = _values[5]; - return t; - } - - Vector *Vector::new_cg_affine_transform(const CGAffineTransform &t) - { - Vector *v = new Vector(6); - v->_values[0] = t.a; - v->_values[1] = t.b; - v->_values[2] = t.c; - v->_values[3] = t.d; - v->_values[4] = t.tx; - v->_values[5] = t.ty; - return v; - } - - CGColorRef Vector::cg_color() const - { - if (_count < 4) { - return NULL; - } - return POPCGColorRGBACreate(_values); - } - - Vector *Vector::new_cg_color(CGColorRef color) - { - CGFloat rgba[4]; - POPCGColorGetRGBAComponents(color, rgba); - return new_vector(4, rgba); - } - -#if SCENEKIT_SDK_AVAILABLE - SCNVector3 Vector::scn_vector3() const - { - return _count < 3 ? SCNVector3Make(0.0, 0.0, 0.0) : SCNVector3Make(_values[0], _values[1], _values[2]); - } - - Vector *Vector::new_scn_vector3(const SCNVector3 &vec3) - { - Vector *v = new Vector(3); - v->_values[0] = vec3.x; - v->_values[1] = vec3.y; - v->_values[2] = vec3.z; - return v; - } - - SCNVector4 Vector::scn_vector4() const - { - return _count < 4 ? SCNVector4Make(0.0, 0.0, 0.0, 0.0) : SCNVector4Make(_values[0], _values[1], _values[2], _values[3]); - } - - Vector *Vector::new_scn_vector4(const SCNVector4 &vec4) - { - Vector *v = new Vector(4); - v->_values[0] = vec4.x; - v->_values[1] = vec4.y; - v->_values[2] = vec4.z; - v->_values[3] = vec4.w; - return v; - } -#endif - - void Vector::subRound(CGFloat sub) - { - for (NSUInteger idx = 0; idx < _count; idx++) { - _values[idx] = POPSubRound(_values[idx], sub); - } - } - - CGFloat Vector::norm() const - { - return sqrtr(squaredNorm()); - } - - CGFloat Vector::squaredNorm() const - { - CGFloat d = 0; - for (NSUInteger idx = 0; idx < _count; idx++) { - d += (_values[idx] * _values[idx]); - } - return d; - } - - NSString * Vector::toString() const - { - if (0 == _count) - return @"()"; - - if (1 == _count) - return [NSString stringWithFormat:@"%f", _values[0]]; - - if (2 == _count) - return [NSString stringWithFormat:@"(%.3f, %.3f)", _values[0], _values[1]]; - - NSMutableString *s = [NSMutableString stringWithCapacity:10]; - - for (NSUInteger idx = 0; idx < _count; idx++) { - if (0 == idx) { - [s appendFormat:@"[%.3f", _values[idx]]; - } else if (idx == _count - 1) { - [s appendFormat:@", %.3f]", _values[idx]]; - } else { - [s appendFormat:@", %.3f", _values[idx]]; - } - } - - return s; - - } -} diff --git a/Example/Pods/pop/pop/WebCore/FloatConversion.h b/Example/Pods/pop/pop/WebCore/FloatConversion.h deleted file mode 100644 index 4a16166..0000000 --- a/Example/Pods/pop/pop/WebCore/FloatConversion.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) 2007 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef FloatConversion_h -#define FloatConversion_h - -#include - -namespace WebCore { - - template - float narrowPrecisionToFloat(T); - - template<> - inline float narrowPrecisionToFloat(double number) - { - return static_cast(number); - } - - template - CGFloat narrowPrecisionToCGFloat(T); - - template<> - inline CGFloat narrowPrecisionToCGFloat(double number) - { - return static_cast(number); - } - -} // namespace WebCore - -#endif // FloatConversion_h diff --git a/Example/Pods/pop/pop/WebCore/TransformationMatrix.cpp b/Example/Pods/pop/pop/WebCore/TransformationMatrix.cpp deleted file mode 100644 index 7264ab5..0000000 --- a/Example/Pods/pop/pop/WebCore/TransformationMatrix.cpp +++ /dev/null @@ -1,1074 +0,0 @@ -/* - * Copyright (C) 2005, 2006 Apple Computer, Inc. All rights reserved. - * Copyright (C) 2009 Torch Mobile, Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "TransformationMatrix.h" - -#include - -#include "FloatConversion.h" - -inline double deg2rad(double d) { return d * M_PI / 180.0; } -inline double rad2deg(double r) { return r * 180.0 / M_PI; } -inline double deg2grad(double d) { return d * 400.0 / 360.0; } -inline double grad2deg(double g) { return g * 360.0 / 400.0; } -inline double turn2deg(double t) { return t * 360.0; } -inline double deg2turn(double d) { return d / 360.0; } -inline double rad2grad(double r) { return r * 200.0 / M_PI; } -inline double grad2rad(double g) { return g * M_PI / 200.0; } - -//using namespace std; - -namespace WebCore { - - // - // Supporting Math Functions - // - // This is a set of function from various places (attributed inline) to do things like - // inversion and decomposition of a 4x4 matrix. They are used throughout the code - // - - // - // Adapted from Matrix Inversion by Richard Carling, Graphics Gems . - - // EULA: The Graphics Gems code is copyright-protected. In other words, you cannot claim the text of the code - // as your own and resell it. Using the code is permitted in any program, product, or library, non-commercial - // or commercial. Giving credit is not required, though is a nice gesture. The code comes as-is, and if there - // are any flaws or problems with any Gems code, nobody involved with Gems - authors, editors, publishers, or - // webmasters - are to be held responsible. Basically, don't be a jerk, and remember that anything free comes - // with no guarantee. - - // A clarification about the storage of matrix elements - // - // This class uses a 2 dimensional array internally to store the elements of the matrix. The first index into - // the array refers to the column that the element lies in; the second index refers to the row. - // - // In other words, this is the layout of the matrix: - // - // | m_matrix[0][0] m_matrix[1][0] m_matrix[2][0] m_matrix[3][0] | - // | m_matrix[0][1] m_matrix[1][1] m_matrix[2][1] m_matrix[3][1] | - // | m_matrix[0][2] m_matrix[1][2] m_matrix[2][2] m_matrix[3][2] | - // | m_matrix[0][3] m_matrix[1][3] m_matrix[2][3] m_matrix[3][3] | - - typedef double Vector4[4]; - typedef double Vector3[3]; - - const double SMALL_NUMBER = 1.e-8; - - // inverse(original_matrix, inverse_matrix) - // - // calculate the inverse of a 4x4 matrix - // - // -1 - // A = ___1__ adjoint A - // det A - - // double = determinant2x2(double a, double b, double c, double d) - // - // calculate the determinant of a 2x2 matrix. - - static double determinant2x2(double a, double b, double c, double d) - { - return a * d - b * c; - } - - // double = determinant3x3(a1, a2, a3, b1, b2, b3, c1, c2, c3) - // - // Calculate the determinant of a 3x3 matrix - // in the form - // - // | a1, b1, c1 | - // | a2, b2, c2 | - // | a3, b3, c3 | - - static double determinant3x3(double a1, double a2, double a3, double b1, double b2, double b3, double c1, double c2, double c3) - { - return a1 * determinant2x2(b2, b3, c2, c3) - - b1 * determinant2x2(a2, a3, c2, c3) - + c1 * determinant2x2(a2, a3, b2, b3); - } - - // double = determinant4x4(matrix) - // - // calculate the determinant of a 4x4 matrix. - - static double determinant4x4(const TransformationMatrix::Matrix4& m) - { - // Assign to individual variable names to aid selecting - // correct elements - - double a1 = m[0][0]; - double b1 = m[0][1]; - double c1 = m[0][2]; - double d1 = m[0][3]; - - double a2 = m[1][0]; - double b2 = m[1][1]; - double c2 = m[1][2]; - double d2 = m[1][3]; - - double a3 = m[2][0]; - double b3 = m[2][1]; - double c3 = m[2][2]; - double d3 = m[2][3]; - - double a4 = m[3][0]; - double b4 = m[3][1]; - double c4 = m[3][2]; - double d4 = m[3][3]; - - return a1 * determinant3x3(b2, b3, b4, c2, c3, c4, d2, d3, d4) - - b1 * determinant3x3(a2, a3, a4, c2, c3, c4, d2, d3, d4) - + c1 * determinant3x3(a2, a3, a4, b2, b3, b4, d2, d3, d4) - - d1 * determinant3x3(a2, a3, a4, b2, b3, b4, c2, c3, c4); - } - - // adjoint( original_matrix, inverse_matrix ) - // - // calculate the adjoint of a 4x4 matrix - // - // Let a denote the minor determinant of matrix A obtained by - // ij - // - // deleting the ith row and jth column from A. - // - // i+j - // Let b = (-1) a - // ij ji - // - // The matrix B = (b ) is the adjoint of A - // ij - - static void adjoint(const TransformationMatrix::Matrix4& matrix, TransformationMatrix::Matrix4& result) - { - // Assign to individual variable names to aid - // selecting correct values - double a1 = matrix[0][0]; - double b1 = matrix[0][1]; - double c1 = matrix[0][2]; - double d1 = matrix[0][3]; - - double a2 = matrix[1][0]; - double b2 = matrix[1][1]; - double c2 = matrix[1][2]; - double d2 = matrix[1][3]; - - double a3 = matrix[2][0]; - double b3 = matrix[2][1]; - double c3 = matrix[2][2]; - double d3 = matrix[2][3]; - - double a4 = matrix[3][0]; - double b4 = matrix[3][1]; - double c4 = matrix[3][2]; - double d4 = matrix[3][3]; - - // Row column labeling reversed since we transpose rows & columns - result[0][0] = determinant3x3(b2, b3, b4, c2, c3, c4, d2, d3, d4); - result[1][0] = - determinant3x3(a2, a3, a4, c2, c3, c4, d2, d3, d4); - result[2][0] = determinant3x3(a2, a3, a4, b2, b3, b4, d2, d3, d4); - result[3][0] = - determinant3x3(a2, a3, a4, b2, b3, b4, c2, c3, c4); - - result[0][1] = - determinant3x3(b1, b3, b4, c1, c3, c4, d1, d3, d4); - result[1][1] = determinant3x3(a1, a3, a4, c1, c3, c4, d1, d3, d4); - result[2][1] = - determinant3x3(a1, a3, a4, b1, b3, b4, d1, d3, d4); - result[3][1] = determinant3x3(a1, a3, a4, b1, b3, b4, c1, c3, c4); - - result[0][2] = determinant3x3(b1, b2, b4, c1, c2, c4, d1, d2, d4); - result[1][2] = - determinant3x3(a1, a2, a4, c1, c2, c4, d1, d2, d4); - result[2][2] = determinant3x3(a1, a2, a4, b1, b2, b4, d1, d2, d4); - result[3][2] = - determinant3x3(a1, a2, a4, b1, b2, b4, c1, c2, c4); - - result[0][3] = - determinant3x3(b1, b2, b3, c1, c2, c3, d1, d2, d3); - result[1][3] = determinant3x3(a1, a2, a3, c1, c2, c3, d1, d2, d3); - result[2][3] = - determinant3x3(a1, a2, a3, b1, b2, b3, d1, d2, d3); - result[3][3] = determinant3x3(a1, a2, a3, b1, b2, b3, c1, c2, c3); - } - - // Returns false if the matrix is not invertible - static bool inverse(const TransformationMatrix::Matrix4& matrix, TransformationMatrix::Matrix4& result) - { - // Calculate the adjoint matrix - adjoint(matrix, result); - - // Calculate the 4x4 determinant - // If the determinant is zero, - // then the inverse matrix is not unique. - double det = determinant4x4(matrix); - - if (fabs(det) < SMALL_NUMBER) - return false; - - // Scale the adjoint matrix to get the inverse - - for (int i = 0; i < 4; i++) - for (int j = 0; j < 4; j++) - result[i][j] = result[i][j] / det; - - return true; - } - - // End of code adapted from Matrix Inversion by Richard Carling - - // Perform a decomposition on the passed matrix, return false if unsuccessful - // From Graphics Gems: unmatrix.c - - // Transpose rotation portion of matrix a, return b - static void transposeMatrix4(const TransformationMatrix::Matrix4& a, TransformationMatrix::Matrix4& b) - { - for (int i = 0; i < 4; i++) - for (int j = 0; j < 4; j++) - b[i][j] = a[j][i]; - } - - // Multiply a homogeneous point by a matrix and return the transformed point - static void v4MulPointByMatrix(const Vector4 p, const TransformationMatrix::Matrix4& m, Vector4 result) - { - result[0] = (p[0] * m[0][0]) + (p[1] * m[1][0]) + - (p[2] * m[2][0]) + (p[3] * m[3][0]); - result[1] = (p[0] * m[0][1]) + (p[1] * m[1][1]) + - (p[2] * m[2][1]) + (p[3] * m[3][1]); - result[2] = (p[0] * m[0][2]) + (p[1] * m[1][2]) + - (p[2] * m[2][2]) + (p[3] * m[3][2]); - result[3] = (p[0] * m[0][3]) + (p[1] * m[1][3]) + - (p[2] * m[2][3]) + (p[3] * m[3][3]); - } - - static double v3Length(Vector3 a) - { - return sqrt((a[0] * a[0]) + (a[1] * a[1]) + (a[2] * a[2])); - } - - static void v3Scale(Vector3 v, double desiredLength) - { - double len = v3Length(v); - if (len != 0) { - double l = desiredLength / len; - v[0] *= l; - v[1] *= l; - v[2] *= l; - } - } - - static double v3Dot(const Vector3 a, const Vector3 b) - { - return (a[0] * b[0]) + (a[1] * b[1]) + (a[2] * b[2]); - } - - // Make a linear combination of two vectors and return the result. - // result = (a * ascl) + (b * bscl) - static void v3Combine(const Vector3 a, const Vector3 b, Vector3 result, double ascl, double bscl) - { - result[0] = (ascl * a[0]) + (bscl * b[0]); - result[1] = (ascl * a[1]) + (bscl * b[1]); - result[2] = (ascl * a[2]) + (bscl * b[2]); - } - - // Return the cross product result = a cross b */ - static void v3Cross(const Vector3 a, const Vector3 b, Vector3 result) - { - result[0] = (a[1] * b[2]) - (a[2] * b[1]); - result[1] = (a[2] * b[0]) - (a[0] * b[2]); - result[2] = (a[0] * b[1]) - (a[1] * b[0]); - } - - static bool decompose(const TransformationMatrix::Matrix4& mat, TransformationMatrix::DecomposedType& result) - { - TransformationMatrix::Matrix4 localMatrix; - memcpy(localMatrix, mat, sizeof(TransformationMatrix::Matrix4)); - - // Normalize the matrix. - if (localMatrix[3][3] == 0) - return false; - - int i, j; - for (i = 0; i < 4; i++) - for (j = 0; j < 4; j++) - localMatrix[i][j] /= localMatrix[3][3]; - - // perspectiveMatrix is used to solve for perspective, but it also provides - // an easy way to test for singularity of the upper 3x3 component. - TransformationMatrix::Matrix4 perspectiveMatrix; - memcpy(perspectiveMatrix, localMatrix, sizeof(TransformationMatrix::Matrix4)); - for (i = 0; i < 3; i++) - perspectiveMatrix[i][3] = 0; - perspectiveMatrix[3][3] = 1; - - if (determinant4x4(perspectiveMatrix) == 0) - return false; - - // First, isolate perspective. This is the messiest. - if (localMatrix[0][3] != 0 || localMatrix[1][3] != 0 || localMatrix[2][3] != 0) { - // rightHandSide is the right hand side of the equation. - Vector4 rightHandSide; - rightHandSide[0] = localMatrix[0][3]; - rightHandSide[1] = localMatrix[1][3]; - rightHandSide[2] = localMatrix[2][3]; - rightHandSide[3] = localMatrix[3][3]; - - // Solve the equation by inverting perspectiveMatrix and multiplying - // rightHandSide by the inverse. (This is the easiest way, not - // necessarily the best.) - TransformationMatrix::Matrix4 inversePerspectiveMatrix, transposedInversePerspectiveMatrix; - inverse(perspectiveMatrix, inversePerspectiveMatrix); - transposeMatrix4(inversePerspectiveMatrix, transposedInversePerspectiveMatrix); - - Vector4 perspectivePoint; - v4MulPointByMatrix(rightHandSide, transposedInversePerspectiveMatrix, perspectivePoint); - - result.perspectiveX = perspectivePoint[0]; - result.perspectiveY = perspectivePoint[1]; - result.perspectiveZ = perspectivePoint[2]; - result.perspectiveW = perspectivePoint[3]; - - // Clear the perspective partition - localMatrix[0][3] = localMatrix[1][3] = localMatrix[2][3] = 0; - localMatrix[3][3] = 1; - } else { - // No perspective. - result.perspectiveX = result.perspectiveY = result.perspectiveZ = 0; - result.perspectiveW = 1; - } - - // Next take care of translation (easy). - result.translateX = localMatrix[3][0]; - localMatrix[3][0] = 0; - result.translateY = localMatrix[3][1]; - localMatrix[3][1] = 0; - result.translateZ = localMatrix[3][2]; - localMatrix[3][2] = 0; - - // Vector4 type and functions need to be added to the common set. - Vector3 row[3], pdum3; - - // Now get scale and shear. - for (i = 0; i < 3; i++) { - row[i][0] = localMatrix[i][0]; - row[i][1] = localMatrix[i][1]; - row[i][2] = localMatrix[i][2]; - } - - // Compute X scale factor and normalize first row. - result.scaleX = v3Length(row[0]); - v3Scale(row[0], 1.0); - - // Compute XY shear factor and make 2nd row orthogonal to 1st. - result.skewXY = v3Dot(row[0], row[1]); - v3Combine(row[1], row[0], row[1], 1.0, -result.skewXY); - - // Now, compute Y scale and normalize 2nd row. - result.scaleY = v3Length(row[1]); - v3Scale(row[1], 1.0); - result.skewXY /= result.scaleY; - - // Compute XZ and YZ shears, orthogonalize 3rd row. - result.skewXZ = v3Dot(row[0], row[2]); - v3Combine(row[2], row[0], row[2], 1.0, -result.skewXZ); - result.skewYZ = v3Dot(row[1], row[2]); - v3Combine(row[2], row[1], row[2], 1.0, -result.skewYZ); - - // Next, get Z scale and normalize 3rd row. - result.scaleZ = v3Length(row[2]); - v3Scale(row[2], 1.0); - result.skewXZ /= result.scaleZ; - result.skewYZ /= result.scaleZ; - - // At this point, the matrix (in rows[]) is orthonormal. - // Check for a coordinate system flip. If the determinant - // is -1, then negate the matrix and the scaling factors. - v3Cross(row[1], row[2], pdum3); - if (v3Dot(row[0], pdum3) < 0) { - - result.scaleX *= -1; - result.scaleY *= -1; - result.scaleZ *= -1; - - for (i = 0; i < 3; i++) { - row[i][0] *= -1; - row[i][1] *= -1; - row[i][2] *= -1; - } - } - - // Now, get the rotations out, as described in the gem. - - result.rotateY = asin(-row[0][2]); - if (cos(result.rotateY) != 0) { - result.rotateX = atan2(row[1][2], row[2][2]); - result.rotateZ = atan2(row[0][1], row[0][0]); - } else { - result.rotateX = atan2(-row[2][0], row[1][1]); - result.rotateZ = 0; - } - - double s, t, x, y, z, w; - - t = row[0][0] + row[1][1] + row[2][2] + 1.0; - - if (t > 1e-4) { - s = 0.5 / sqrt(t); - w = 0.25 / s; - x = (row[2][1] - row[1][2]) * s; - y = (row[0][2] - row[2][0]) * s; - z = (row[1][0] - row[0][1]) * s; - } else if (row[0][0] > row[1][1] && row[0][0] > row[2][2]) { - s = sqrt (1.0 + row[0][0] - row[1][1] - row[2][2]) * 2.0; // S=4*qx - x = 0.25 * s; - y = (row[0][1] + row[1][0]) / s; - z = (row[0][2] + row[2][0]) / s; - w = (row[2][1] - row[1][2]) / s; - } else if (row[1][1] > row[2][2]) { - s = sqrt (1.0 + row[1][1] - row[0][0] - row[2][2]) * 2.0; // S=4*qy - x = (row[0][1] + row[1][0]) / s; - y = 0.25 * s; - z = (row[1][2] + row[2][1]) / s; - w = (row[0][2] - row[2][0]) / s; - } else { - s = sqrt(1.0 + row[2][2] - row[0][0] - row[1][1]) * 2.0; // S=4*qz - x = (row[0][2] + row[2][0]) / s; - y = (row[1][2] + row[2][1]) / s; - z = 0.25 * s; - w = (row[1][0] - row[0][1]) / s; - } - - result.quaternionX = x; - result.quaternionY = y; - result.quaternionZ = z; - result.quaternionW = w; - - return true; - } - - // Perform a spherical linear interpolation between the two - // passed quaternions with 0 <= t <= 1 - static void slerp(double qa[4], const double qb[4], double t) - { - double ax, ay, az, aw; - double bx, by, bz, bw; - double cx, cy, cz, cw; - double angle; - double th, invth, scale, invscale; - - ax = qa[0]; ay = qa[1]; az = qa[2]; aw = qa[3]; - bx = qb[0]; by = qb[1]; bz = qb[2]; bw = qb[3]; - - angle = ax * bx + ay * by + az * bz + aw * bw; - - if (angle < 0.0) { - ax = -ax; ay = -ay; - az = -az; aw = -aw; - angle = -angle; - } - - if (angle + 1.0 > .05) { - if (1.0 - angle >= .05) { - th = acos (angle); - invth = 1.0 / sin (th); - scale = sin (th * (1.0 - t)) * invth; - invscale = sin (th * t) * invth; - } else { - scale = 1.0 - t; - invscale = t; - } - } else { - bx = -ay; - by = ax; - bz = -aw; - bw = az; - scale = sin(M_PI * (.5 - t)); - invscale = sin (M_PI * t); - } - - cx = ax * scale + bx * invscale; - cy = ay * scale + by * invscale; - cz = az * scale + bz * invscale; - cw = aw * scale + bw * invscale; - - qa[0] = cx; qa[1] = cy; qa[2] = cz; qa[3] = cw; - } - - // End of Supporting Math Functions - - TransformationMatrix::TransformationMatrix(const CGAffineTransform& t) - { - setMatrix(t.a, t.b, t.c, t.d, t.tx, t.ty); - } - - TransformationMatrix::TransformationMatrix(const CATransform3D& t) - { - setMatrix( - t.m11, t.m12, t.m13, t.m14, - t.m21, t.m22, t.m23, t.m24, - t.m31, t.m32, t.m33, t.m34, - t.m41, t.m42, t.m43, t.m44); - } - - CATransform3D TransformationMatrix::transform3d() const - { - CATransform3D t; - t.m11 = narrowPrecisionToFloat(m11()); - t.m12 = narrowPrecisionToFloat(m12()); - t.m13 = narrowPrecisionToFloat(m13()); - t.m14 = narrowPrecisionToFloat(m14()); - t.m21 = narrowPrecisionToFloat(m21()); - t.m22 = narrowPrecisionToFloat(m22()); - t.m23 = narrowPrecisionToFloat(m23()); - t.m24 = narrowPrecisionToFloat(m24()); - t.m31 = narrowPrecisionToFloat(m31()); - t.m32 = narrowPrecisionToFloat(m32()); - t.m33 = narrowPrecisionToFloat(m33()); - t.m34 = narrowPrecisionToFloat(m34()); - t.m41 = narrowPrecisionToFloat(m41()); - t.m42 = narrowPrecisionToFloat(m42()); - t.m43 = narrowPrecisionToFloat(m43()); - t.m44 = narrowPrecisionToFloat(m44()); - return t; - } - - CGAffineTransform TransformationMatrix::affineTransform () const - { - CGAffineTransform t; - t.a = narrowPrecisionToFloat(m11()); - t.b = narrowPrecisionToFloat(m12()); - t.c = narrowPrecisionToFloat(m21()); - t.d = narrowPrecisionToFloat(m22()); - t.tx = narrowPrecisionToFloat(m41()); - t.ty = narrowPrecisionToFloat(m42()); - return t; - } - - TransformationMatrix::operator CATransform3D() const - { - return transform3d(); - } - - TransformationMatrix& TransformationMatrix::scale(double s) - { - return scaleNonUniform(s, s); - } - - TransformationMatrix& TransformationMatrix::rotateFromVector(double x, double y) - { - return rotate(rad2deg(atan2(y, x))); - } - - TransformationMatrix& TransformationMatrix::flipX() - { - return scaleNonUniform(-1.0, 1.0); - } - - TransformationMatrix& TransformationMatrix::flipY() - { - return scaleNonUniform(1.0, -1.0); - } - - TransformationMatrix& TransformationMatrix::scaleNonUniform(double sx, double sy) - { - m_matrix[0][0] *= sx; - m_matrix[0][1] *= sx; - m_matrix[0][2] *= sx; - m_matrix[0][3] *= sx; - - m_matrix[1][0] *= sy; - m_matrix[1][1] *= sy; - m_matrix[1][2] *= sy; - m_matrix[1][3] *= sy; - return *this; - } - - TransformationMatrix& TransformationMatrix::scale3d(double sx, double sy, double sz) - { - scaleNonUniform(sx, sy); - - m_matrix[2][0] *= sz; - m_matrix[2][1] *= sz; - m_matrix[2][2] *= sz; - m_matrix[2][3] *= sz; - return *this; - } - - TransformationMatrix& TransformationMatrix::rotate3d(double x, double y, double z, double angle) - { - // Normalize the axis of rotation - double length = sqrt(x * x + y * y + z * z); - if (length == 0) { - // A direction vector that cannot be normalized, such as [0, 0, 0], will cause the rotation to not be applied. - return *this; - } else if (length != 1) { - x /= length; - y /= length; - z /= length; - } - - // Angles are in degrees. Switch to radians. - angle = deg2rad(angle); - - double sinTheta = sin(angle); - double cosTheta = cos(angle); - - TransformationMatrix mat; - - // Optimize cases where the axis is along a major axis - if (x == 1.0 && y == 0.0 && z == 0.0) { - mat.m_matrix[0][0] = 1.0; - mat.m_matrix[0][1] = 0.0; - mat.m_matrix[0][2] = 0.0; - mat.m_matrix[1][0] = 0.0; - mat.m_matrix[1][1] = cosTheta; - mat.m_matrix[1][2] = sinTheta; - mat.m_matrix[2][0] = 0.0; - mat.m_matrix[2][1] = -sinTheta; - mat.m_matrix[2][2] = cosTheta; - mat.m_matrix[0][3] = mat.m_matrix[1][3] = mat.m_matrix[2][3] = 0.0; - mat.m_matrix[3][0] = mat.m_matrix[3][1] = mat.m_matrix[3][2] = 0.0; - mat.m_matrix[3][3] = 1.0; - } else if (x == 0.0 && y == 1.0 && z == 0.0) { - mat.m_matrix[0][0] = cosTheta; - mat.m_matrix[0][1] = 0.0; - mat.m_matrix[0][2] = -sinTheta; - mat.m_matrix[1][0] = 0.0; - mat.m_matrix[1][1] = 1.0; - mat.m_matrix[1][2] = 0.0; - mat.m_matrix[2][0] = sinTheta; - mat.m_matrix[2][1] = 0.0; - mat.m_matrix[2][2] = cosTheta; - mat.m_matrix[0][3] = mat.m_matrix[1][3] = mat.m_matrix[2][3] = 0.0; - mat.m_matrix[3][0] = mat.m_matrix[3][1] = mat.m_matrix[3][2] = 0.0; - mat.m_matrix[3][3] = 1.0; - } else if (x == 0.0 && y == 0.0 && z == 1.0) { - mat.m_matrix[0][0] = cosTheta; - mat.m_matrix[0][1] = sinTheta; - mat.m_matrix[0][2] = 0.0; - mat.m_matrix[1][0] = -sinTheta; - mat.m_matrix[1][1] = cosTheta; - mat.m_matrix[1][2] = 0.0; - mat.m_matrix[2][0] = 0.0; - mat.m_matrix[2][1] = 0.0; - mat.m_matrix[2][2] = 1.0; - mat.m_matrix[0][3] = mat.m_matrix[1][3] = mat.m_matrix[2][3] = 0.0; - mat.m_matrix[3][0] = mat.m_matrix[3][1] = mat.m_matrix[3][2] = 0.0; - mat.m_matrix[3][3] = 1.0; - } else { - // This case is the rotation about an arbitrary unit vector. - // - // Formula is adapted from Wikipedia article on Rotation matrix, - // http://en.wikipedia.org/wiki/Rotation_matrix#Rotation_matrix_from_axis_and_angle - // - // An alternate resource with the same matrix: http://www.fastgraph.com/makegames/3drotation/ - // - double oneMinusCosTheta = 1 - cosTheta; - mat.m_matrix[0][0] = cosTheta + x * x * oneMinusCosTheta; - mat.m_matrix[0][1] = y * x * oneMinusCosTheta + z * sinTheta; - mat.m_matrix[0][2] = z * x * oneMinusCosTheta - y * sinTheta; - mat.m_matrix[1][0] = x * y * oneMinusCosTheta - z * sinTheta; - mat.m_matrix[1][1] = cosTheta + y * y * oneMinusCosTheta; - mat.m_matrix[1][2] = z * y * oneMinusCosTheta + x * sinTheta; - mat.m_matrix[2][0] = x * z * oneMinusCosTheta + y * sinTheta; - mat.m_matrix[2][1] = y * z * oneMinusCosTheta - x * sinTheta; - mat.m_matrix[2][2] = cosTheta + z * z * oneMinusCosTheta; - mat.m_matrix[0][3] = mat.m_matrix[1][3] = mat.m_matrix[2][3] = 0.0; - mat.m_matrix[3][0] = mat.m_matrix[3][1] = mat.m_matrix[3][2] = 0.0; - mat.m_matrix[3][3] = 1.0; - } - multiply(mat); - return *this; - } - - TransformationMatrix& TransformationMatrix::rotate3d(double rx, double ry, double rz) - { - // Angles are in degrees. Switch to radians. - rx = deg2rad(rx); - ry = deg2rad(ry); - rz = deg2rad(rz); - - TransformationMatrix mat; - - double sinTheta = sin(rz); - double cosTheta = cos(rz); - - mat.m_matrix[0][0] = cosTheta; - mat.m_matrix[0][1] = sinTheta; - mat.m_matrix[0][2] = 0.0; - mat.m_matrix[1][0] = -sinTheta; - mat.m_matrix[1][1] = cosTheta; - mat.m_matrix[1][2] = 0.0; - mat.m_matrix[2][0] = 0.0; - mat.m_matrix[2][1] = 0.0; - mat.m_matrix[2][2] = 1.0; - mat.m_matrix[0][3] = mat.m_matrix[1][3] = mat.m_matrix[2][3] = 0.0; - mat.m_matrix[3][0] = mat.m_matrix[3][1] = mat.m_matrix[3][2] = 0.0; - mat.m_matrix[3][3] = 1.0; - - TransformationMatrix rmat(mat); - - sinTheta = sin(ry); - cosTheta = cos(ry); - - mat.m_matrix[0][0] = cosTheta; - mat.m_matrix[0][1] = 0.0; - mat.m_matrix[0][2] = -sinTheta; - mat.m_matrix[1][0] = 0.0; - mat.m_matrix[1][1] = 1.0; - mat.m_matrix[1][2] = 0.0; - mat.m_matrix[2][0] = sinTheta; - mat.m_matrix[2][1] = 0.0; - mat.m_matrix[2][2] = cosTheta; - mat.m_matrix[0][3] = mat.m_matrix[1][3] = mat.m_matrix[2][3] = 0.0; - mat.m_matrix[3][0] = mat.m_matrix[3][1] = mat.m_matrix[3][2] = 0.0; - mat.m_matrix[3][3] = 1.0; - - rmat.multiply(mat); - - sinTheta = sin(rx); - cosTheta = cos(rx); - - mat.m_matrix[0][0] = 1.0; - mat.m_matrix[0][1] = 0.0; - mat.m_matrix[0][2] = 0.0; - mat.m_matrix[1][0] = 0.0; - mat.m_matrix[1][1] = cosTheta; - mat.m_matrix[1][2] = sinTheta; - mat.m_matrix[2][0] = 0.0; - mat.m_matrix[2][1] = -sinTheta; - mat.m_matrix[2][2] = cosTheta; - mat.m_matrix[0][3] = mat.m_matrix[1][3] = mat.m_matrix[2][3] = 0.0; - mat.m_matrix[3][0] = mat.m_matrix[3][1] = mat.m_matrix[3][2] = 0.0; - mat.m_matrix[3][3] = 1.0; - - rmat.multiply(mat); - - multiply(rmat); - return *this; - } - - TransformationMatrix& TransformationMatrix::translate(double tx, double ty) - { - m_matrix[3][0] += tx * m_matrix[0][0] + ty * m_matrix[1][0]; - m_matrix[3][1] += tx * m_matrix[0][1] + ty * m_matrix[1][1]; - m_matrix[3][2] += tx * m_matrix[0][2] + ty * m_matrix[1][2]; - m_matrix[3][3] += tx * m_matrix[0][3] + ty * m_matrix[1][3]; - return *this; - } - - TransformationMatrix& TransformationMatrix::translate3d(double tx, double ty, double tz) - { - m_matrix[3][0] += tx * m_matrix[0][0] + ty * m_matrix[1][0] + tz * m_matrix[2][0]; - m_matrix[3][1] += tx * m_matrix[0][1] + ty * m_matrix[1][1] + tz * m_matrix[2][1]; - m_matrix[3][2] += tx * m_matrix[0][2] + ty * m_matrix[1][2] + tz * m_matrix[2][2]; - m_matrix[3][3] += tx * m_matrix[0][3] + ty * m_matrix[1][3] + tz * m_matrix[2][3]; - return *this; - } - - TransformationMatrix& TransformationMatrix::translateRight(double tx, double ty) - { - if (tx != 0) { - m_matrix[0][0] += m_matrix[0][3] * tx; - m_matrix[1][0] += m_matrix[1][3] * tx; - m_matrix[2][0] += m_matrix[2][3] * tx; - m_matrix[3][0] += m_matrix[3][3] * tx; - } - - if (ty != 0) { - m_matrix[0][1] += m_matrix[0][3] * ty; - m_matrix[1][1] += m_matrix[1][3] * ty; - m_matrix[2][1] += m_matrix[2][3] * ty; - m_matrix[3][1] += m_matrix[3][3] * ty; - } - - return *this; - } - - TransformationMatrix& TransformationMatrix::translateRight3d(double tx, double ty, double tz) - { - translateRight(tx, ty); - if (tz != 0) { - m_matrix[0][2] += m_matrix[0][3] * tz; - m_matrix[1][2] += m_matrix[1][3] * tz; - m_matrix[2][2] += m_matrix[2][3] * tz; - m_matrix[3][2] += m_matrix[3][3] * tz; - } - - return *this; - } - - TransformationMatrix& TransformationMatrix::skew(double sx, double sy) - { - // angles are in degrees. Switch to radians - sx = deg2rad(sx); - sy = deg2rad(sy); - - TransformationMatrix mat; - mat.m_matrix[0][1] = tan(sy); // note that the y shear goes in the first row - mat.m_matrix[1][0] = tan(sx); // and the x shear in the second row - - multiply(mat); - return *this; - } - - TransformationMatrix& TransformationMatrix::applyPerspective(double p) - { - TransformationMatrix mat; - if (p != 0) - mat.m_matrix[2][3] = -1/p; - - multiply(mat); - return *this; - } - - // this = mat * this. - TransformationMatrix& TransformationMatrix::multiply(const TransformationMatrix& mat) - { - Matrix4 tmp; - - tmp[0][0] = (mat.m_matrix[0][0] * m_matrix[0][0] + mat.m_matrix[0][1] * m_matrix[1][0] - + mat.m_matrix[0][2] * m_matrix[2][0] + mat.m_matrix[0][3] * m_matrix[3][0]); - tmp[0][1] = (mat.m_matrix[0][0] * m_matrix[0][1] + mat.m_matrix[0][1] * m_matrix[1][1] - + mat.m_matrix[0][2] * m_matrix[2][1] + mat.m_matrix[0][3] * m_matrix[3][1]); - tmp[0][2] = (mat.m_matrix[0][0] * m_matrix[0][2] + mat.m_matrix[0][1] * m_matrix[1][2] - + mat.m_matrix[0][2] * m_matrix[2][2] + mat.m_matrix[0][3] * m_matrix[3][2]); - tmp[0][3] = (mat.m_matrix[0][0] * m_matrix[0][3] + mat.m_matrix[0][1] * m_matrix[1][3] - + mat.m_matrix[0][2] * m_matrix[2][3] + mat.m_matrix[0][3] * m_matrix[3][3]); - - tmp[1][0] = (mat.m_matrix[1][0] * m_matrix[0][0] + mat.m_matrix[1][1] * m_matrix[1][0] - + mat.m_matrix[1][2] * m_matrix[2][0] + mat.m_matrix[1][3] * m_matrix[3][0]); - tmp[1][1] = (mat.m_matrix[1][0] * m_matrix[0][1] + mat.m_matrix[1][1] * m_matrix[1][1] - + mat.m_matrix[1][2] * m_matrix[2][1] + mat.m_matrix[1][3] * m_matrix[3][1]); - tmp[1][2] = (mat.m_matrix[1][0] * m_matrix[0][2] + mat.m_matrix[1][1] * m_matrix[1][2] - + mat.m_matrix[1][2] * m_matrix[2][2] + mat.m_matrix[1][3] * m_matrix[3][2]); - tmp[1][3] = (mat.m_matrix[1][0] * m_matrix[0][3] + mat.m_matrix[1][1] * m_matrix[1][3] - + mat.m_matrix[1][2] * m_matrix[2][3] + mat.m_matrix[1][3] * m_matrix[3][3]); - - tmp[2][0] = (mat.m_matrix[2][0] * m_matrix[0][0] + mat.m_matrix[2][1] * m_matrix[1][0] - + mat.m_matrix[2][2] * m_matrix[2][0] + mat.m_matrix[2][3] * m_matrix[3][0]); - tmp[2][1] = (mat.m_matrix[2][0] * m_matrix[0][1] + mat.m_matrix[2][1] * m_matrix[1][1] - + mat.m_matrix[2][2] * m_matrix[2][1] + mat.m_matrix[2][3] * m_matrix[3][1]); - tmp[2][2] = (mat.m_matrix[2][0] * m_matrix[0][2] + mat.m_matrix[2][1] * m_matrix[1][2] - + mat.m_matrix[2][2] * m_matrix[2][2] + mat.m_matrix[2][3] * m_matrix[3][2]); - tmp[2][3] = (mat.m_matrix[2][0] * m_matrix[0][3] + mat.m_matrix[2][1] * m_matrix[1][3] - + mat.m_matrix[2][2] * m_matrix[2][3] + mat.m_matrix[2][3] * m_matrix[3][3]); - - tmp[3][0] = (mat.m_matrix[3][0] * m_matrix[0][0] + mat.m_matrix[3][1] * m_matrix[1][0] - + mat.m_matrix[3][2] * m_matrix[2][0] + mat.m_matrix[3][3] * m_matrix[3][0]); - tmp[3][1] = (mat.m_matrix[3][0] * m_matrix[0][1] + mat.m_matrix[3][1] * m_matrix[1][1] - + mat.m_matrix[3][2] * m_matrix[2][1] + mat.m_matrix[3][3] * m_matrix[3][1]); - tmp[3][2] = (mat.m_matrix[3][0] * m_matrix[0][2] + mat.m_matrix[3][1] * m_matrix[1][2] - + mat.m_matrix[3][2] * m_matrix[2][2] + mat.m_matrix[3][3] * m_matrix[3][2]); - tmp[3][3] = (mat.m_matrix[3][0] * m_matrix[0][3] + mat.m_matrix[3][1] * m_matrix[1][3] - + mat.m_matrix[3][2] * m_matrix[2][3] + mat.m_matrix[3][3] * m_matrix[3][3]); - - setMatrix(tmp); - return *this; - } - - void TransformationMatrix::multVecMatrix(double x, double y, double& resultX, double& resultY) const - { - resultX = m_matrix[3][0] + x * m_matrix[0][0] + y * m_matrix[1][0]; - resultY = m_matrix[3][1] + x * m_matrix[0][1] + y * m_matrix[1][1]; - double w = m_matrix[3][3] + x * m_matrix[0][3] + y * m_matrix[1][3]; - if (w != 1 && w != 0) { - resultX /= w; - resultY /= w; - } - } - - void TransformationMatrix::multVecMatrix(double x, double y, double z, double& resultX, double& resultY, double& resultZ) const - { - resultX = m_matrix[3][0] + x * m_matrix[0][0] + y * m_matrix[1][0] + z * m_matrix[2][0]; - resultY = m_matrix[3][1] + x * m_matrix[0][1] + y * m_matrix[1][1] + z * m_matrix[2][1]; - resultZ = m_matrix[3][2] + x * m_matrix[0][2] + y * m_matrix[1][2] + z * m_matrix[2][2]; - double w = m_matrix[3][3] + x * m_matrix[0][3] + y * m_matrix[1][3] + z * m_matrix[2][3]; - if (w != 1 && w != 0) { - resultX /= w; - resultY /= w; - resultZ /= w; - } - } - - bool TransformationMatrix::isInvertible() const - { - if (isIdentityOrTranslation()) - return true; - - double det = WebCore::determinant4x4(m_matrix); - - if (fabs(det) < SMALL_NUMBER) - return false; - - return true; - } - - TransformationMatrix TransformationMatrix::inverse() const - { - if (isIdentityOrTranslation()) { - // identity matrix - if (m_matrix[3][0] == 0 && m_matrix[3][1] == 0 && m_matrix[3][2] == 0) - return TransformationMatrix(); - - // translation - return TransformationMatrix(1, 0, 0, 0, - 0, 1, 0, 0, - 0, 0, 1, 0, - -m_matrix[3][0], -m_matrix[3][1], -m_matrix[3][2], 1); - } - - TransformationMatrix invMat; - bool inverted = WebCore::inverse(m_matrix, invMat.m_matrix); - if (!inverted) - return TransformationMatrix(); - - return invMat; - } - - void TransformationMatrix::makeAffine() - { - m_matrix[0][2] = 0; - m_matrix[0][3] = 0; - - m_matrix[1][2] = 0; - m_matrix[1][3] = 0; - - m_matrix[2][0] = 0; - m_matrix[2][1] = 0; - m_matrix[2][2] = 1; - m_matrix[2][3] = 0; - - m_matrix[3][2] = 0; - m_matrix[3][3] = 1; - } - - static inline void blendFloat(double& from, double to, double progress) - { - if (from != to) - from = from + (to - from) * progress; - } - - void TransformationMatrix::blend(const TransformationMatrix& from, double progress) - { - if (from.isIdentity() && isIdentity()) - return; - - // decompose - DecomposedType fromDecomp; - DecomposedType toDecomp; - from.decompose(fromDecomp); - decompose(toDecomp); - - // interpolate - blendFloat(fromDecomp.scaleX, toDecomp.scaleX, progress); - blendFloat(fromDecomp.scaleY, toDecomp.scaleY, progress); - blendFloat(fromDecomp.scaleZ, toDecomp.scaleZ, progress); - blendFloat(fromDecomp.skewXY, toDecomp.skewXY, progress); - blendFloat(fromDecomp.skewXZ, toDecomp.skewXZ, progress); - blendFloat(fromDecomp.skewYZ, toDecomp.skewYZ, progress); - blendFloat(fromDecomp.translateX, toDecomp.translateX, progress); - blendFloat(fromDecomp.translateY, toDecomp.translateY, progress); - blendFloat(fromDecomp.translateZ, toDecomp.translateZ, progress); - blendFloat(fromDecomp.perspectiveX, toDecomp.perspectiveX, progress); - blendFloat(fromDecomp.perspectiveY, toDecomp.perspectiveY, progress); - blendFloat(fromDecomp.perspectiveZ, toDecomp.perspectiveZ, progress); - blendFloat(fromDecomp.perspectiveW, toDecomp.perspectiveW, progress); - - slerp(&fromDecomp.quaternionX, &toDecomp.quaternionX, progress); - - // recompose - recompose(fromDecomp); - } - - bool TransformationMatrix::decompose(DecomposedType& decomp) const - { - if (isIdentity()) { - memset(&decomp, 0, sizeof(decomp)); - decomp.perspectiveW = 1; - decomp.scaleX = 1; - decomp.scaleY = 1; - decomp.scaleZ = 1; - } - - if (!WebCore::decompose(m_matrix, decomp)) - return false; - return true; - } - - void TransformationMatrix::recompose(const DecomposedType& decomp, bool useEulerAngle) - { - makeIdentity(); - - // first apply perspective - m_matrix[0][3] = decomp.perspectiveX; - m_matrix[1][3] = decomp.perspectiveY; - m_matrix[2][3] = decomp.perspectiveZ; - m_matrix[3][3] = decomp.perspectiveW; - - // now translate - translate3d(decomp.translateX, decomp.translateY, decomp.translateZ); - - if (!useEulerAngle) { - // apply rotation - double xx = decomp.quaternionX * decomp.quaternionX; - double xy = decomp.quaternionX * decomp.quaternionY; - double xz = decomp.quaternionX * decomp.quaternionZ; - double xw = decomp.quaternionX * decomp.quaternionW; - double yy = decomp.quaternionY * decomp.quaternionY; - double yz = decomp.quaternionY * decomp.quaternionZ; - double yw = decomp.quaternionY * decomp.quaternionW; - double zz = decomp.quaternionZ * decomp.quaternionZ; - double zw = decomp.quaternionZ * decomp.quaternionW; - - // Construct a composite rotation matrix from the quaternion values - TransformationMatrix rotationMatrix(1 - 2 * (yy + zz), 2 * (xy - zw), 2 * (xz + yw), 0, - 2 * (xy + zw), 1 - 2 * (xx + zz), 2 * (yz - xw), 0, - 2 * (xz - yw), 2 * (yz + xw), 1 - 2 * (xx + yy), 0, - 0, 0, 0, 1); - - multiply(rotationMatrix); - } else { - rotate3d(1.0, 0.0, 0.0, rad2deg(decomp.rotateX)); - rotate3d(0.0, 1.0, 0.0, rad2deg(decomp.rotateY)); - rotate3d(0.0, 0.0, 1.0, rad2deg(decomp.rotateZ)); - } - - // now apply skew - if (decomp.skewYZ) { - TransformationMatrix tmp; - tmp.setM32(decomp.skewYZ); - multiply(tmp); - } - - if (decomp.skewXZ) { - TransformationMatrix tmp; - tmp.setM31(decomp.skewXZ); - multiply(tmp); - } - - if (decomp.skewXY) { - TransformationMatrix tmp; - tmp.setM21(decomp.skewXY); - multiply(tmp); - } - - // finally, apply scale - scale3d(decomp.scaleX, decomp.scaleY, decomp.scaleZ); - } -} \ No newline at end of file diff --git a/Example/Pods/pop/pop/WebCore/TransformationMatrix.h b/Example/Pods/pop/pop/WebCore/TransformationMatrix.h deleted file mode 100644 index b99ae89..0000000 --- a/Example/Pods/pop/pop/WebCore/TransformationMatrix.h +++ /dev/null @@ -1,279 +0,0 @@ -/* - * Copyright (C) 2005, 2006 Apple Computer, Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef TransformationMatrix_h -#define TransformationMatrix_h - -#include //for memcpy - -#include - -#include - -namespace WebCore { - - class TransformationMatrix { - public: - - typedef double Matrix4[4][4]; - - TransformationMatrix() { makeIdentity(); } - TransformationMatrix(const TransformationMatrix& t) { *this = t; } - TransformationMatrix(double a, double b, double c, double d, double e, double f) { setMatrix(a, b, c, d, e, f); } - TransformationMatrix(double m11, double m12, double m13, double m14, - double m21, double m22, double m23, double m24, - double m31, double m32, double m33, double m34, - double m41, double m42, double m43, double m44) - { - setMatrix(m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, m41, m42, m43, m44); - } - - void setMatrix(double a, double b, double c, double d, double e, double f) - { - m_matrix[0][0] = a; m_matrix[0][1] = b; m_matrix[0][2] = 0; m_matrix[0][3] = 0; - m_matrix[1][0] = c; m_matrix[1][1] = d; m_matrix[1][2] = 0; m_matrix[1][3] = 0; - m_matrix[2][0] = 0; m_matrix[2][1] = 0; m_matrix[2][2] = 1; m_matrix[2][3] = 0; - m_matrix[3][0] = e; m_matrix[3][1] = f; m_matrix[3][2] = 0; m_matrix[3][3] = 1; - } - - void setMatrix(double m11, double m12, double m13, double m14, - double m21, double m22, double m23, double m24, - double m31, double m32, double m33, double m34, - double m41, double m42, double m43, double m44) - { - m_matrix[0][0] = m11; m_matrix[0][1] = m12; m_matrix[0][2] = m13; m_matrix[0][3] = m14; - m_matrix[1][0] = m21; m_matrix[1][1] = m22; m_matrix[1][2] = m23; m_matrix[1][3] = m24; - m_matrix[2][0] = m31; m_matrix[2][1] = m32; m_matrix[2][2] = m33; m_matrix[2][3] = m34; - m_matrix[3][0] = m41; m_matrix[3][1] = m42; m_matrix[3][2] = m43; m_matrix[3][3] = m44; - } - - TransformationMatrix& operator =(const TransformationMatrix &t) - { - setMatrix(t.m_matrix); - return *this; - } - - TransformationMatrix& makeIdentity() - { - setMatrix(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); - return *this; - } - - bool isIdentity() const - { - return m_matrix[0][0] == 1 && m_matrix[0][1] == 0 && m_matrix[0][2] == 0 && m_matrix[0][3] == 0 && - m_matrix[1][0] == 0 && m_matrix[1][1] == 1 && m_matrix[1][2] == 0 && m_matrix[1][3] == 0 && - m_matrix[2][0] == 0 && m_matrix[2][1] == 0 && m_matrix[2][2] == 1 && m_matrix[2][3] == 0 && - m_matrix[3][0] == 0 && m_matrix[3][1] == 0 && m_matrix[3][2] == 0 && m_matrix[3][3] == 1; - } - - // This form preserves the double math from input to output - void map(double x, double y, double& x2, double& y2) const { multVecMatrix(x, y, x2, y2); } - - double m11() const { return m_matrix[0][0]; } - void setM11(double f) { m_matrix[0][0] = f; } - double m12() const { return m_matrix[0][1]; } - void setM12(double f) { m_matrix[0][1] = f; } - double m13() const { return m_matrix[0][2]; } - void setM13(double f) { m_matrix[0][2] = f; } - double m14() const { return m_matrix[0][3]; } - void setM14(double f) { m_matrix[0][3] = f; } - double m21() const { return m_matrix[1][0]; } - void setM21(double f) { m_matrix[1][0] = f; } - double m22() const { return m_matrix[1][1]; } - void setM22(double f) { m_matrix[1][1] = f; } - double m23() const { return m_matrix[1][2]; } - void setM23(double f) { m_matrix[1][2] = f; } - double m24() const { return m_matrix[1][3]; } - void setM24(double f) { m_matrix[1][3] = f; } - double m31() const { return m_matrix[2][0]; } - void setM31(double f) { m_matrix[2][0] = f; } - double m32() const { return m_matrix[2][1]; } - void setM32(double f) { m_matrix[2][1] = f; } - double m33() const { return m_matrix[2][2]; } - void setM33(double f) { m_matrix[2][2] = f; } - double m34() const { return m_matrix[2][3]; } - void setM34(double f) { m_matrix[2][3] = f; } - double m41() const { return m_matrix[3][0]; } - void setM41(double f) { m_matrix[3][0] = f; } - double m42() const { return m_matrix[3][1]; } - void setM42(double f) { m_matrix[3][1] = f; } - double m43() const { return m_matrix[3][2]; } - void setM43(double f) { m_matrix[3][2] = f; } - double m44() const { return m_matrix[3][3]; } - void setM44(double f) { m_matrix[3][3] = f; } - - double a() const { return m_matrix[0][0]; } - void setA(double a) { m_matrix[0][0] = a; } - - double b() const { return m_matrix[0][1]; } - void setB(double b) { m_matrix[0][1] = b; } - - double c() const { return m_matrix[1][0]; } - void setC(double c) { m_matrix[1][0] = c; } - - double d() const { return m_matrix[1][1]; } - void setD(double d) { m_matrix[1][1] = d; } - - double e() const { return m_matrix[3][0]; } - void setE(double e) { m_matrix[3][0] = e; } - - double f() const { return m_matrix[3][1]; } - void setF(double f) { m_matrix[3][1] = f; } - - // this = this * mat - TransformationMatrix& multiply(const TransformationMatrix&); - - TransformationMatrix& scale(double); - TransformationMatrix& scaleNonUniform(double sx, double sy); - TransformationMatrix& scale3d(double sx, double sy, double sz); - - TransformationMatrix& rotate(double d) { return rotate3d(0, 0, d); } - TransformationMatrix& rotateFromVector(double x, double y); - TransformationMatrix& rotate3d(double rx, double ry, double rz); - - // The vector (x,y,z) is normalized if it's not already. A vector of - // (0,0,0) uses a vector of (0,0,1). - TransformationMatrix& rotate3d(double x, double y, double z, double angle); - - TransformationMatrix& translate(double tx, double ty); - TransformationMatrix& translate3d(double tx, double ty, double tz); - - // translation added with a post-multiply - TransformationMatrix& translateRight(double tx, double ty); - TransformationMatrix& translateRight3d(double tx, double ty, double tz); - - TransformationMatrix& flipX(); - TransformationMatrix& flipY(); - TransformationMatrix& skew(double angleX, double angleY); - TransformationMatrix& skewX(double angle) { return skew(angle, 0); } - TransformationMatrix& skewY(double angle) { return skew(0, angle); } - - TransformationMatrix& applyPerspective(double p); - bool hasPerspective() const { return m_matrix[2][3] != 0.0f; } - - bool isInvertible() const; - - // This method returns the identity matrix if it is not invertible. - // Use isInvertible() before calling this if you need to know. - TransformationMatrix inverse() const; - - // decompose the matrix into its component parts - typedef struct { - double scaleX, scaleY, scaleZ; - double skewXY, skewXZ, skewYZ; - double rotateX, rotateY, rotateZ; - double quaternionX, quaternionY, quaternionZ, quaternionW; - double translateX, translateY, translateZ; - double perspectiveX, perspectiveY, perspectiveZ, perspectiveW; - } DecomposedType; - - bool decompose(DecomposedType& decomp) const; - void recompose(const DecomposedType& decomp, bool useEulerAngle = false); - - void blend(const TransformationMatrix& from, double progress); - - bool isAffine() const - { - return (m13() == 0 && m14() == 0 && m23() == 0 && m24() == 0 && - m31() == 0 && m32() == 0 && m33() == 1 && m34() == 0 && m43() == 0 && m44() == 1); - } - - // Throw away the non-affine parts of the matrix (lossy!) - void makeAffine(); - - bool operator==(const TransformationMatrix& m2) const - { - return (m_matrix[0][0] == m2.m_matrix[0][0] && - m_matrix[0][1] == m2.m_matrix[0][1] && - m_matrix[0][2] == m2.m_matrix[0][2] && - m_matrix[0][3] == m2.m_matrix[0][3] && - m_matrix[1][0] == m2.m_matrix[1][0] && - m_matrix[1][1] == m2.m_matrix[1][1] && - m_matrix[1][2] == m2.m_matrix[1][2] && - m_matrix[1][3] == m2.m_matrix[1][3] && - m_matrix[2][0] == m2.m_matrix[2][0] && - m_matrix[2][1] == m2.m_matrix[2][1] && - m_matrix[2][2] == m2.m_matrix[2][2] && - m_matrix[2][3] == m2.m_matrix[2][3] && - m_matrix[3][0] == m2.m_matrix[3][0] && - m_matrix[3][1] == m2.m_matrix[3][1] && - m_matrix[3][2] == m2.m_matrix[3][2] && - m_matrix[3][3] == m2.m_matrix[3][3]); - } - - bool operator!=(const TransformationMatrix& other) const { return !(*this == other); } - - // *this = *this * t (i.e., a multRight) - TransformationMatrix& operator*=(const TransformationMatrix& t) - { - return multiply(t); - } - - // result = *this * t (i.e., a multRight) - TransformationMatrix operator*(const TransformationMatrix& t) - { - TransformationMatrix result = *this; - result.multiply(t); - return result; - } - - CATransform3D transform3d () const; - CGAffineTransform affineTransform () const; - - TransformationMatrix(const CATransform3D&); - operator CATransform3D() const; - - TransformationMatrix(const CGAffineTransform&); - operator CGAffineTransform() const; - - private: - - // multiply passed 2D point by matrix (assume z=0) - void multVecMatrix(double x, double y, double& dstX, double& dstY) const; - - // multiply passed 3D point by matrix - void multVecMatrix(double x, double y, double z, double& dstX, double& dstY, double& dstZ) const; - - void setMatrix(const Matrix4 m) - { - if (m && m != m_matrix) - memcpy(m_matrix, m, sizeof(Matrix4)); - } - - bool isIdentityOrTranslation() const - { - return m_matrix[0][0] == 1 && m_matrix[0][1] == 0 && m_matrix[0][2] == 0 && m_matrix[0][3] == 0 && - m_matrix[1][0] == 0 && m_matrix[1][1] == 1 && m_matrix[1][2] == 0 && m_matrix[1][3] == 0 && - m_matrix[2][0] == 0 && m_matrix[2][1] == 0 && m_matrix[2][2] == 1 && m_matrix[2][3] == 0 && - m_matrix[3][3] == 1; - } - - Matrix4 m_matrix; - }; - -} // namespace WebCore - -#endif // TransformationMatrix_h diff --git a/Example/Pods/pop/pop/WebCore/UnitBezier.h b/Example/Pods/pop/pop/WebCore/UnitBezier.h deleted file mode 100644 index 0f847a0..0000000 --- a/Example/Pods/pop/pop/WebCore/UnitBezier.h +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright (C) 2008 Apple Inc. All Rights Reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef UnitBezier_h -#define UnitBezier_h - -#include - -namespace WebCore { - - struct UnitBezier { - UnitBezier(double p1x, double p1y, double p2x, double p2y) - { - // Calculate the polynomial coefficients, implicit first and last control points are (0,0) and (1,1). - cx = 3.0 * p1x; - bx = 3.0 * (p2x - p1x) - cx; - ax = 1.0 - cx -bx; - - cy = 3.0 * p1y; - by = 3.0 * (p2y - p1y) - cy; - ay = 1.0 - cy - by; - } - - double sampleCurveX(double t) - { - // `ax t^3 + bx t^2 + cx t' expanded using Horner's rule. - return ((ax * t + bx) * t + cx) * t; - } - - double sampleCurveY(double t) - { - return ((ay * t + by) * t + cy) * t; - } - - double sampleCurveDerivativeX(double t) - { - return (3.0 * ax * t + 2.0 * bx) * t + cx; - } - - // Given an x value, find a parametric value it came from. - double solveCurveX(double x, double epsilon) - { - double t0; - double t1; - double t2; - double x2; - double d2; - int i; - - // First try a few iterations of Newton's method -- normally very fast. - for (t2 = x, i = 0; i < 8; i++) { - x2 = sampleCurveX(t2) - x; - if (fabs (x2) < epsilon) - return t2; - d2 = sampleCurveDerivativeX(t2); - if (fabs(d2) < 1e-6) - break; - t2 = t2 - x2 / d2; - } - - // Fall back to the bisection method for reliability. - t0 = 0.0; - t1 = 1.0; - t2 = x; - - if (t2 < t0) - return t0; - if (t2 > t1) - return t1; - - while (t0 < t1) { - x2 = sampleCurveX(t2); - if (fabs(x2 - x) < epsilon) - return t2; - if (x > x2) - t0 = t2; - else - t1 = t2; - t2 = (t1 - t0) * .5 + t0; - } - - // Failure. - return t2; - } - - double solve(double x, double epsilon) - { - return sampleCurveY(solveCurveX(x, epsilon)); - } - - private: - double ax; - double bx; - double cx; - - double ay; - double by; - double cy; - }; -} -#endif From ac5e6b12a46a12acd25ce10ece66560a6f3b6f34 Mon Sep 17 00:00:00 2001 From: Anton Dolzhenko Date: Wed, 18 Jan 2017 13:42:12 +0200 Subject: [PATCH 4/4] Change framework version to 0.3.0 --- RainyRefreshControl.podspec | 2 +- Sources/Info-iOS.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RainyRefreshControl.podspec b/RainyRefreshControl.podspec index 380d30b..98f0ad9 100644 --- a/RainyRefreshControl.podspec +++ b/RainyRefreshControl.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'RainyRefreshControl' - s.version = '0.2.0' + s.version = '0.3.0' s.license = { :type => 'MIT', :file => 'LICENSE' } s.summary = 'Simple refresh control for iOS based on POP, SpriteKit and Core Graphics' s.homepage = 'https://github.com/Onix-Systems/RainyRefreshControl' diff --git a/Sources/Info-iOS.plist b/Sources/Info-iOS.plist index badd676..0d6341f 100644 --- a/Sources/Info-iOS.plist +++ b/Sources/Info-iOS.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.2.0 + 0.3.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) NSPrincipalClass