diff --git a/src/render/draw_hillshade.js b/src/render/draw_hillshade.js index 03955fae95f..24e47427dbb 100644 --- a/src/render/draw_hillshade.js +++ b/src/render/draw_hillshade.js @@ -56,7 +56,7 @@ function renderHillshade(painter, tile, layer) { if (!fbo) return; const program = painter.useProgram('hillshade'); - const posMatrix = painter.transform.calculatePosMatrix(tile.tileID.toUnwrapped()); + const posMatrix = painter.transform.calculatePosMatrix(tile.tileID.toUnwrapped(), true); setLight(program, painter, layer); // for scaling the magnitude of a points slope by its latitude const latRange = getTileLatRange(painter, tile.tileID); diff --git a/test/integration/render-tests/combinations/background-opaque--hillshade-translucent/expected.png b/test/integration/render-tests/combinations/background-opaque--hillshade-translucent/expected.png index a500fe6d155..5261e97ab7d 100644 Binary files a/test/integration/render-tests/combinations/background-opaque--hillshade-translucent/expected.png and b/test/integration/render-tests/combinations/background-opaque--hillshade-translucent/expected.png differ diff --git a/test/integration/render-tests/combinations/background-translucent--hillshade-translucent/expected.png b/test/integration/render-tests/combinations/background-translucent--hillshade-translucent/expected.png index cb6fdf5573e..f35be6e2d25 100644 Binary files a/test/integration/render-tests/combinations/background-translucent--hillshade-translucent/expected.png and b/test/integration/render-tests/combinations/background-translucent--hillshade-translucent/expected.png differ diff --git a/test/integration/render-tests/combinations/circle-translucent--hillshade-translucent/expected.png b/test/integration/render-tests/combinations/circle-translucent--hillshade-translucent/expected.png index 7c31e1c1462..1275c54f90e 100644 Binary files a/test/integration/render-tests/combinations/circle-translucent--hillshade-translucent/expected.png and b/test/integration/render-tests/combinations/circle-translucent--hillshade-translucent/expected.png differ diff --git a/test/integration/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/expected.png b/test/integration/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/expected.png index 6485e5b2bec..31526816877 100644 Binary files a/test/integration/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/expected.png and b/test/integration/render-tests/combinations/fill-extrusion-translucent--hillshade-translucent/expected.png differ diff --git a/test/integration/render-tests/combinations/fill-opaque--hillshade-translucent/expected.png b/test/integration/render-tests/combinations/fill-opaque--hillshade-translucent/expected.png index e62d9e78226..289ec25c420 100644 Binary files a/test/integration/render-tests/combinations/fill-opaque--hillshade-translucent/expected.png and b/test/integration/render-tests/combinations/fill-opaque--hillshade-translucent/expected.png differ diff --git a/test/integration/render-tests/combinations/fill-translucent--hillshade-translucent/expected.png b/test/integration/render-tests/combinations/fill-translucent--hillshade-translucent/expected.png index c0e3736c2eb..177cdb1b252 100644 Binary files a/test/integration/render-tests/combinations/fill-translucent--hillshade-translucent/expected.png and b/test/integration/render-tests/combinations/fill-translucent--hillshade-translucent/expected.png differ diff --git a/test/integration/render-tests/combinations/heatmap-translucent--hillshade-translucent/expected.png b/test/integration/render-tests/combinations/heatmap-translucent--hillshade-translucent/expected.png index 68aeda8ec9f..a67f1fc8267 100644 Binary files a/test/integration/render-tests/combinations/heatmap-translucent--hillshade-translucent/expected.png and b/test/integration/render-tests/combinations/heatmap-translucent--hillshade-translucent/expected.png differ diff --git a/test/integration/render-tests/combinations/hillshade-translucent--background-translucent/expected.png b/test/integration/render-tests/combinations/hillshade-translucent--background-translucent/expected.png index 02e5c7f2321..213a5e55e8e 100644 Binary files a/test/integration/render-tests/combinations/hillshade-translucent--background-translucent/expected.png and b/test/integration/render-tests/combinations/hillshade-translucent--background-translucent/expected.png differ diff --git a/test/integration/render-tests/combinations/hillshade-translucent--circle-translucent/expected.png b/test/integration/render-tests/combinations/hillshade-translucent--circle-translucent/expected.png index 69e6c3ea7bf..0938be2181a 100644 Binary files a/test/integration/render-tests/combinations/hillshade-translucent--circle-translucent/expected.png and b/test/integration/render-tests/combinations/hillshade-translucent--circle-translucent/expected.png differ diff --git a/test/integration/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/expected.png b/test/integration/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/expected.png index 7cddbb4fda0..e24fced77f9 100644 Binary files a/test/integration/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/expected.png and b/test/integration/render-tests/combinations/hillshade-translucent--fill-extrusion-translucent/expected.png differ diff --git a/test/integration/render-tests/combinations/hillshade-translucent--fill-opaque/expected.png b/test/integration/render-tests/combinations/hillshade-translucent--fill-opaque/expected.png index 7d8a3ae1a62..48d0439f2c2 100644 Binary files a/test/integration/render-tests/combinations/hillshade-translucent--fill-opaque/expected.png and b/test/integration/render-tests/combinations/hillshade-translucent--fill-opaque/expected.png differ diff --git a/test/integration/render-tests/combinations/hillshade-translucent--fill-translucent/expected.png b/test/integration/render-tests/combinations/hillshade-translucent--fill-translucent/expected.png index d9bbe0dded4..22e5ad02186 100644 Binary files a/test/integration/render-tests/combinations/hillshade-translucent--fill-translucent/expected.png and b/test/integration/render-tests/combinations/hillshade-translucent--fill-translucent/expected.png differ diff --git a/test/integration/render-tests/combinations/hillshade-translucent--heatmap-translucent/expected.png b/test/integration/render-tests/combinations/hillshade-translucent--heatmap-translucent/expected.png index c0ffbb33534..2594d7728ff 100644 Binary files a/test/integration/render-tests/combinations/hillshade-translucent--heatmap-translucent/expected.png and b/test/integration/render-tests/combinations/hillshade-translucent--heatmap-translucent/expected.png differ diff --git a/test/integration/render-tests/combinations/hillshade-translucent--hillshade-translucent/expected.png b/test/integration/render-tests/combinations/hillshade-translucent--hillshade-translucent/expected.png index 3de853ee948..23e47c83cda 100644 Binary files a/test/integration/render-tests/combinations/hillshade-translucent--hillshade-translucent/expected.png and b/test/integration/render-tests/combinations/hillshade-translucent--hillshade-translucent/expected.png differ diff --git a/test/integration/render-tests/combinations/hillshade-translucent--line-translucent/expected.png b/test/integration/render-tests/combinations/hillshade-translucent--line-translucent/expected.png index 1fea6951ab4..55583ed39ae 100644 Binary files a/test/integration/render-tests/combinations/hillshade-translucent--line-translucent/expected.png and b/test/integration/render-tests/combinations/hillshade-translucent--line-translucent/expected.png differ diff --git a/test/integration/render-tests/combinations/hillshade-translucent--raster-translucent/expected.png b/test/integration/render-tests/combinations/hillshade-translucent--raster-translucent/expected.png index ae61cc01805..744e5ee108c 100644 Binary files a/test/integration/render-tests/combinations/hillshade-translucent--raster-translucent/expected.png and b/test/integration/render-tests/combinations/hillshade-translucent--raster-translucent/expected.png differ diff --git a/test/integration/render-tests/combinations/hillshade-translucent--symbol-translucent/expected.png b/test/integration/render-tests/combinations/hillshade-translucent--symbol-translucent/expected.png index 06d9f074a88..1ae9e92fa12 100644 Binary files a/test/integration/render-tests/combinations/hillshade-translucent--symbol-translucent/expected.png and b/test/integration/render-tests/combinations/hillshade-translucent--symbol-translucent/expected.png differ diff --git a/test/integration/render-tests/combinations/line-translucent--hillshade-translucent/expected.png b/test/integration/render-tests/combinations/line-translucent--hillshade-translucent/expected.png index 71a48679705..bedc52c75d7 100644 Binary files a/test/integration/render-tests/combinations/line-translucent--hillshade-translucent/expected.png and b/test/integration/render-tests/combinations/line-translucent--hillshade-translucent/expected.png differ diff --git a/test/integration/render-tests/combinations/raster-translucent--hillshade-translucent/expected.png b/test/integration/render-tests/combinations/raster-translucent--hillshade-translucent/expected.png index d439aa3af1e..4ce26449394 100644 Binary files a/test/integration/render-tests/combinations/raster-translucent--hillshade-translucent/expected.png and b/test/integration/render-tests/combinations/raster-translucent--hillshade-translucent/expected.png differ diff --git a/test/integration/render-tests/combinations/symbol-translucent--hillshade-translucent/expected.png b/test/integration/render-tests/combinations/symbol-translucent--hillshade-translucent/expected.png index 7e07d51d304..8c16eca14f5 100644 Binary files a/test/integration/render-tests/combinations/symbol-translucent--hillshade-translucent/expected.png and b/test/integration/render-tests/combinations/symbol-translucent--hillshade-translucent/expected.png differ diff --git a/test/integration/render-tests/hillshade-accent-color/default/expected.png b/test/integration/render-tests/hillshade-accent-color/default/expected.png index 751c59fa97c..7a62ee900a4 100644 Binary files a/test/integration/render-tests/hillshade-accent-color/default/expected.png and b/test/integration/render-tests/hillshade-accent-color/default/expected.png differ diff --git a/test/integration/render-tests/hillshade-accent-color/literal/expected.png b/test/integration/render-tests/hillshade-accent-color/literal/expected.png index b18e72bba54..e235f57f5bb 100644 Binary files a/test/integration/render-tests/hillshade-accent-color/literal/expected.png and b/test/integration/render-tests/hillshade-accent-color/literal/expected.png differ diff --git a/test/integration/render-tests/hillshade-accent-color/zoom-function/expected.png b/test/integration/render-tests/hillshade-accent-color/zoom-function/expected.png index 6606c3e7242..090f30b6c46 100644 Binary files a/test/integration/render-tests/hillshade-accent-color/zoom-function/expected.png and b/test/integration/render-tests/hillshade-accent-color/zoom-function/expected.png differ diff --git a/test/integration/render-tests/hillshade-highlight-color/default/expected.png b/test/integration/render-tests/hillshade-highlight-color/default/expected.png index 751c59fa97c..7a62ee900a4 100644 Binary files a/test/integration/render-tests/hillshade-highlight-color/default/expected.png and b/test/integration/render-tests/hillshade-highlight-color/default/expected.png differ diff --git a/test/integration/render-tests/hillshade-highlight-color/literal/expected.png b/test/integration/render-tests/hillshade-highlight-color/literal/expected.png index a5734406d1b..cf9abe37711 100644 Binary files a/test/integration/render-tests/hillshade-highlight-color/literal/expected.png and b/test/integration/render-tests/hillshade-highlight-color/literal/expected.png differ diff --git a/test/integration/render-tests/hillshade-highlight-color/zoom-function/expected.png b/test/integration/render-tests/hillshade-highlight-color/zoom-function/expected.png index 7eaaef17d06..ed87d3edb7d 100644 Binary files a/test/integration/render-tests/hillshade-highlight-color/zoom-function/expected.png and b/test/integration/render-tests/hillshade-highlight-color/zoom-function/expected.png differ diff --git a/test/integration/render-tests/hillshade-shadow-color/default/expected.png b/test/integration/render-tests/hillshade-shadow-color/default/expected.png index 751c59fa97c..7a62ee900a4 100644 Binary files a/test/integration/render-tests/hillshade-shadow-color/default/expected.png and b/test/integration/render-tests/hillshade-shadow-color/default/expected.png differ diff --git a/test/integration/render-tests/hillshade-shadow-color/literal/expected.png b/test/integration/render-tests/hillshade-shadow-color/literal/expected.png index 1097b1de4db..21e91777fa1 100644 Binary files a/test/integration/render-tests/hillshade-shadow-color/literal/expected.png and b/test/integration/render-tests/hillshade-shadow-color/literal/expected.png differ diff --git a/test/integration/render-tests/hillshade-shadow-color/zoom-function/expected.png b/test/integration/render-tests/hillshade-shadow-color/zoom-function/expected.png index 09cf48f16c9..279f98d1638 100644 Binary files a/test/integration/render-tests/hillshade-shadow-color/zoom-function/expected.png and b/test/integration/render-tests/hillshade-shadow-color/zoom-function/expected.png differ