add text rendering code

2014-03-21 17:36:29 +01:00
parent a7b9b96d4d
commit ea6b24d02d
13 changed files with 241 additions and 35 deletions
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -15,8 +15,8 @@ Map::Map(Settings& settings)
      transform(),
      texturepool(),
      style(),
-      painter(transform, settings, style),
      glyphAtlas(1024, 1024),
+      painter(transform, settings, style, glyphAtlas),
      min_zoom(0),
      max_zoom((use_raster ? kTileRasterMaxZoom : kTileVectorMaxZoom)) {
 }
@@ -443,8 +443,6 @@ bool Map::render() {
        transform.updateAnimations();
    }

-    glyphAtlas.bind();
-
    if (*style.sprite->raster && !style.sprite->raster->textured) {
        style.sprite->raster->setTexturepool(&texturepool);
    }