store glyphAtlas by value in Map object, pass by ref

change hasData signiture to expect ```StyleLayer const&```
This commit is contained in:
artemp
2014-10-29 13:44:26 -04:00
parent 3723481319
commit 3b5b15a4e4
11 changed files with 22 additions and 28 deletions

View File

@@ -41,10 +41,10 @@ Map::Map(View& view_)
main_thread(uv_thread_self()),
#endif
transform(view_),
glyphAtlas(std::make_shared<GlyphAtlas>(1024, 1024)),
glyphAtlas(1024, 1024),
spriteAtlas(std::make_shared<SpriteAtlas>(512, 512)),
texturepool(std::make_shared<Texturepool>()),
painter(*spriteAtlas, *glyphAtlas) {
painter(*spriteAtlas, glyphAtlas) {
view.initialize(this);
@@ -64,7 +64,6 @@ Map::~Map() {
sprite.reset();
spriteAtlas.reset();
glyphStore.reset();
glyphAtlas.reset();
style.reset();
fileSource.reset();
workers.reset();