diff options
Diffstat (limited to 'src/mbgl/renderer/line_bucket.cpp')
| -rw-r--r-- | src/mbgl/renderer/line_bucket.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mbgl/renderer/line_bucket.cpp b/src/mbgl/renderer/line_bucket.cpp index a7c3f00676..43bb8132de 100644 --- a/src/mbgl/renderer/line_bucket.cpp +++ b/src/mbgl/renderer/line_bucket.cpp @@ -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; |