diff options
| author | Ansis Brammanis <brammanis@gmail.com> | 2016-01-13 16:32:40 -0800 |
|---|---|---|
| committer | Ansis Brammanis <brammanis@gmail.com> | 2016-01-13 16:39:02 -0800 |
| commit | 5119ce8155713e9f601b2a5dd6c6dc5aefcb93ed (patch) | |
| tree | 90ee6105691a14ca40ff634b229f8271e591ae9d | |
| parent | f7acc91d2116340b4e0e5386e00b9d5ebfd2dc1c (diff) | |
| download | qtlocation-mapboxgl-5119ce8155713e9f601b2a5dd6c6dc5aefcb93ed.tar.gz | |
[core] fix overscaled line patterns and re-enable render tests
fix #3489
fix #2648
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | src/mbgl/renderer/painter_line.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/package.json b/package.json index 0e1ca758b6..69ad5d9ed3 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ ], "devDependencies": { "aws-sdk": "^2.2.21", - "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#c8982f16ef5d39164b2e4f33bc3f993f9ac17502", + "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#0fea16f7d1e0e0922f00da793e21a2420f6b8748", "node-gyp": "^3.2.1", "request": "^2.67.0", "tape": "^4.2.2" diff --git a/src/mbgl/renderer/painter_line.cpp b/src/mbgl/renderer/painter_line.cpp index d6bc99976a..4fa6c25523 100644 --- a/src/mbgl/renderer/painter_line.cpp +++ b/src/mbgl/renderer/painter_line.cpp @@ -51,7 +51,7 @@ void Painter::renderLine(LineBucket& bucket, const LineLayer& layer, const TileI color[2] *= properties.opacity; color[3] *= properties.opacity; - float ratio = state.getScale() / std::pow(2, id.z) / 8.0 * id.overscaling; + float ratio = state.getScale() / std::pow(2, id.z) / (4096.0 / (512.0 * id.overscaling)); mat2 antialiasingMatrix; matrix::identity(antialiasingMatrix); @@ -109,7 +109,7 @@ void Painter::renderLine(LineBucket& bucket, const LineLayer& layer, const TileI if (!imagePosA || !imagePosB) return; - float factor = 8.0 / std::pow(2, state.getIntegerZoom() - id.z) * id.overscaling; + float factor = 4096.0 / (512 * id.overscaling) / std::pow(2, state.getIntegerZoom() - id.z); config.program = linepatternShader->program; |