diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2016-03-08 17:18:57 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2016-05-10 14:50:56 +0200 |
commit | dde59eaf769dc2d503e8bd4ca79d0923ad877e13 (patch) | |
tree | 1743d0a0d7c50fbc2c686c6e02de838aa69dbb96 /src/mbgl/renderer/painter_clipping.cpp | |
parent | 5b640fb446693c42086489cdaa3066eb172609e6 (diff) | |
download | qtlocation-mapboxgl-dde59eaf769dc2d503e8bd4ca79d0923ad877e13.tar.gz |
[core] move Painter and dependents to new *TileID classes
Diffstat (limited to 'src/mbgl/renderer/painter_clipping.cpp')
-rw-r--r-- | src/mbgl/renderer/painter_clipping.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mbgl/renderer/painter_clipping.cpp b/src/mbgl/renderer/painter_clipping.cpp index aed4c45869..37e06922c1 100644 --- a/src/mbgl/renderer/painter_clipping.cpp +++ b/src/mbgl/renderer/painter_clipping.cpp @@ -2,12 +2,13 @@ #include <mbgl/source/source.hpp> #include <mbgl/shader/plain_shader.hpp> #include <mbgl/util/clip_id.hpp> +#include <mbgl/util/string.hpp> #include <mbgl/gl/debugging.hpp> using namespace mbgl; -void Painter::drawClippingMasks(const std::map<TileID, ClipID>& stencils) { +void Painter::drawClippingMasks(const std::map<UnwrappedTileID, ClipID>& stencils) { MBGL_DEBUG_GROUP("clipping masks"); mat4 matrix; @@ -27,8 +28,8 @@ void Painter::drawClippingMasks(const std::map<TileID, ClipID>& stencils) { const auto& id = stencil.first; const auto& clip = stencil.second; - MBGL_DEBUG_GROUP(std::string{ "mask: " } + std::string(id)); - state.matrixFor(matrix, id, id.z); + MBGL_DEBUG_GROUP(std::string{ "mask: " } + util::toString(id)); + state.matrixFor(matrix, id); matrix::multiply(matrix, projMatrix, matrix); plainShader->u_matrix = matrix; |