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

[core] Introduce variable text placement for point labels - Placement part

Browse Source
This commit is contained in:
Mikhail Pozdnyakov
2019-03-14 10:25:53 +02:00
parent cb64dbe0d6
commit 2292623bc6
10 changed files with 266 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mbgl/programs/collision_box_program.hpp
View File

@@ -13,10 +13,9 @@ namespace mbgl {
using CollisionBoxLayoutAttributes = TypeList<
attributes::pos,
attributes::anchor_pos,
attributes::extrude,
attributes::shift>;
attributes::extrude>;
using CollisionBoxDynamicAttributes = TypeList<attributes::placed>;
using CollisionBoxDynamicAttributes = TypeList<attributes::placed, attributes::shift>;
class CollisionBoxProgram : public Program<
CollisionBoxProgram,
@@ -45,17 +44,14 @@ public:
{{
static_cast<int16_t>(::round(o.x)),
static_cast<int16_t>(::round(o.y))
}},
{{
0.0f,
0.0f
}}
};
}
static gfx::Vertex<CollisionBoxDynamicAttributes> dynamicVertex(bool placed, bool notUsed) {
static gfx::Vertex<CollisionBoxDynamicAttributes> dynamicVertex(bool placed, bool notUsed, Point<float> shift) {
return {
{{ static_cast<uint8_t>(placed), static_cast<uint8_t>(notUsed) }}
{{ static_cast<uint8_t>(placed), static_cast<uint8_t>(notUsed) }},
{{ shift.x, shift.y }}
};
}
@@ -139,10 +135,6 @@ public:
{{
static_cast<int16_t>(::round(o.x)),
static_cast<int16_t>(::round(o.y))
}},
{{
0.0f,
0.0f
}}
};
}