From d5fbcb242acff2ab270b4018b01c2c6be9c4955f Mon Sep 17 00:00:00 2001
From: Chris Loer <chris.loer@gmail.com>
Date: Wed, 5 Jul 2017 13:59:45 -0700
Subject: [core] Implement circle-pitch-alignment property Closes issue #9349.

---
 src/mbgl/renderer/painters/painter_circle.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/mbgl/renderer/painters/painter_circle.cpp')

diff --git a/src/mbgl/renderer/painters/painter_circle.cpp b/src/mbgl/renderer/painters/painter_circle.cpp
index 58e384979d..a077f557fc 100644
--- a/src/mbgl/renderer/painters/painter_circle.cpp
+++ b/src/mbgl/renderer/painters/painter_circle.cpp
@@ -22,6 +22,7 @@ void Painter::renderCircle(PaintParameters& parameters,
 
     const CirclePaintProperties::PossiblyEvaluated& properties = layer.evaluated;
     const bool scaleWithMap = properties.get<CirclePitchScale>() == CirclePitchScaleType::Map;
+    const bool pitchWithMap = properties.get<CirclePitchAlignment>() == AlignmentType::Map;
 
     parameters.programs.circle.get(properties).draw(
         context,
@@ -38,12 +39,13 @@ void Painter::renderCircle(PaintParameters& parameters,
                                       state)
             },
             uniforms::u_scale_with_map::Value{ scaleWithMap },
-            uniforms::u_extrude_scale::Value{ scaleWithMap
+            uniforms::u_extrude_scale::Value{ pitchWithMap
                 ? std::array<float, 2> {{
-                    pixelsToGLUnits[0] * state.getCameraToCenterDistance(),
-                    pixelsToGLUnits[1] * state.getCameraToCenterDistance()
-                  }}
-                : pixelsToGLUnits }
+                    tile.id.pixelsToTileUnits(1, state.getZoom()),
+                    tile.id.pixelsToTileUnits(1, state.getZoom()) }}
+                : pixelsToGLUnits },
+            uniforms::u_camera_to_center_distance::Value{ state.getCameraToCenterDistance() },
+            uniforms::u_pitch_with_map::Value{ pitchWithMap }
         },
         *bucket.vertexBuffer,
         *bucket.indexBuffer,
-- 
cgit v1.2.1