diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-26 16:39:56 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-02 14:51:39 -0700 |
| commit | c902f9098b331302aaa1baac77d1575db624a132 (patch) | |
| tree | 211901cd04454aedbac40c469198438e46d7038c /src/mbgl/renderer/painter_symbol.cpp | |
| parent | 18149cbcc27a926f280b08d8d0e09104b2147688 (diff) | |
| download | qtlocation-mapboxgl-c902f9098b331302aaa1baac77d1575db624a132.tar.gz | |
[core] Rationalize naming for style-related code
Diffstat (limited to 'src/mbgl/renderer/painter_symbol.cpp')
| -rw-r--r-- | src/mbgl/renderer/painter_symbol.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/mbgl/renderer/painter_symbol.cpp b/src/mbgl/renderer/painter_symbol.cpp index 9774568074..3c453242ae 100644 --- a/src/mbgl/renderer/painter_symbol.cpp +++ b/src/mbgl/renderer/painter_symbol.cpp @@ -1,6 +1,7 @@ #include <mbgl/renderer/painter.hpp> #include <mbgl/renderer/symbol_bucket.hpp> -#include <mbgl/layer/symbol_layer.hpp> +#include <mbgl/style/layers/symbol_layer.hpp> +#include <mbgl/style/layers/symbol_layer_impl.hpp> #include <mbgl/geometry/glyph_atlas.hpp> #include <mbgl/sprite/sprite_atlas.hpp> #include <mbgl/shader/sdf_shader.hpp> @@ -10,7 +11,9 @@ #include <cmath> -using namespace mbgl; +namespace mbgl { + +using namespace style; void Painter::renderSDF(SymbolBucket &bucket, const UnwrappedTileID &tileID, @@ -257,3 +260,5 @@ void Painter::renderSymbol(SymbolBucket& bucket, config.activeTexture = GL_TEXTURE0; } + +} |