diff options
Diffstat (limited to 'src/mbgl')
| -rw-r--r-- | src/mbgl/layout/symbol_instance.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/layout/symbol_instance.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/layout/symbol_layout.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/text/quads.cpp | 4 | ||||
| -rw-r--r-- | src/mbgl/text/quads.hpp | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/mbgl/layout/symbol_instance.cpp b/src/mbgl/layout/symbol_instance.cpp index 2264bfdc92..8bdc528bbb 100644 --- a/src/mbgl/layout/symbol_instance.cpp +++ b/src/mbgl/layout/symbol_instance.cpp @@ -9,7 +9,7 @@ SymbolInstance::SymbolInstance(Anchor& anchor, const GeometryCoordinates& line, const std::pair<Shaping, Shaping>& shapedTextOrientations, const PositionedIcon& shapedIcon, - const SymbolLayoutProperties::PossiblyEvaluated& layout, + const SymbolLayoutProperties::Evaluated& layout, const bool addToBuffers, const uint32_t index_, const float textBoxScale, diff --git a/src/mbgl/layout/symbol_instance.hpp b/src/mbgl/layout/symbol_instance.hpp index 0980eb492b..70ebfeefa2 100644 --- a/src/mbgl/layout/symbol_instance.hpp +++ b/src/mbgl/layout/symbol_instance.hpp @@ -16,7 +16,7 @@ public: const GeometryCoordinates& line, const std::pair<Shaping, Shaping>& shapedTextOrientations, const PositionedIcon& shapedIcon, - const style::SymbolLayoutProperties::PossiblyEvaluated&, + const style::SymbolLayoutProperties::Evaluated&, const bool inside, const uint32_t index, const float textBoxScale, diff --git a/src/mbgl/layout/symbol_layout.cpp b/src/mbgl/layout/symbol_layout.cpp index 8e36bb84ea..7b77bdaf6f 100644 --- a/src/mbgl/layout/symbol_layout.cpp +++ b/src/mbgl/layout/symbol_layout.cpp @@ -347,7 +347,7 @@ void SymbolLayout::addFeature(const std::size_t index, const bool addToBuffers = mode == MapMode::Still || withinPlus0; - symbolInstances.emplace_back(anchor, line, shapedTextOrientations, shapedIcon, layout, addToBuffers, symbolInstances.size(), + symbolInstances.emplace_back(anchor, line, shapedTextOrientations, shapedIcon, layout.evaluate(zoom, feature), addToBuffers, symbolInstances.size(), textBoxScale, textPadding, textPlacement, iconBoxScale, iconPadding, iconPlacement, face, indexedFeature, index); diff --git a/src/mbgl/text/quads.cpp b/src/mbgl/text/quads.cpp index d3edafa1a0..b13a6a71e5 100644 --- a/src/mbgl/text/quads.cpp +++ b/src/mbgl/text/quads.cpp @@ -18,7 +18,7 @@ const float globalMinScale = 0.5f; // underscale by 1 zoom level SymbolQuad getIconQuad(const Anchor& anchor, const PositionedIcon& shapedIcon, const GeometryCoordinates& line, - const SymbolLayoutProperties::PossiblyEvaluated& layout, + const SymbolLayoutProperties::Evaluated& layout, const style::SymbolPlacementType placement, const Shaping& shapedText) { auto image = *(shapedIcon.image); @@ -292,7 +292,7 @@ SymbolQuads getGlyphQuads(Anchor& anchor, const Shaping& shapedText, const float boxScale, const GeometryCoordinates& line, - const SymbolLayoutProperties::PossiblyEvaluated& layout, + const SymbolLayoutProperties::Evaluated& layout, const style::SymbolPlacementType placement, const GlyphPositions& face) { const float textRotate = layout.get<TextRotate>() * util::DEG2RAD; diff --git a/src/mbgl/text/quads.hpp b/src/mbgl/text/quads.hpp index 7e3b5ca405..f1529d8829 100644 --- a/src/mbgl/text/quads.hpp +++ b/src/mbgl/text/quads.hpp @@ -54,7 +54,7 @@ typedef std::vector<SymbolQuad> SymbolQuads; SymbolQuad getIconQuad(const Anchor& anchor, const PositionedIcon& shapedIcon, const GeometryCoordinates& line, - const style::SymbolLayoutProperties::PossiblyEvaluated&, + const style::SymbolLayoutProperties::Evaluated&, style::SymbolPlacementType placement, const Shaping& shapedText); @@ -62,7 +62,7 @@ SymbolQuads getGlyphQuads(Anchor& anchor, const Shaping& shapedText, const float boxScale, const GeometryCoordinates& line, - const style::SymbolLayoutProperties::PossiblyEvaluated&, + const style::SymbolLayoutProperties::Evaluated&, style::SymbolPlacementType placement, const GlyphPositions& face); |