[core] Per-bucket glyph atlases

2017-06-01 10:30:49 -07:00
parent b201a7900f
commit 92252849c1
36 changed files with 409 additions and 474 deletions
--- a/test/tile/vector_tile.test.cpp
+++ b/test/tile/vector_tile.test.cpp
@@ -14,7 +14,7 @@
 #include <mbgl/geometry/feature_index.hpp>
 #include <mbgl/annotation/annotation_manager.hpp>
 #include <mbgl/sprite/sprite_atlas.hpp>
-#include <mbgl/text/glyph_atlas.hpp>
+#include <mbgl/text/glyph_manager.hpp>

 #include <memory>

@@ -28,7 +28,7 @@ public:
    ThreadPool threadPool { 1 };
    AnnotationManager annotationManager;
    SpriteAtlas spriteAtlas;
-    GlyphAtlas glyphAtlas { { 512, 512, }, fileSource };
+    GlyphManager glyphManager { fileSource };
    Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" };

    TileParameters tileParameters {
@@ -40,7 +40,7 @@ public:
        MapMode::Continuous,
        annotationManager,
        spriteAtlas,
-        glyphAtlas
+        glyphManager
    };
 };