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/text/quads.cpp | |
| parent | 18149cbcc27a926f280b08d8d0e09104b2147688 (diff) | |
| download | qtlocation-mapboxgl-c902f9098b331302aaa1baac77d1575db624a132.tar.gz | |
[core] Rationalize naming for style-related code
Diffstat (limited to 'src/mbgl/text/quads.cpp')
| -rw-r--r-- | src/mbgl/text/quads.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mbgl/text/quads.cpp b/src/mbgl/text/quads.cpp index 3cb508a102..ce320791c3 100644 --- a/src/mbgl/text/quads.cpp +++ b/src/mbgl/text/quads.cpp @@ -2,13 +2,15 @@ #include <mbgl/text/shaping.hpp> #include <mbgl/tile/geometry_tile.hpp> #include <mbgl/geometry/anchor.hpp> -#include <mbgl/layer/symbol_layer_properties.hpp> +#include <mbgl/style/layers/symbol_layer_properties.hpp> #include <mbgl/util/math.hpp> #include <mbgl/util/constants.hpp> #include <cassert> namespace mbgl { +using namespace style; + const float globalMinScale = 0.5f; // underscale by 1 zoom level SymbolQuads getIconQuads(Anchor& anchor, const PositionedIcon& shapedIcon, |