From bfcd21dd7e1531466be365447bb9a9630ed20d31 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Mon, 13 Jun 2016 12:28:25 +0300 Subject: [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. --- src/mbgl/renderer/painter_line.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') 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); -- cgit v1.2.1