diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-07-08 16:23:13 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-07-11 18:39:50 -0700 |
commit | ae838b397b6e5ca85d30fe1a8b9ccbb74864a7a6 (patch) | |
tree | b0c98220cab6a8ffed1c44a9f1f7e9ca71261bc6 /src/mbgl/renderer/painter_symbol.cpp | |
parent | a27b5586e56f8d967a5df4e883225dca0e7ddc3e (diff) | |
download | qtlocation-mapboxgl-ae838b397b6e5ca85d30fe1a8b9ccbb74864a7a6.tar.gz |
[core] Move translatedMatrix to RenderTile
Diffstat (limited to 'src/mbgl/renderer/painter_symbol.cpp')
-rw-r--r-- | src/mbgl/renderer/painter_symbol.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mbgl/renderer/painter_symbol.cpp b/src/mbgl/renderer/painter_symbol.cpp index 4c2847401f..8599329842 100644 --- a/src/mbgl/renderer/painter_symbol.cpp +++ b/src/mbgl/renderer/painter_symbol.cpp @@ -15,7 +15,7 @@ namespace mbgl { using namespace style; -void Painter::renderSDF(SymbolBucket &bucket, +void Painter::renderSDF(SymbolBucket& bucket, const RenderTile& tile, float sdfFontSize, std::array<float, 2> texsize, @@ -37,7 +37,7 @@ void Painter::renderSDF(SymbolBucket &bucket, TranslateAnchorType translateAnchor, float paintSize) { - mat4 vtxMatrix = translatedMatrix(tile.matrix, translate, tile.id, translateAnchor); + mat4 vtxMatrix = tile.translatedMatrix(translate, translateAnchor, state); // If layerStyle.size > bucket.info.fontSize then labels may collide float fontSize = paintSize; @@ -185,8 +185,9 @@ void Painter::renderSymbol(PaintParameters& parameters, paint.iconTranslateAnchor, layer.impl->iconSize); } else { - mat4 vtxMatrix = - translatedMatrix(tile.matrix, paint.iconTranslate, tile.id, paint.iconTranslateAnchor); + mat4 vtxMatrix = tile.translatedMatrix(paint.iconTranslate, + paint.iconTranslateAnchor, + state); std::array<float, 2> extrudeScale; |