diff options
Diffstat (limited to 'src/mbgl/text/glyph.hpp')
-rw-r--r-- | src/mbgl/text/glyph.hpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/mbgl/text/glyph.hpp b/src/mbgl/text/glyph.hpp index 2c03da308a..55cd50fd9b 100644 --- a/src/mbgl/text/glyph.hpp +++ b/src/mbgl/text/glyph.hpp @@ -55,17 +55,21 @@ public: }; using Glyphs = std::map<GlyphID, optional<Immutable<Glyph>>>; -using GlyphMap = std::map<FontStack, Glyphs>; +using GlyphMap = std::map<FontStackHash, Glyphs>; class PositionedGlyph { public: - explicit PositionedGlyph(GlyphID glyph_, float x_, float y_, bool vertical_) - : glyph(glyph_), x(x_), y(y_), vertical(vertical_) {} + explicit PositionedGlyph(GlyphID glyph_, float x_, float y_, bool vertical_, FontStackHash font_, float scale_) + : glyph(glyph_), x(x_), y(y_), vertical(vertical_), font(font_), scale(scale_) + {} GlyphID glyph = 0; float x = 0; float y = 0; bool vertical = false; + + FontStackHash font = 0; + float scale = 0.0; }; enum class WritingModeType : uint8_t; |