summaryrefslogtreecommitdiff
path: root/src/mbgl/programs/symbol_program.cpp
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2018-07-02 21:38:45 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2018-07-19 07:51:22 +0300
commitf8186e9d5279a7fa6b38e984101e49bfbf9867a2 (patch)
tree86fe34771651e82691dde91a19252735542ed137 /src/mbgl/programs/symbol_program.cpp
parentef42ed2e24781c34c8e3fcf016562997c88438a3 (diff)
downloadqtlocation-mapboxgl-f8186e9d5279a7fa6b38e984101e49bfbf9867a2.tar.gz
[core] Do not downcast values in TransformStateupstream/padded-angle-correction
Diffstat (limited to 'src/mbgl/programs/symbol_program.cpp')
-rw-r--r--src/mbgl/programs/symbol_program.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mbgl/programs/symbol_program.cpp b/src/mbgl/programs/symbol_program.cpp
index 84a7a53f1d..3ae11110f8 100644
--- a/src/mbgl/programs/symbol_program.cpp
+++ b/src/mbgl/programs/symbol_program.cpp
@@ -40,13 +40,15 @@ Values makeValues(const bool isText,
const float symbolFadeChange,
Args&&... args) {
std::array<float, 2> extrudeScale;
+ const float cameraToCenterDistance = state.getCameraToCenterDistance();
+ const float pitch = state.getPitch();
if (values.pitchAlignment == AlignmentType::Map) {
extrudeScale.fill(tile.id.pixelsToTileUnits(1, state.getZoom()));
} else {
extrudeScale = {{
- pixelsToGLUnits[0] * state.getCameraToCenterDistance(),
- pixelsToGLUnits[1] * state.getCameraToCenterDistance()
+ pixelsToGLUnits[0] * cameraToCenterDistance,
+ pixelsToGLUnits[1] * cameraToCenterDistance
}};
}
@@ -85,8 +87,8 @@ Values makeValues(const bool isText,
uniforms::u_texture::Value{ 0 },
uniforms::u_fade_change::Value{ symbolFadeChange },
uniforms::u_is_text::Value{ isText },
- uniforms::u_camera_to_center_distance::Value{ state.getCameraToCenterDistance() },
- uniforms::u_pitch::Value{ state.getPitch() },
+ uniforms::u_camera_to_center_distance::Value{ cameraToCenterDistance },
+ uniforms::u_pitch::Value{ pitch },
uniforms::u_pitch_with_map::Value{ pitchWithMap },
uniforms::u_max_camera_distance::Value{ values.maxCameraDistance },
uniforms::u_rotate_symbol::Value{ rotateInShader },