summaryrefslogtreecommitdiff
path: root/src/mbgl/layout/symbol_instance.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/layout/symbol_instance.hpp')
-rw-r--r--src/mbgl/layout/symbol_instance.hpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/mbgl/layout/symbol_instance.hpp b/src/mbgl/layout/symbol_instance.hpp
index bc2ff48d33..e20c05a0ab 100644
--- a/src/mbgl/layout/symbol_instance.hpp
+++ b/src/mbgl/layout/symbol_instance.hpp
@@ -21,6 +21,8 @@ struct ShapedTextOrientations {
bool singleLine = false;
};
+enum class SymbolContent : uint8_t { None = 0, Text = 1 << 0, IconRGBA = 1 << 1, IconSDF = 1 << 2 };
+
struct SymbolInstanceSharedData {
SymbolInstanceSharedData(GeometryCoordinates line,
const ShapedTextOrientations& shapedTextOrientations,
@@ -30,6 +32,7 @@ struct SymbolInstanceSharedData {
const style::SymbolPlacementType textPlacement,
const std::array<float, 2>& textOffset,
const ImageMap& imageMap,
+ SymbolContent iconType,
bool allowVerticalPlacement);
bool empty() const;
GeometryCoordinates line;
@@ -42,13 +45,6 @@ struct SymbolInstanceSharedData {
optional<SymbolQuad> verticalIconQuad;
};
-enum class SymbolContent : uint8_t {
- None = 0,
- Text = 1 << 0,
- IconRGBA = 1 << 1,
- IconSDF = 1 << 2
-};
-
class SymbolInstance {
public:
SymbolInstance(Anchor& anchor_,