summaryrefslogtreecommitdiff
path: root/src/mbgl/layout/symbol_projection.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/layout/symbol_projection.hpp')
-rw-r--r--src/mbgl/layout/symbol_projection.hpp36
1 files changed, 22 insertions, 14 deletions
diff --git a/src/mbgl/layout/symbol_projection.hpp b/src/mbgl/layout/symbol_projection.hpp
index d9c80df418..e04f8908b6 100644
--- a/src/mbgl/layout/symbol_projection.hpp
+++ b/src/mbgl/layout/symbol_projection.hpp
@@ -38,30 +38,38 @@ namespace mbgl {
};
float evaluateSizeForFeature(const ZoomEvaluatedSize& zoomEvaluatedSize, const PlacedSymbol& placedSymbol);
- mat4 getLabelPlaneMatrix(const mat4& posMatrix, const bool pitchWithMap, const bool rotateWithMap, const TransformState& state, const float pixelsToTileUnits);
- mat4 getGlCoordMatrix(const mat4& posMatrix, const bool pitchWithMap, const bool rotateWithMap, const TransformState& state, const float pixelsToTileUnits);
-
+ mat4 getLabelPlaneMatrix(const mat4& posMatrix,
+ bool pitchWithMap,
+ bool rotateWithMap,
+ const TransformState& state,
+ float pixelsToTileUnits);
+ mat4 getGlCoordMatrix(const mat4& posMatrix,
+ bool pitchWithMap,
+ bool rotateWithMap,
+ const TransformState& state,
+ float pixelsToTileUnits);
+
using PointAndCameraDistance = std::pair<Point<float>,float>;
PointAndCameraDistance project(const Point<float>& point, const mat4& matrix);
void reprojectLineLabels(gfx::VertexVector<gfx::Vertex<SymbolDynamicLayoutAttributes>>&, const std::vector<PlacedSymbol>&,
const mat4& posMatrix, bool pitchWithMap, bool rotateWithMap, bool keepUpright,
const RenderTile&, const SymbolSizeBinder& sizeBinder, const TransformState&);
-
- optional<std::pair<PlacedGlyph, PlacedGlyph>> placeFirstAndLastGlyph(const float fontScale,
- const float lineOffsetX,
- const float lineOffsetY,
- const bool flip,
- const Point<float>& anchorPoint,
- const Point<float>& tileAnchorPoint,
- const PlacedSymbol& symbol,
- const mat4& labelPlaneMatrix,
- const bool returnTileDistance);
+
+ optional<std::pair<PlacedGlyph, PlacedGlyph>> placeFirstAndLastGlyph(float fontScale,
+ float lineOffsetX,
+ float lineOffsetY,
+ bool flip,
+ const Point<float>& anchorPoint,
+ const Point<float>& tileAnchorPoint,
+ const PlacedSymbol& symbol,
+ const mat4& labelPlaneMatrix,
+ bool returnTileDistance);
void hideGlyphs(std::size_t numGlyphs,
gfx::VertexVector<gfx::Vertex<SymbolDynamicLayoutAttributes>>& dynamicVertexArray);
void addDynamicAttributes(const Point<float>& anchorPoint,
- const float angle,
+ float angle,
gfx::VertexVector<gfx::Vertex<SymbolDynamicLayoutAttributes>>& dynamicVertexArray);
} // end namespace mbgl