[ios] Apply perspective to x-free annotation views

Working towards #5090.
mapbox · Jun 24, 2016 · bdff7d7 · bdff7d7
1 parent 4eba5be
commit bdff7d7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/platform/ios/app/MBXAnnotationView.m b/platform/ios/app/MBXAnnotationView.m
@@ -15,7 +15,7 @@ - (void)layoutSubviews {
 
 - (nullable id<CAAction>)actionForLayer:(CALayer *)layer forKey:(NSString *)event
 {
-    if ([event isEqualToString:@"position"])
+    if ([event isEqualToString:@"transform"] || [event isEqualToString:@"position"])
     {
         CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:event];
         animation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];

diff --git a/platform/ios/src/MGLAnnotationView.mm b/platform/ios/src/MGLAnnotationView.mm
@@ -52,14 +52,19 @@ - (void)setCenter:(CGPoint)center direction:(CLLocationDirection)direction pitch
     CATransform3D t = CATransform3DIdentity;
     if (pitch >= 0 && (self.freeAxes & MGLAnnotationViewBillboardAxisX))
     {
+        // https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/CoreAnimation_guide/AdvancedAnimationTricks/AdvancedAnimationTricks.html#//apple_ref/doc/uid/TP40004514-CH8-SW13
+        // FIXME: This is a rough, eyeballed value. Replace this transform with one derived from mbgl::TransformState::coordinatePointMatrix().
+        CGRect superBounds = self.superview.bounds;
+        t.m34 = -1.0 / (1000 - CGRectGetWidth(superBounds));
+
         t = CATransform3DRotate(t, MGLRadiansFromDegrees(pitch), 1.0, 0, 0);
     }
     if (direction >= 0 && (self.freeAxes & MGLAnnotationViewBillboardAxisY))
     {
         t = CATransform3DRotate(t, MGLRadiansFromDegrees(-direction), 0.0, 0.0, 1.0);
     }
     self.layer.transform = t;
-
+    
     if (self.scalesWithViewingDistance)
     {
         [self updateScaleForPitch:pitch];