diff options
| author | Young Hahn <young@mapbox.com> | 2016-06-11 12:37:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-11 12:37:28 -0400 |
| commit | 0dee9f81f34ee3487af6036d8ce961dcaa35a0b8 (patch) | |
| tree | 7070dd494841fd991cee6bbb7a1564390ebb87c4 | |
| parent | ecd4aa14397ed081a521d8412557724e52f277f3 (diff) | |
| download | qtlocation-mapboxgl-0dee9f81f34ee3487af6036d8ce961dcaa35a0b8.tar.gz | |
Don't apply textRotate twice. (#5321)
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | src/mbgl/text/quads.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/package.json b/package.json index acfd3e1112..29246d7bed 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "express": "^4.11.1", "mapbox-gl-shaders": "mapbox/mapbox-gl-shaders#30caf388dbddd02cfc4f967ffc94c1338c30fbf8", "mapbox-gl-style-spec": "mapbox/mapbox-gl-style-spec#2461efc3d883f2f2e56a6c6b2bfd7d54bbfe9f86", - "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#5587d796c99145991ea2a7b749a8782b7a0cb483", + "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#64cf15b657e12b070fede3f2fd3f5ac4fc096e5b", "node-gyp": "^3.3.1", "request": "^2.72.0", "tape": "^4.5.1" diff --git a/src/mbgl/text/quads.cpp b/src/mbgl/text/quads.cpp index eadfe5c1fd..2a05082b04 100644 --- a/src/mbgl/text/quads.cpp +++ b/src/mbgl/text/quads.cpp @@ -202,8 +202,8 @@ SymbolQuads getGlyphQuads(Anchor& anchor, const Shaping& shapedText, // Prevent label from extending past the end of the line const float glyphMinScale = std::max(instance.minScale, anchor.scale); - const float anchorAngle = std::fmod((anchor.angle + textRotate + instance.offset + 2 * M_PI), (2 * M_PI)); - const float glyphAngle = std::fmod((instance.angle + textRotate + instance.offset + 2 * M_PI), (2 * M_PI)); + const float anchorAngle = std::fmod((anchor.angle + instance.offset + 2 * M_PI), (2 * M_PI)); + const float glyphAngle = std::fmod((instance.angle + instance.offset + 2 * M_PI), (2 * M_PI)); quads.emplace_back(tl, tr, bl, br, rect, anchorAngle, glyphAngle, instance.anchorPoint, glyphMinScale, instance.maxScale); } |