From d766af44c80ca41adbd988eeb681f90fb52ec817 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Thu, 18 May 2017 16:31:16 -0700 Subject: [core] Auto-growable SpriteAtlas using shelf-pack --- src/mbgl/annotation/annotation_manager.cpp | 3 +- src/mbgl/annotation/annotation_manager.hpp | 2 +- src/mbgl/map/map.cpp | 2 +- src/mbgl/sprite/sprite_atlas.cpp | 80 ++++++++++++++++-------------- src/mbgl/sprite/sprite_atlas.hpp | 21 ++++---- src/mbgl/style/style.cpp | 2 +- 6 files changed, 59 insertions(+), 51 deletions(-) (limited to 'src') diff --git a/src/mbgl/annotation/annotation_manager.cpp b/src/mbgl/annotation/annotation_manager.cpp index a7f1c69f3b..f04a0bb3dc 100644 --- a/src/mbgl/annotation/annotation_manager.cpp +++ b/src/mbgl/annotation/annotation_manager.cpp @@ -20,8 +20,7 @@ using namespace style; const std::string AnnotationManager::SourceID = "com.mapbox.annotations"; const std::string AnnotationManager::PointLayerID = "com.mapbox.annotations.points"; -AnnotationManager::AnnotationManager(float pixelRatio) - : spriteAtlas({ 1024, 1024 }, pixelRatio){ +AnnotationManager::AnnotationManager() { // This is a special atlas, holding only images added via addIcon, so we always treat it as // loaded. spriteAtlas.markAsLoaded(); diff --git a/src/mbgl/annotation/annotation_manager.hpp b/src/mbgl/annotation/annotation_manager.hpp index 837827b75c..4d22ac81f6 100644 --- a/src/mbgl/annotation/annotation_manager.hpp +++ b/src/mbgl/annotation/annotation_manager.hpp @@ -26,7 +26,7 @@ class Image; class AnnotationManager : private util::noncopyable { public: - AnnotationManager(float pixelRatio); + AnnotationManager(); ~AnnotationManager(); AnnotationID addAnnotation(const Annotation&, const uint8_t maxZoom); diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index e994428bf1..14a2401ed5 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -153,7 +153,7 @@ Map::Impl::Impl(Map& map_, contextMode(contextMode_), pixelRatio(pixelRatio_), programCacheDir(std::move(programCacheDir_)), - annotationManager(std::make_unique(pixelRatio)), + annotationManager(std::make_unique()), asyncInvalidate([this] { if (mode == MapMode::Continuous) { backend.invalidate(); diff --git a/src/mbgl/sprite/sprite_atlas.cpp b/src/mbgl/sprite/sprite_atlas.cpp index 57a5488105..d3f0072b20 100644 --- a/src/mbgl/sprite/sprite_atlas.cpp +++ b/src/mbgl/sprite/sprite_atlas.cpp @@ -20,22 +20,25 @@ namespace mbgl { // correct behavior of GL_LINEAR texture sampling mode. static constexpr uint16_t padding = 1; -SpriteAtlasElement::SpriteAtlasElement(Rect rect, const style::Image::Impl& image) +SpriteAtlasElement::SpriteAtlasElement(const mapbox::Bin& bin, const style::Image::Impl& image) : sdf(image.sdf), pixelRatio(image.pixelRatio), textureRect( - rect.x + padding, - rect.y + padding, - rect.w - padding * 2, - rect.h - padding * 2 + bin.x + padding, + bin.y + padding, + bin.w - padding * 2, + bin.h - padding * 2 ) { } -SpriteAtlas::SpriteAtlas(Size size, float pixelRatio) - : pixelSize(std::ceil(size.width * pixelRatio), - std::ceil(size.height * pixelRatio)), - bin(pixelSize.width, pixelSize.height), - dirty(true) { +static mapbox::ShelfPack::ShelfPackOptions shelfPackOptions() { + mapbox::ShelfPack::ShelfPackOptions options; + options.autoResize = true; + return options; +} + +SpriteAtlas::SpriteAtlas() + : shelfPack(64, 64, shelfPackOptions()) { } SpriteAtlas::~SpriteAtlas() = default; @@ -64,12 +67,12 @@ void SpriteAtlas::addImage(Immutable image_) { entry.image = std::move(image_); - if (entry.iconRect) { - copy(entry, &Entry::iconRect); + if (entry.iconBin) { + copy(entry, &Entry::iconBin); } - if (entry.patternRect) { - copy(entry, &Entry::patternRect); + if (entry.patternBin) { + copy(entry, &Entry::patternBin); } } @@ -81,12 +84,12 @@ void SpriteAtlas::removeImage(const std::string& id) { Entry& entry = it->second; - if (entry.iconRect) { - bin.release(*entry.iconRect); + if (entry.iconBin) { + shelfPack.unref(*entry.iconBin); } - if (entry.patternRect) { - bin.release(*entry.patternRect); + if (entry.patternBin) { + shelfPack.unref(*entry.patternBin); } entries.erase(it); @@ -116,16 +119,14 @@ void SpriteAtlas::removeRequestor(IconRequestor& requestor) { } optional SpriteAtlas::getIcon(const std::string& id) { - return getImage(id, &Entry::iconRect); + return getImage(id, &Entry::iconBin); } optional SpriteAtlas::getPattern(const std::string& id) { - return getImage(id, &Entry::patternRect); + return getImage(id, &Entry::patternBin); } -optional SpriteAtlas::getImage(const std::string& id, - optional> Entry::*entryRect) { - +optional SpriteAtlas::getImage(const std::string& id, mapbox::Bin* Entry::*entryBin) { auto it = entries.find(id); if (it == entries.end()) { if (!entries.empty()) { @@ -136,10 +137,10 @@ optional SpriteAtlas::getImage(const std::string& id, Entry& entry = it->second; - if (entry.*entryRect) { + if (entry.*entryBin) { assert(entry.image.get()); return SpriteAtlasElement { - *(entry.*entryRect), + *(entry.*entryBin), *entry.image }; } @@ -147,44 +148,51 @@ optional SpriteAtlas::getImage(const std::string& id, const uint16_t width = entry.image->image.size.width + padding * 2; const uint16_t height = entry.image->image.size.height + padding * 2; - Rect rect = bin.allocate(width, height); - if (rect.w == 0) { + mapbox::Bin* bin = shelfPack.packOne(-1, width, height); + if (!bin) { if (debug::spriteWarnings) { Log::Warning(Event::Sprite, "sprite atlas bitmap overflow"); } return {}; } - entry.*entryRect = rect; - copy(entry, entryRect); + entry.*entryBin = bin; + copy(entry, entryBin); return SpriteAtlasElement { - rect, + *bin, *entry.image }; } Size SpriteAtlas::getPixelSize() const { - return pixelSize; + return Size { + static_cast(shelfPack.width()), + static_cast(shelfPack.height()) + }; } -void SpriteAtlas::copy(const Entry& entry, optional> Entry::*entryRect) { +void SpriteAtlas::copy(const Entry& entry, mapbox::Bin* Entry::*entryBin) { if (!image.valid()) { image = PremultipliedImage(getPixelSize()); image.fill(0); + } else if (image.size != getPixelSize()) { + PremultipliedImage newImage(getPixelSize()); + PremultipliedImage::copy(image, newImage, { 0, 0 }, { 0, 0 }, image.size); + image = std::move(newImage); } const PremultipliedImage& src = entry.image->image; - const Rect& rect = *(entry.*entryRect); + const mapbox::Bin& bin = *(entry.*entryBin); - const uint32_t x = rect.x + padding; - const uint32_t y = rect.y + padding; + const uint32_t x = bin.x + padding; + const uint32_t y = bin.y + padding; const uint32_t w = src.size.width; const uint32_t h = src.size.height; PremultipliedImage::copy(src, image, { 0, 0 }, { x, y }, { w, h }); - if (entryRect == &Entry::patternRect) { + if (entryBin == &Entry::patternBin) { // Add 1 pixel wrapped padding on each side of the image. PremultipliedImage::copy(src, image, { 0, h - 1 }, { x, y - 1 }, { w, 1 }); // T PremultipliedImage::copy(src, image, { 0, 0 }, { x, y + h }, { w, 1 }); // B diff --git a/src/mbgl/sprite/sprite_atlas.hpp b/src/mbgl/sprite/sprite_atlas.hpp index 3629ed6eb1..f5c7fd114a 100644 --- a/src/mbgl/sprite/sprite_atlas.hpp +++ b/src/mbgl/sprite/sprite_atlas.hpp @@ -1,11 +1,13 @@ #pragma once -#include #include #include #include +#include #include +#include + #include #include #include @@ -20,7 +22,7 @@ class Context; class SpriteAtlasElement { public: - SpriteAtlasElement(Rect, const style::Image::Impl&); + SpriteAtlasElement(const mapbox::Bin&, const style::Image::Impl&); bool sdf; float pixelRatio; @@ -59,7 +61,7 @@ public: class SpriteAtlas : public util::noncopyable { public: - SpriteAtlas(Size, float pixelRatio); + SpriteAtlas(); ~SpriteAtlas(); void onSpriteLoaded(); @@ -106,7 +108,6 @@ public: } private: - const Size pixelSize; bool loaded = false; struct Entry { @@ -116,20 +117,20 @@ private: // it must have two distinct entries in the texture. The one for the icon image has // a single pixel transparent border, and the one for the pattern image has a single // pixel border wrapped from the opposite side. - optional> iconRect; - optional> patternRect; + mapbox::Bin* iconBin = nullptr; + mapbox::Bin* patternBin = nullptr; }; - optional getImage(const std::string& name, optional> Entry::*rect); - void copy(const Entry&, optional> Entry::*rect); + optional getImage(const std::string& name, mapbox::Bin* Entry::*bin); + void copy(const Entry&, mapbox::Bin* Entry::*bin); IconMap buildIconMap(); std::unordered_map entries; - BinPack bin; + mapbox::ShelfPack shelfPack; PremultipliedImage image; mbgl::optional texture; - bool dirty; + bool dirty = true; std::set requestors; IconMap icons; diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index 84ee841c06..1a4cf0ca10 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -74,7 +74,7 @@ Style::Style(Scheduler& scheduler_, FileSource& fileSource_, float pixelRatio) fileSource(fileSource_), glyphAtlas(std::make_unique(Size{ 2048, 2048 }, fileSource)), spriteLoader(std::make_unique(pixelRatio)), - spriteAtlas(std::make_unique(Size{ 1024, 1024 }, pixelRatio)), + spriteAtlas(std::make_unique()), lineAtlas(std::make_unique(Size{ 256, 512 })), light(std::make_unique()), renderLight(light->impl), -- cgit v1.2.1