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

[core] Eliminate use of ClassProperties for layout

Browse Source
This commit is contained in:
John Firebaugh
2015-10-26 10:14:24 -07:00
parent 728a9858ea
commit a562567589
33 changed files with 237 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mbgl/renderer/line_bucket.cpp
View File

@@ -2,8 +2,6 @@
#include <mbgl/layer/line_layer.hpp>
#include <mbgl/geometry/elements_buffer.hpp>
#include <mbgl/renderer/painter.hpp>
#include <mbgl/style/style.hpp>
#include <mbgl/style/style_properties.hpp>
#include <mbgl/shader/line_shader.hpp>
#include <mbgl/shader/linesdf_shader.hpp>
#include <mbgl/shader/linepattern_shader.hpp>
@@ -42,7 +40,7 @@ void LineBucket::addGeometry(const std::vector<Coordinate>& vertices) {
return;
}
const float miterLimit = layout.join == JoinType::Bevel ? 1.05f : layout.miter_limit;
const float miterLimit = layout.join == JoinType::Bevel ? 1.05f : float(layout.miterLimit);
const Coordinate firstVertex = vertices.front();
const Coordinate lastVertex = vertices[len - 1];
@@ -54,7 +52,7 @@ void LineBucket::addGeometry(const std::vector<Coordinate>& vertices) {
}
const CapType beginCap = layout.cap;
const CapType endCap = closed ? CapType::Butt : layout.cap;
const CapType endCap = closed ? CapType::Butt : CapType(layout.cap);
int8_t flip = 1;
double distance = 0;
@@ -143,7 +141,7 @@ void LineBucket::addGeometry(const std::vector<Coordinate>& vertices) {
if (middleVertex) {
if (currentJoin == JoinType::Round) {
if (miterLength < layout.round_limit) {
if (miterLength < layout.roundLimit) {
currentJoin = JoinType::Miter;
} else if (miterLength <= 2) {
currentJoin = JoinType::FakeRound;