summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnsis Brammanis <brammanis@gmail.com>2016-01-26 12:38:17 -0800
committerAnsis Brammanis <brammanis@gmail.com>2016-01-26 13:27:16 -0800
commit9dcaab193359f3de1a9d9750363cc547a2e69093 (patch)
treebc9e0229f7cd16ce79b5bb76b4af1cd34f188581
parenta3284ad7e212a8b17906d9218b4837bb485dd61f (diff)
downloadqtlocation-mapboxgl-9dcaab193359f3de1a9d9750363cc547a2e69093.tar.gz
[core] bump sprite atlas to 1024x1024
-rw-r--r--src/mbgl/annotation/annotation_manager.cpp2
-rw-r--r--src/mbgl/renderer/painter_symbol.cpp2
-rw-r--r--src/mbgl/style/style.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/annotation/annotation_manager.cpp b/src/mbgl/annotation/annotation_manager.cpp
index b4d9fe4b66..1d9c021fa6 100644
--- a/src/mbgl/annotation/annotation_manager.cpp
+++ b/src/mbgl/annotation/annotation_manager.cpp
@@ -12,7 +12,7 @@ const std::string AnnotationManager::PointLayerID = "com.mapbox.annotations.poin
AnnotationManager::AnnotationManager(float pixelRatio)
: spriteStore(pixelRatio),
- spriteAtlas(512, 512, pixelRatio, spriteStore) {
+ spriteAtlas(1024, 1024, pixelRatio, spriteStore) {
}
AnnotationManager::~AnnotationManager() = default;
diff --git a/src/mbgl/renderer/painter_symbol.cpp b/src/mbgl/renderer/painter_symbol.cpp
index 341e7627d9..1a80d52bba 100644
--- a/src/mbgl/renderer/painter_symbol.cpp
+++ b/src/mbgl/renderer/painter_symbol.cpp
@@ -230,7 +230,7 @@ void Painter::renderSymbol(SymbolBucket& bucket, const SymbolLayer& layer, const
config.program = iconShader->program;
iconShader->u_matrix = vtxMatrix;
iconShader->u_exmatrix = exMatrix;
- iconShader->u_texsize = {{ float(spriteAtlas->getWidth()) / 4.0f, float(spriteAtlas->getHeight()) / 4.0f }};
+ iconShader->u_texsize = {{ float(activeSpriteAtlas->getWidth()) / 4.0f, float(activeSpriteAtlas->getHeight()) / 4.0f }};
iconShader->u_skewed = skewed;
iconShader->u_extra = extra;
iconShader->u_texture = 0;
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index ca18cd9247..18b0d7f3fd 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -35,7 +35,7 @@ Style::Style(MapData& data_)
glyphStore(std::make_unique<GlyphStore>()),
glyphAtlas(std::make_unique<GlyphAtlas>(1024, 1024)),
spriteStore(std::make_unique<SpriteStore>(data.pixelRatio)),
- spriteAtlas(std::make_unique<SpriteAtlas>(512, 512, data.pixelRatio, *spriteStore)),
+ spriteAtlas(std::make_unique<SpriteAtlas>(1024, 1024, data.pixelRatio, *spriteStore)),
lineAtlas(std::make_unique<LineAtlas>(512, 512)),
workers(4) {
glyphStore->setObserver(this);