tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

parse maxWidth, lineHeight and alignment, pass to FontStack::getShaping

Browse Source
This commit is contained in:
Mike Morris
2014-05-30 00:07:22 -04:00
parent 0b9c45721f
commit 3442403e67
8 changed files with 59 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/map/tile_parser.cpp
View File

@@ -15,6 +15,8 @@
#include <llmr/util/std.hpp>
#include <llmr/util/utf.hpp>
#include <iostream>
using namespace llmr;
TileParser::TileParser(const std::string& data, VectorTileData& tile, const Style& style, GlyphAtlas& glyphAtlas, GlyphStore &glyphStore, SpriteAtlas &spriteAtlas)
@@ -202,6 +204,8 @@ std::unique_ptr<Bucket> TileParser::createTextBucket(const VectorTileLayer& laye
std::map<Value, Shaping> shaping;
GlyphPositions face;
// std::cerr << bucket_desc;
// Shape and place all labels.
{
FilteredVectorTileLayer filtered_layer(layer, bucket_desc);
@@ -221,7 +225,7 @@ std::unique_ptr<Bucket> TileParser::createTextBucket(const VectorTileLayer& laye
const std::u32string string = ucs4conv.convert(toString(it_prop->second));
// Shape labels.
const Shaping shaped = fontStack.getShaping(string);
const Shaping shaped = fontStack.getShaping(string, bucket_desc.geometry.max_width, bucket_desc.geometry.line_height, bucket_desc.geometry.alignment);
shaping.emplace(toString(it_prop->second), shaped);
// Place labels.