summaryrefslogtreecommitdiff
path: root/src/mbgl/text/quads.cpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-04-21 13:05:10 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-04-21 14:05:40 -0700
commitb2beeda50bbd48fecad957d194dd5b40c72eb9c7 (patch)
tree4e13e0281222e79da20ad37eeea9cc468cdf3c32 /src/mbgl/text/quads.cpp
parent2ea450205d8b89db28f7160365b73d26bf4b8812 (diff)
downloadqtlocation-mapboxgl-b2beeda50bbd48fecad957d194dd5b40c72eb9c7.tar.gz
[core] Adopt a strict naming convention for style properties
This will allow code to be generated from the style specification.
Diffstat (limited to 'src/mbgl/text/quads.cpp')
-rw-r--r--src/mbgl/text/quads.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/text/quads.cpp b/src/mbgl/text/quads.cpp
index 2117538232..2b5db023c0 100644
--- a/src/mbgl/text/quads.cpp
+++ b/src/mbgl/text/quads.cpp
@@ -28,7 +28,7 @@ SymbolQuads getIconQuads(Anchor& anchor, const PositionedIcon& shapedIcon,
vec2<float> bl{left, bottom};
- float angle = layout.icon.rotate * util::DEG2RAD;
+ float angle = layout.iconRotate * util::DEG2RAD;
if (alongLine) {
assert(static_cast<unsigned int>(anchor.segment) < line.size());
const GeometryCoordinate &prev= line[anchor.segment];
@@ -136,8 +136,8 @@ SymbolQuads getGlyphQuads(Anchor& anchor, const Shaping& shapedText,
const float boxScale, const GeometryCoordinates& line, const SymbolLayoutProperties& layout,
const bool alongLine, const GlyphPositions& face) {
- const float textRotate = layout.text.rotate * util::DEG2RAD;
- const bool keepUpright = layout.text.keepUpright;
+ const float textRotate = layout.textRotate * util::DEG2RAD;
+ const bool keepUpright = layout.textKeepUpright;
SymbolQuads quads;