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

implement alwaysVisible

Browse Source
This commit is contained in:
Konstantin Käfer
2014-03-24 17:38:10 +01:00
parent 76d3d7badb
commit 9621038d8a
9 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/text/collision.cpp
View File

@@ -74,7 +74,7 @@ PlacementProperty Collision::place(const PlacedGlyphs &placed_glyphs,
const CollisionAnchor &anchor,
float minPlacementScale,
float maxPlacementScale, float padding,
bool horizontal) {
bool horizontal, bool alwaysVisible) {
float minScale = std::numeric_limits<float>::infinity();
for (const PlacedGlyph &placed_glyph : placed_glyphs) {
@@ -111,8 +111,9 @@ PlacementProperty Collision::place(const PlacedGlyphs &placed_glyphs,
// Calculate the minimum scale the entire label can be shown without
// collisions
float scale = getPlacementScale(glyphs, minPlacementScale,
maxPlacementScale, padding);
float scale = alwaysVisible ? minPlacementScale
: getPlacementScale(glyphs, minPlacementScale,
maxPlacementScale, padding);
// Return if the label can never be placed without collision
if (scale < 0 || scale == std::numeric_limits<float>::infinity()) {