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

explicit names

Browse Source
This commit is contained in:
Konstantin Käfer
2014-03-18 17:57:51 +01:00
parent 25ff0b253f
commit 98bb797a4a
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/text/collision.cpp
View File

@@ -50,10 +50,11 @@ GlyphBox getMergedGlyphs(const GlyphBoxes &glyphs, bool horizontal,
return mergedGlyphs;
}
Placement Collision::place(const GlyphBoxes &boxes,
const CollisionAnchor &anchor,
float minPlacementScale, float maxPlacementScale,
float padding, bool horizontal) {
PlacementProperty Collision::place(const GlyphBoxes &boxes,
const CollisionAnchor &anchor,
float minPlacementScale,
float maxPlacementScale, float padding,
bool horizontal) {
float minScale = std::numeric_limits<float>::infinity();
for (const GlyphBox &box : boxes) {
@@ -93,7 +94,7 @@ Placement Collision::place(const GlyphBoxes &boxes,
// Return if the label can never be placed without collision
if (scale < 0) {
return Placement{};
return PlacementProperty{};
}
// Calculate the range it is safe to rotate all glyphs
@@ -102,7 +103,7 @@ Placement Collision::place(const GlyphBoxes &boxes,
float zoom = log(scale) / log(2);
return Placement{zoom, rotationRange};
return PlacementProperty{zoom, rotationRange};
}
float Collision::getPlacementScale(const GlyphBoxes &glyphs,