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

4
include/llmr/geometry/anchor.hpp
View File

@@ -12,9 +12,9 @@ struct Anchor {
float scale = 0.0f;
int segment = -1;
Anchor(float x, float y, float angle, float scale)
explicit Anchor(float x, float y, float angle, float scale)
: x(x), y(y), angle(angle), scale(scale) {}
Anchor(float x, float y, float angle, float scale, int segment)
explicit Anchor(float x, float y, float angle, float scale, int segment)
: x(x), y(y), angle(angle), scale(scale), segment(segment) {}
};

13
include/llmr/text/collision.hpp
View File

@@ -39,9 +39,9 @@ struct PlacementBox {
float padding = 0.0f;
};
struct Placement {
explicit Placement() {}
explicit Placement(float zoom, const PlacementRange &rotationRange)
struct PlacementProperty {
explicit PlacementProperty() {}
explicit PlacementProperty(float zoom, const PlacementRange &rotationRange)
: zoom(zoom), rotationRange(rotationRange) {}
float zoom = -1.0f;
@@ -59,9 +59,10 @@ class Collision {
public:
Collision();
Placement place(const GlyphBoxes &boxes, const CollisionAnchor &anchor,
float minPlacementScale, float maxPlacementScale,
float padding, bool horizontal);
PlacementProperty place(const GlyphBoxes &boxes,
const CollisionAnchor &anchor,
float minPlacementScale, float maxPlacementScale,
float padding, bool horizontal);
float getPlacementScale(const GlyphBoxes &glyphs, float minPlacementScale,
float maxPlacementScale, float pad);
PlacementRange getPlacementRange(const GlyphBoxes &glyphs,

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,