diff options
Diffstat (limited to 'include/llmr')
-rw-r--r-- | include/llmr/geometry/glyph_atlas.hpp | 2 | ||||
-rw-r--r-- | include/llmr/map/tile_parser.hpp | 1 | ||||
-rw-r--r-- | include/llmr/map/vector_tile.hpp | 30 | ||||
-rw-r--r-- | include/llmr/text/glyph.hpp | 2 |
4 files changed, 0 insertions, 35 deletions
diff --git a/include/llmr/geometry/glyph_atlas.hpp b/include/llmr/geometry/glyph_atlas.hpp index 5bcd573f56..0aada6a733 100644 --- a/include/llmr/geometry/glyph_atlas.hpp +++ b/include/llmr/geometry/glyph_atlas.hpp @@ -12,8 +12,6 @@ namespace llmr { -class VectorTileGlyph; - class GlyphAtlas { public: diff --git a/include/llmr/map/tile_parser.hpp b/include/llmr/map/tile_parser.hpp index 5785c29b3a..84bb65e121 100644 --- a/include/llmr/map/tile_parser.hpp +++ b/include/llmr/map/tile_parser.hpp @@ -42,7 +42,6 @@ private: GlyphAtlas& glyphAtlas; GlyphStore &glyphStore; SpriteAtlas &spriteAtlas; - Faces faces; Placement placement; }; diff --git a/include/llmr/map/vector_tile.hpp b/include/llmr/map/vector_tile.hpp index f57c5d3504..1e809556e5 100644 --- a/include/llmr/map/vector_tile.hpp +++ b/include/llmr/map/vector_tile.hpp @@ -83,38 +83,9 @@ public: uint32_t extent = 4096; std::vector<std::string> keys; std::vector<Value> values; - std::vector<std::string> faces; std::map<std::string, std::map<Value, Shaping>> shaping; }; -class VectorTileGlyph { -public: - VectorTileGlyph(); - VectorTileGlyph(pbf data); - - uint32_t id = 0; - - // A signed distance field of the glyph with a border of 3 pixels. - std::string bitmap; - - // Glyph metrics - GlyphMetrics metrics; -}; - -std::ostream& operator<<(std::ostream&, const VectorTileGlyph& glyph); - -class VectorTileFace { -public: - VectorTileFace(pbf data); - - std::string name; - std::string family; - std::string style; - std::vector<VectorTileGlyph> glyphs; -}; - -std::ostream& operator<<(std::ostream&, const VectorTileFace& face); - class VectorTile { public: VectorTile(); @@ -122,7 +93,6 @@ public: VectorTile& operator=(VectorTile&& other); std::map<std::string, const VectorTileLayer> layers; - std::map<std::string, const VectorTileFace> faces; }; diff --git a/include/llmr/text/glyph.hpp b/include/llmr/text/glyph.hpp index e6138e712e..8f9024a90b 100644 --- a/include/llmr/text/glyph.hpp +++ b/include/llmr/text/glyph.hpp @@ -43,8 +43,6 @@ struct Glyph { }; typedef std::map<uint32_t, Glyph> GlyphPositions; -typedef std::map<std::string, GlyphPositions> Faces; -typedef std::vector<const GlyphPositions *> IndexedFaces; class GlyphPlacement { public: |