diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-20 16:20:04 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-02 14:36:30 -0800 |
commit | a7b7f3d44297608121dba975586e838f03b6c3c5 (patch) | |
tree | a042500a02ede843fc17b5c278ca3a6f7608876e /src/mbgl/text/quads.hpp | |
parent | c461dad5eecb17d963c5dcce5db9db28e74f0429 (diff) | |
download | qtlocation-mapboxgl-a7b7f3d44297608121dba975586e838f03b6c3c5.tar.gz |
[core] Fix whitespace; no need for explicit on multi-parameter constructors
Diffstat (limited to 'src/mbgl/text/quads.hpp')
-rw-r--r-- | src/mbgl/text/quads.hpp | 46 |
1 files changed, 33 insertions, 13 deletions
diff --git a/src/mbgl/text/quads.hpp b/src/mbgl/text/quads.hpp index 07a94c763b..61c03f3201 100644 --- a/src/mbgl/text/quads.hpp +++ b/src/mbgl/text/quads.hpp @@ -9,13 +9,22 @@ namespace mbgl { -struct Anchor; +class Anchor; class PositionedIcon; -struct SymbolQuad { - explicit SymbolQuad(Point<float> tl_, Point<float> tr_, Point<float> bl_, Point<float> br_, - Rect<uint16_t> tex_, float anchorAngle_, float glyphAngle_, Point<float> anchorPoint_, - float minScale_, float maxScale_, WritingModeType writingMode_) +class SymbolQuad { +public: + SymbolQuad(Point<float> tl_, + Point<float> tr_, + Point<float> bl_, + Point<float> br_, + Rect<uint16_t> tex_, + float anchorAngle_, + float glyphAngle_, + Point<float> anchorPoint_, + float minScale_, + float maxScale_, + WritingModeType writingMode_) : tl(std::move(tl_)), tr(std::move(tr_)), bl(std::move(bl_)), @@ -28,22 +37,33 @@ struct SymbolQuad { maxScale(maxScale_), writingMode(writingMode_) {} - Point<float> tl, tr, bl, br; + Point<float> tl; + Point<float> tr; + Point<float> bl; + Point<float> br; Rect<uint16_t> tex; float anchorAngle, glyphAngle; Point<float> anchorPoint; - float minScale, maxScale; + float minScale; + float maxScale; WritingModeType writingMode; }; typedef std::vector<SymbolQuad> SymbolQuads; -SymbolQuad getIconQuad(Anchor& anchor, const PositionedIcon& shapedIcon, - const GeometryCoordinates& line, const style::SymbolLayoutProperties::Evaluated&, - style::SymbolPlacementType placement, const Shaping& shapedText); +SymbolQuad getIconQuad(Anchor& anchor, + const PositionedIcon& shapedIcon, + const GeometryCoordinates& line, + const style::SymbolLayoutProperties::Evaluated&, + style::SymbolPlacementType placement, + const Shaping& shapedText); -SymbolQuads getGlyphQuads(Anchor& anchor, const Shaping& shapedText, - const float boxScale, const GeometryCoordinates& line, const style::SymbolLayoutProperties::Evaluated&, - style::SymbolPlacementType placement, const GlyphPositions& face); +SymbolQuads getGlyphQuads(Anchor& anchor, + const Shaping& shapedText, + const float boxScale, + const GeometryCoordinates& line, + const style::SymbolLayoutProperties::Evaluated&, + style::SymbolPlacementType placement, + const GlyphPositions& face); } // namespace mbgl |