diff options
author | Ansis Brammanis <brammanis@gmail.com> | 2015-01-14 20:56:18 -0500 |
---|---|---|
committer | Ansis Brammanis <brammanis@gmail.com> | 2015-01-14 20:56:18 -0500 |
commit | 2643a0efc74ac8b623744f399245c8b66c61e04f (patch) | |
tree | bc8484612f8a9e9cd250cd89039bc1c5163f3f1c /src/mbgl/renderer/painter.cpp | |
parent | c6ca57045fb373d4fd76d1ec228bd35a518d06e8 (diff) | |
download | qtlocation-mapboxgl-2643a0efc74ac8b623744f399245c8b66c61e04f.tar.gz |
start porting dash lines from js
- switches to dash units that are scaled by line width
- adds a lineatlas to store patterns line dashed lines
- adds linesdf shader which renders line fill from the lineatlas
js: 8e83d76af3bd877eb9639c02e296363e2c0186f8
Diffstat (limited to 'src/mbgl/renderer/painter.cpp')
-rw-r--r-- | src/mbgl/renderer/painter.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp index 1af33c4130..0c17d52b5d 100644 --- a/src/mbgl/renderer/painter.cpp +++ b/src/mbgl/renderer/painter.cpp @@ -24,9 +24,10 @@ using namespace mbgl; #define BUFFER_OFFSET(i) ((char *)nullptr + (i)) -Painter::Painter(SpriteAtlas& spriteAtlas_, GlyphAtlas& glyphAtlas_) +Painter::Painter(SpriteAtlas& spriteAtlas_, GlyphAtlas& glyphAtlas_, LineAtlas& lineAtlas_) : spriteAtlas(spriteAtlas_) , glyphAtlas(glyphAtlas_) + , lineAtlas(lineAtlas_) { } @@ -93,6 +94,7 @@ void Painter::setupShaders() { if (!outlineShader) outlineShader = util::make_unique<OutlineShader>(); if (!lineShader) lineShader = util::make_unique<LineShader>(); if (!linejoinShader) linejoinShader = util::make_unique<LinejoinShader>(); + if (!linesdfShader) linesdfShader = util::make_unique<LineSDFShader>(); if (!linepatternShader) linepatternShader = util::make_unique<LinepatternShader>(); if (!patternShader) patternShader = util::make_unique<PatternShader>(); if (!iconShader) iconShader = util::make_unique<IconShader>(); |