diff options
Diffstat (limited to 'src/mbgl/layout/symbol_instance.hpp')
-rw-r--r-- | src/mbgl/layout/symbol_instance.hpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/mbgl/layout/symbol_instance.hpp b/src/mbgl/layout/symbol_instance.hpp index 0ad97edf87..b9217c44ae 100644 --- a/src/mbgl/layout/symbol_instance.hpp +++ b/src/mbgl/layout/symbol_instance.hpp @@ -5,19 +5,12 @@ #include <mbgl/text/collision_feature.hpp> #include <mbgl/style/layers/symbol_layer_properties.hpp> + namespace mbgl { class Anchor; class IndexedSubfeature; -class OpacityState { - public: - OpacityState() : opacity(0), targetOpacity(0) {} - float opacity; - float targetOpacity; - TimePoint time; -}; - class SymbolInstance { public: SymbolInstance(Anchor& anchor, @@ -56,8 +49,11 @@ public: std::array<float, 2> iconOffset; std::u16string key; bool isDuplicate; - OpacityState iconOpacityState; - OpacityState textOpacityState; + bool placedText; + bool placedIcon; + std::vector<size_t> placedTextIndices; // TODO clean this up + std::vector<size_t> placedIconIndices; + uint32_t crossTileID = 0; }; } // namespace mbgl |