From ff0c895eaa9e8b0bbe5739550e54230b0286a757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Tue, 6 Sep 2016 12:35:31 +0200 Subject: [core] change bool wrap/repeating to enum class SpritePatternMode --- src/mbgl/renderer/painter_background.cpp | 6 ++++-- src/mbgl/renderer/painter_fill.cpp | 6 ++++-- src/mbgl/renderer/painter_line.cpp | 6 ++++-- src/mbgl/renderer/symbol_bucket.cpp | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) (limited to 'src/mbgl/renderer') diff --git a/src/mbgl/renderer/painter_background.cpp b/src/mbgl/renderer/painter_background.cpp index 51a892575b..48c03fe3f9 100644 --- a/src/mbgl/renderer/painter_background.cpp +++ b/src/mbgl/renderer/painter_background.cpp @@ -27,8 +27,10 @@ void Painter::renderBackground(PaintParameters& parameters, const BackgroundLaye auto& arrayBackground = parameters.shaders.backgroundArray; if (isPatterned) { - imagePosA = spriteAtlas->getPosition(properties.backgroundPattern.value.from, true); - imagePosB = spriteAtlas->getPosition(properties.backgroundPattern.value.to, true); + imagePosA = spriteAtlas->getPosition(properties.backgroundPattern.value.from, + SpritePatternMode::Repeating); + imagePosB = spriteAtlas->getPosition(properties.backgroundPattern.value.to, + SpritePatternMode::Repeating); if (!imagePosA || !imagePosB) return; diff --git a/src/mbgl/renderer/painter_fill.cpp b/src/mbgl/renderer/painter_fill.cpp index 9af2af9d10..106d030fcc 100644 --- a/src/mbgl/renderer/painter_fill.cpp +++ b/src/mbgl/renderer/painter_fill.cpp @@ -73,8 +73,10 @@ void Painter::renderFill(PaintParameters& parameters, } if (pattern) { - optional imagePosA = spriteAtlas->getPosition(properties.fillPattern.value.from, true); - optional imagePosB = spriteAtlas->getPosition(properties.fillPattern.value.to, true); + optional imagePosA = spriteAtlas->getPosition( + properties.fillPattern.value.from, SpritePatternMode::Repeating); + optional imagePosB = + spriteAtlas->getPosition(properties.fillPattern.value.to, SpritePatternMode::Repeating); // Image fill. if (pass == RenderPass::Translucent && imagePosA && imagePosB) { diff --git a/src/mbgl/renderer/painter_line.cpp b/src/mbgl/renderer/painter_line.cpp index ed1975f955..b0b2bf6924 100644 --- a/src/mbgl/renderer/painter_line.cpp +++ b/src/mbgl/renderer/painter_line.cpp @@ -99,8 +99,10 @@ void Painter::renderLine(PaintParameters& parameters, bucket.drawLineSDF(linesdfShader, store, isOverdraw()); } else if (!properties.linePattern.value.from.empty()) { - optional imagePosA = spriteAtlas->getPosition(properties.linePattern.value.from, true); - optional imagePosB = spriteAtlas->getPosition(properties.linePattern.value.to, true); + optional imagePosA = spriteAtlas->getPosition( + properties.linePattern.value.from, SpritePatternMode::Repeating); + optional imagePosB = + spriteAtlas->getPosition(properties.linePattern.value.to, SpritePatternMode::Repeating); if (!imagePosA || !imagePosB) return; diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp index 008372b2bf..842322ddcc 100644 --- a/src/mbgl/renderer/symbol_bucket.cpp +++ b/src/mbgl/renderer/symbol_bucket.cpp @@ -273,7 +273,7 @@ void SymbolBucket::addFeatures(uintptr_t tileUID, // if feature has icon, get sprite atlas position if (feature.sprite.length()) { - auto image = spriteAtlas.getImage(feature.sprite, false); + auto image = spriteAtlas.getImage(feature.sprite, SpritePatternMode::Single); if (image) { shapedIcon = shapeIcon(*image, layout); assert((*image).spriteImage); -- cgit v1.2.1