diff options
author | v.mikhaylenko <v.mikhaylenko@corp.mail.ru> | 2015-06-16 20:21:32 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:52:40 +0300 |
commit | 4e8f1cc18f1a594e5cd35a7ee85937939ac3a4f2 (patch) | |
tree | 878b831909555983c98433dd0435e02b10b1787c /iphone/Maps/Classes/MWMSpringAnimation.mm | |
parent | 00c153b50ff6c92c312fb9fdc7662df4eef54388 (diff) |
[ios] Added safety interface for work with metadata dictionary.
Diffstat (limited to 'iphone/Maps/Classes/MWMSpringAnimation.mm')
-rw-r--r-- | iphone/Maps/Classes/MWMSpringAnimation.mm | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/iphone/Maps/Classes/MWMSpringAnimation.mm b/iphone/Maps/Classes/MWMSpringAnimation.mm index eeddc4fe61..47211011ef 100644 --- a/iphone/Maps/Classes/MWMSpringAnimation.mm +++ b/iphone/Maps/Classes/MWMSpringAnimation.mm @@ -7,32 +7,13 @@ // #import "MWMSpringAnimation.h" - -static inline CGPoint CGPointSubtract(CGPoint p1, CGPoint p2) -{ - return CGPointMake(p1.x - p2.x, p1.y - p2.y); -} - -static inline CGPoint CGPointAdd(CGPoint p1, CGPoint p2) -{ - return CGPointMake(p1.x + p2.x, p1.y + p2.y); -} - -static inline CGPoint CGPointMultiply(CGPoint point, CGFloat multiplier) -{ - return CGPointMake(point.x * multiplier, point.y * multiplier); -} - -static inline CGFloat CGPointLength(CGPoint point) -{ - return (CGFloat)sqrt(point.x * point.x + point.y * point.y); -} +#import "UIKitCategories.h" @interface MWMSpringAnimation () @property (nonatomic) CGPoint velocity; @property (nonatomic) CGPoint targetPoint; -@property (nonatomic) UIView *view; +@property (nonatomic) UIView * view; @end @@ -57,8 +38,8 @@ static inline CGFloat CGPointLength(CGPoint point) - (void)animationTick:(CFTimeInterval)dt finished:(BOOL *)finished { - static CGFloat const frictionConstant = 25.; - static CGFloat const springConstant = 300.; + CGFloat const frictionConstant = 25.; + CGFloat const springConstant = 300.; // friction force = velocity * friction constant CGPoint const frictionForce = CGPointMultiply(self.velocity, frictionConstant); |