增加POP动画引擎

KittenYang · Feb 5, 2015 · 4519d20 · 4519d20
1 parent 6bcd732
commit 4519d20
Show file tree

Hide file tree

Showing 126 changed files with 13,017 additions and 453 deletions.
diff --git a/KYPingTransition.xcodeproj/project.pbxproj b/KYPingTransition.xcodeproj/project.pbxproj
diff --git a/...proj/project.xcworkspace/xcuserdata/KittenYang.xcuserdatad/UserInterfaceState.xcuserstate b/...proj/project.xcworkspace/xcuserdata/KittenYang.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/KYPingTransition.xcworkspace/contents.xcworkspacedata b/KYPingTransition.xcworkspace/contents.xcworkspacedata
diff --git a/...ngTransition.xcworkspace/xcuserdata/KittenYang.xcuserdatad/UserInterfaceState.xcuserstate b/...ngTransition.xcworkspace/xcuserdata/KittenYang.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/KYPingTransition/PingInvertTransition.m b/KYPingTransition/PingInvertTransition.m
@@ -19,7 +19,7 @@ @interface PingInvertTransition()
 @implementation PingInvertTransition
 
 - (NSTimeInterval)transitionDuration:(id <UIViewControllerContextTransitioning>)transitionContext{
-    return 0.5f;
+    return 0.2f;
 }
 
 - (void)animateTransition:(id <UIViewControllerContextTransitioning>)transitionContext{
@@ -49,6 +49,8 @@ - (void)animateTransition:(id <UIViewControllerContextTransitioning>)transitionC
     pingAnimation.fromValue = (__bridge id)(startPath.CGPath);
     pingAnimation.toValue   = (__bridge id)(finalPath.CGPath);
     pingAnimation.duration = [self transitionDuration:transitionContext];
+    pingAnimation.timingFunction = [CAMediaTimingFunction  functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
+
     pingAnimation.delegate = self;
 
 

diff --git a/KYPingTransition/PingTransition.h b/KYPingTransition/PingTransition.h
@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
+#import <pop/POP.h>
 
 @interface PingTransition : NSObject<UIViewControllerAnimatedTransitioning>
 

diff --git a/KYPingTransition/PingTransition.m b/KYPingTransition/PingTransition.m
@@ -19,7 +19,7 @@ @interface PingTransition ()
 @implementation PingTransition
 
 - (NSTimeInterval)transitionDuration:(id <UIViewControllerContextTransitioning>)transitionContext{
-    return  0.5f;
+    return  0.2f;
 }
 
 - (void)animateTransition:(id <UIViewControllerContextTransitioning>)transitionContext{
@@ -47,19 +47,71 @@ - (void)animateTransition:(id <UIViewControllerContextTransitioning>)transitionC
     CAShapeLayer *maskLayer = [CAShapeLayer layer];
     maskLayer.path = maskFinalBP.CGPath; //将它的 path 指定为最终的 path 来避免在动画完成后会回弹
     toVC.view.layer.mask = maskLayer;
+
+
+    CAKeyframeAnimation *keyFrame = [CAKeyframeAnimation animationWithKeyPath:@"path"];
+    keyFrame.values = @[(__bridge id)(maskStartBP.CGPath),(__bridge id)(maskFinalBP.CGPath)];
+    keyFrame.duration = 100.0f;
+    keyFrame.additive = YES;
+    keyFrame.removedOnCompletion = NO;
+    keyFrame.fillMode = kCAFillModeForwards;
+
+
+    [maskLayer addAnimation:keyFrame forKey:nil];
+    maskLayer.speed = 0.0;
+
+
+    POPAnimatableProperty* pop = [POPAnimatableProperty propertyWithName:@"timeOffset" initializer:^(POPMutableAnimatableProperty *prop) {
+        // read value
+        prop.readBlock = ^(CAShapeLayer *obj, CGFloat values[]) {
+            values[0] = obj.timeOffset;
+        };
+        // write value
+        prop.writeBlock = ^(CAShapeLayer *obj, const CGFloat values[]) {
+            obj.timeOffset = values[0];
+        };
+        // dynamics threshold
+        prop.threshold = 0.1;
+    }];
+
+
+    POPSpringAnimation *popSpring = [POPSpringAnimation animation];
+    popSpring.fromValue = @(0.0);
+    popSpring.toValue =  @(100.f);
+    popSpring.springBounciness = 2.1;
+    popSpring.springSpeed = 200.4;
+    popSpring.dynamicsTension = 200;
+    popSpring.dynamicsFriction = 100.f;
+    popSpring.dynamicsMass = 1.f;
+    popSpring.property = pop;
+    popSpring.delegate  = self;
+    [maskLayer pop_addAnimation:popSpring forKey:nil];
 
 
+
+//    kPOPShapeLayerStrokeStart
+
     //创建一个关于 path 的 CABasicAnimation 动画来从 circleMaskPathInitial.CGPath 到 circleMaskPathFinal.CGPath 。同时指定它的 delegate 来在完成动画时做一些清除工作
-    CABasicAnimation *maskLayerAnimation = [CABasicAnimation animationWithKeyPath:@"path"];
-    maskLayerAnimation.fromValue = (__bridge id)(maskStartBP.CGPath);
-    maskLayerAnimation.toValue = (__bridge id)((maskFinalBP.CGPath));
-    maskLayerAnimation.duration = [self transitionDuration:transitionContext];
-    maskLayerAnimation.delegate = self;
+//    CABasicAnimation *maskLayerAnimation = [CABasicAnimation animationWithKeyPath:@"path"];
+//    maskLayerAnimation.fromValue = (__bridge id)(maskStartBP.CGPath);
+//    maskLayerAnimation.toValue = (__bridge id)((maskFinalBP.CGPath));
+//    maskLayerAnimation.duration = [self transitionDuration:transitionContext];
+//    maskLayerAnimation.timingFunction = [CAMediaTimingFunction  functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
+//    maskLayerAnimation.delegate = self;
+//    
+//    [maskLayer addAnimation:maskLayerAnimation forKey:@"path"];
 
-    [maskLayer addAnimation:maskLayerAnimation forKey:@"path"];
 
 }
 
+
+- (void)pop_animationDidStop:(POPAnimation *)anim finished:(BOOL)finished{
+    //告诉 iOS 这个 transition 完成
+    [self.transitionContext completeTransition:![self. transitionContext transitionWasCancelled]];
+    //清除 fromVC 的 mask
+    [self.transitionContext viewControllerForKey:UITransitionContextFromViewControllerKey].view.layer.mask = nil;
+    [self.transitionContext viewControllerForKey:UITransitionContextToViewControllerKey].view.layer.mask = nil;
+}
 #pragma mark - CABasicAnimation的Delegate
 - (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag{
 

diff --git a/Podfile b/Podfile
@@ -0,0 +1 @@
+pod 'pop', '~> 1.0.7'
diff --git a/Podfile.lock b/Podfile.lock
@@ -0,0 +1,10 @@
+PODS:
+  - pop (1.0.7)
+
+DEPENDENCIES:
+  - pop (~> 1.0.7)
+
+SPEC CHECKSUMS:
+  pop: 2f14a1ea61339767af9e66741b418c831b3844df
+
+COCOAPODS: 0.35.0
diff --git a/Pods/Headers/Build/pop/FloatConversion.h b/Pods/Headers/Build/pop/FloatConversion.h
diff --git a/Pods/Headers/Build/pop/POP.h b/Pods/Headers/Build/pop/POP.h
diff --git a/Pods/Headers/Build/pop/POPAction.h b/Pods/Headers/Build/pop/POPAction.h
diff --git a/Pods/Headers/Build/pop/POPAnimatableProperty.h b/Pods/Headers/Build/pop/POPAnimatableProperty.h
diff --git a/Pods/Headers/Build/pop/POPAnimation.h b/Pods/Headers/Build/pop/POPAnimation.h
diff --git a/Pods/Headers/Build/pop/POPAnimationEvent.h b/Pods/Headers/Build/pop/POPAnimationEvent.h
diff --git a/Pods/Headers/Build/pop/POPAnimationEventInternal.h b/Pods/Headers/Build/pop/POPAnimationEventInternal.h
diff --git a/Pods/Headers/Build/pop/POPAnimationExtras.h b/Pods/Headers/Build/pop/POPAnimationExtras.h
diff --git a/Pods/Headers/Build/pop/POPAnimationInternal.h b/Pods/Headers/Build/pop/POPAnimationInternal.h
diff --git a/Pods/Headers/Build/pop/POPAnimationPrivate.h b/Pods/Headers/Build/pop/POPAnimationPrivate.h
diff --git a/Pods/Headers/Build/pop/POPAnimationRuntime.h b/Pods/Headers/Build/pop/POPAnimationRuntime.h
diff --git a/Pods/Headers/Build/pop/POPAnimationTracer.h b/Pods/Headers/Build/pop/POPAnimationTracer.h
diff --git a/Pods/Headers/Build/pop/POPAnimationTracerInternal.h b/Pods/Headers/Build/pop/POPAnimationTracerInternal.h
diff --git a/Pods/Headers/Build/pop/POPAnimator.h b/Pods/Headers/Build/pop/POPAnimator.h
diff --git a/Pods/Headers/Build/pop/POPAnimatorPrivate.h b/Pods/Headers/Build/pop/POPAnimatorPrivate.h
diff --git a/Pods/Headers/Build/pop/POPBasicAnimation.h b/Pods/Headers/Build/pop/POPBasicAnimation.h
diff --git a/Pods/Headers/Build/pop/POPBasicAnimationInternal.h b/Pods/Headers/Build/pop/POPBasicAnimationInternal.h
diff --git a/Pods/Headers/Build/pop/POPCGUtils.h b/Pods/Headers/Build/pop/POPCGUtils.h
diff --git a/Pods/Headers/Build/pop/POPCustomAnimation.h b/Pods/Headers/Build/pop/POPCustomAnimation.h
diff --git a/Pods/Headers/Build/pop/POPDecayAnimation.h b/Pods/Headers/Build/pop/POPDecayAnimation.h
diff --git a/Pods/Headers/Build/pop/POPDecayAnimationInternal.h b/Pods/Headers/Build/pop/POPDecayAnimationInternal.h
diff --git a/Pods/Headers/Build/pop/POPDefines.h b/Pods/Headers/Build/pop/POPDefines.h
diff --git a/Pods/Headers/Build/pop/POPGeometry.h b/Pods/Headers/Build/pop/POPGeometry.h
diff --git a/Pods/Headers/Build/pop/POPLayerExtras.h b/Pods/Headers/Build/pop/POPLayerExtras.h
diff --git a/Pods/Headers/Build/pop/POPMath.h b/Pods/Headers/Build/pop/POPMath.h
diff --git a/Pods/Headers/Build/pop/POPPropertyAnimation.h b/Pods/Headers/Build/pop/POPPropertyAnimation.h
diff --git a/Pods/Headers/Build/pop/POPPropertyAnimationInternal.h b/Pods/Headers/Build/pop/POPPropertyAnimationInternal.h
diff --git a/Pods/Headers/Build/pop/POPSpringAnimation.h b/Pods/Headers/Build/pop/POPSpringAnimation.h
diff --git a/Pods/Headers/Build/pop/POPSpringAnimationInternal.h b/Pods/Headers/Build/pop/POPSpringAnimationInternal.h
diff --git a/Pods/Headers/Build/pop/POPSpringSolver.h b/Pods/Headers/Build/pop/POPSpringSolver.h
diff --git a/Pods/Headers/Build/pop/POPVector.h b/Pods/Headers/Build/pop/POPVector.h
diff --git a/Pods/Headers/Build/pop/TransformationMatrix.h b/Pods/Headers/Build/pop/TransformationMatrix.h
diff --git a/Pods/Headers/Build/pop/UnitBezier.h b/Pods/Headers/Build/pop/UnitBezier.h
diff --git a/Pods/Headers/Public/pop/POP.h b/Pods/Headers/Public/pop/POP.h
diff --git a/Pods/Headers/Public/pop/POPAnimatableProperty.h b/Pods/Headers/Public/pop/POPAnimatableProperty.h
diff --git a/Pods/Headers/Public/pop/POPAnimation.h b/Pods/Headers/Public/pop/POPAnimation.h
diff --git a/Pods/Headers/Public/pop/POPAnimationEvent.h b/Pods/Headers/Public/pop/POPAnimationEvent.h
diff --git a/Pods/Headers/Public/pop/POPAnimationExtras.h b/Pods/Headers/Public/pop/POPAnimationExtras.h
diff --git a/Pods/Headers/Public/pop/POPAnimationTracer.h b/Pods/Headers/Public/pop/POPAnimationTracer.h
diff --git a/Pods/Headers/Public/pop/POPAnimator.h b/Pods/Headers/Public/pop/POPAnimator.h
diff --git a/Pods/Headers/Public/pop/POPBasicAnimation.h b/Pods/Headers/Public/pop/POPBasicAnimation.h
diff --git a/Pods/Headers/Public/pop/POPCustomAnimation.h b/Pods/Headers/Public/pop/POPCustomAnimation.h
diff --git a/Pods/Headers/Public/pop/POPDecayAnimation.h b/Pods/Headers/Public/pop/POPDecayAnimation.h
diff --git a/Pods/Headers/Public/pop/POPDefines.h b/Pods/Headers/Public/pop/POPDefines.h
diff --git a/Pods/Headers/Public/pop/POPGeometry.h b/Pods/Headers/Public/pop/POPGeometry.h
diff --git a/Pods/Headers/Public/pop/POPLayerExtras.h b/Pods/Headers/Public/pop/POPLayerExtras.h
diff --git a/Pods/Headers/Public/pop/POPPropertyAnimation.h b/Pods/Headers/Public/pop/POPPropertyAnimation.h
diff --git a/Pods/Headers/Public/pop/POPSpringAnimation.h b/Pods/Headers/Public/pop/POPSpringAnimation.h
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock