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

[core] Rotate text collision box based on text-rotation value

Browse Source
This commit is contained in:
Alexander Shalamov
2019-06-10 12:04:32 +03:00
parent 9aa529576f
commit be974ea65c
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mbgl/layout/symbol_instance.cpp
View File

@@ -81,7 +81,8 @@ SymbolInstance::SymbolInstance(Anchor& anchor_,
const std::size_t dataFeatureIndex_,
std::u16string key_,
const float overscaling,
const float rotate,
const float iconRotation,
const float textRotation,
float radialTextOffset_,
bool allowVerticalPlacement) :
sharedData(std::move(sharedData_)),
@@ -91,8 +92,8 @@ SymbolInstance::SymbolInstance(Anchor& anchor_,
hasIcon(shapedIcon),
// Create the collision features that will be used to check whether this symbol instance can be placed
// As a collision approximation, we can use either the vertical or any of the horizontal versions of the feature
textCollisionFeature(sharedData->line, anchor, getAnyShaping(shapedTextOrientations), textBoxScale_, textPadding, textPlacement, indexedFeature, overscaling, rotate),
iconCollisionFeature(sharedData->line, anchor, shapedIcon, iconBoxScale, iconPadding, indexedFeature, rotate),
textCollisionFeature(sharedData->line, anchor, getAnyShaping(shapedTextOrientations), textBoxScale_, textPadding, textPlacement, indexedFeature, overscaling, textRotation),
iconCollisionFeature(sharedData->line, anchor, shapedIcon, iconBoxScale, iconPadding, indexedFeature, iconRotation),
writingModes(WritingModeType::None),
layoutFeatureIndex(layoutFeatureIndex_),
dataFeatureIndex(dataFeatureIndex_),
@@ -105,7 +106,7 @@ SymbolInstance::SymbolInstance(Anchor& anchor_,
if (allowVerticalPlacement && shapedTextOrientations.vertical) {
const float verticalPointLabelAngle = 90.0f;
verticalTextCollisionFeature = CollisionFeature(line(), anchor, shapedTextOrientations.vertical, textBoxScale_, textPadding, textPlacement, indexedFeature, overscaling, rotate + verticalPointLabelAngle);
verticalTextCollisionFeature = CollisionFeature(line(), anchor, shapedTextOrientations.vertical, textBoxScale_, textPadding, textPlacement, indexedFeature, overscaling, textRotation + verticalPointLabelAngle);
}
rightJustifiedGlyphQuadsSize = sharedData->rightJustifiedGlyphQuads.size();

3
src/mbgl/layout/symbol_instance.hpp
View File

@@ -59,7 +59,8 @@ public:
const std::size_t dataFeatureIndex,
std::u16string key,
const float overscaling,
const float rotate,
const float iconRotation,
const float textRotation,
float radialTextOffset,
bool allowVerticalPlacement);