diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-14 11:07:54 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-14 16:28:12 -0600 |
| commit | 0351e9c3702b22ba6cbd74fb8b3c4874c93f61f8 (patch) | |
| tree | 6ae31efaf7a7779d21236c3930a1d805bf3d81ad /src/mbgl/renderer | |
| parent | b18a4d6e7804a7f919cd038b50f8a77c748778b1 (diff) | |
| download | qtlocation-mapboxgl-0351e9c3702b22ba6cbd74fb8b3c4874c93f61f8.tar.gz | |
[core] Eliminate SpritePatternMode
Diffstat (limited to 'src/mbgl/renderer')
| -rw-r--r-- | src/mbgl/renderer/painter_background.cpp | 6 | ||||
| -rw-r--r-- | src/mbgl/renderer/painter_fill.cpp | 6 | ||||
| -rw-r--r-- | src/mbgl/renderer/painter_line.cpp | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/src/mbgl/renderer/painter_background.cpp b/src/mbgl/renderer/painter_background.cpp index 6ce3b59358..4ac414335b 100644 --- a/src/mbgl/renderer/painter_background.cpp +++ b/src/mbgl/renderer/painter_background.cpp @@ -24,10 +24,8 @@ void Painter::renderBackground(PaintParameters& parameters, const BackgroundLaye const FillProgram::PaintPropertyBinders paintAttibuteData(properties, 0); if (!background.get<BackgroundPattern>().to.empty()) { - optional<SpriteAtlasElement> imagePosA = spriteAtlas->getImage( - background.get<BackgroundPattern>().from, SpritePatternMode::Repeating); - optional<SpriteAtlasElement> imagePosB = spriteAtlas->getImage( - background.get<BackgroundPattern>().to, SpritePatternMode::Repeating); + optional<SpriteAtlasElement> imagePosA = spriteAtlas->getPattern(background.get<BackgroundPattern>().from); + optional<SpriteAtlasElement> imagePosB = spriteAtlas->getPattern(background.get<BackgroundPattern>().to); if (!imagePosA || !imagePosB) return; diff --git a/src/mbgl/renderer/painter_fill.cpp b/src/mbgl/renderer/painter_fill.cpp index bdc99d42f0..4276bd06ed 100644 --- a/src/mbgl/renderer/painter_fill.cpp +++ b/src/mbgl/renderer/painter_fill.cpp @@ -24,10 +24,8 @@ void Painter::renderFill(PaintParameters& parameters, return; } - optional<SpriteAtlasElement> imagePosA = spriteAtlas->getImage( - properties.get<FillPattern>().from, SpritePatternMode::Repeating); - optional<SpriteAtlasElement> imagePosB = spriteAtlas->getImage( - properties.get<FillPattern>().to, SpritePatternMode::Repeating); + optional<SpriteAtlasElement> imagePosA = spriteAtlas->getPattern(properties.get<FillPattern>().from); + optional<SpriteAtlasElement> imagePosB = spriteAtlas->getPattern(properties.get<FillPattern>().to); if (!imagePosA || !imagePosB) { return; diff --git a/src/mbgl/renderer/painter_line.cpp b/src/mbgl/renderer/painter_line.cpp index 545f01ce88..4e19f841b1 100644 --- a/src/mbgl/renderer/painter_line.cpp +++ b/src/mbgl/renderer/painter_line.cpp @@ -61,10 +61,8 @@ void Painter::renderLine(PaintParameters& parameters, lineAtlas->getSize().width)); } else if (!properties.get<LinePattern>().from.empty()) { - optional<SpriteAtlasElement> posA = spriteAtlas->getImage( - properties.get<LinePattern>().from, SpritePatternMode::Repeating); - optional<SpriteAtlasElement> posB = spriteAtlas->getImage( - properties.get<LinePattern>().to, SpritePatternMode::Repeating); + optional<SpriteAtlasElement> posA = spriteAtlas->getPattern(properties.get<LinePattern>().from); + optional<SpriteAtlasElement> posB = spriteAtlas->getPattern(properties.get<LinePattern>().to); if (!posA || !posB) return; |