summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2016-06-13 12:28:25 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2016-06-13 13:16:47 +0300
commitbfcd21dd7e1531466be365447bb9a9630ed20d31 (patch)
tree6ece80d4eff871e48411b7d578912b53af327da4 /src
parent2bdecdf9f9a93c30f7d482f9993c47b86a9f5eb8 (diff)
downloadqtlocation-mapboxgl-bfcd21dd7e1531466be365447bb9a9630ed20d31.tar.gz
[core] Update line-pattern shader code/tests
Refs: - mapbox-gl-test-suite: https://github.com/mapbox/mapbox-gl-test-suite/pull/107 - mapbox-gl-shaders: https://github.com/mapbox/mapbox-gl-shaders/pull/17 - mapbox-gl-js: https://github.com/mapbox/mapbox-gl-js/pull/2724 Part of https://github.com/mapbox/mapbox-gl-shaders/issues/1.
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/renderer/painter_line.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/renderer/painter_line.cpp b/src/mbgl/renderer/painter_line.cpp
index 26041a8165..199fb49a58 100644
--- a/src/mbgl/renderer/painter_line.cpp
+++ b/src/mbgl/renderer/painter_line.cpp
@@ -53,9 +53,9 @@ void Painter::renderLine(LineBucket& bucket,
// calculate how much longer the real world distance is at the top of the screen
// than at the middle of the screen.
- float topedgelength = std::sqrt(std::pow(state.getHeight(), 2) / 4 * (1 + std::pow(state.getAltitude(), 2)));
+ float topedgelength = std::sqrt(std::pow(state.getHeight(), 2.0f) / 4.0f * (1.0f + std::pow(state.getAltitude(), 2.0f)));
float x = state.getHeight() / 2.0f * std::tan(state.getPitch());
- float extra = (topedgelength + x) / topedgelength - 1;
+ float extra = (topedgelength + x) / topedgelength - 1.0f;
mat4 vtxMatrix =
translatedMatrix(matrix, properties.lineTranslate, tileID, properties.lineTranslateAnchor);