From 9ffa103a7914ff7a0920e44206a28576b5c5905d Mon Sep 17 00:00:00 2001 From: Thomas Chandelle Date: Thu, 10 Nov 2016 17:00:50 +0100 Subject: [PATCH] Image rotation in WebGL was anti-clockwise --- src/ol/render/webgl/imagereplay/index.js | 3 ++- .../ol/style/expected/regularshape-webgl.png | Bin 1551 -> 1533 bytes 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ol/render/webgl/imagereplay/index.js b/src/ol/render/webgl/imagereplay/index.js index 22deaa3616..1d1903bed8 100644 --- a/src/ol/render/webgl/imagereplay/index.js +++ b/src/ol/render/webgl/imagereplay/index.js @@ -203,7 +203,8 @@ ol.render.webgl.ImageReplay.prototype.drawCoordinates_ = function(flatCoordinate var originX = /** @type {number} */ (this.originX_); var originY = /** @type {number} */ (this.originY_); var rotateWithView = this.rotateWithView_ ? 1.0 : 0.0; - var rotation = /** @type {number} */ (this.rotation_); + // this.rotation_ is anti-clockwise, but rotation is clockwise + var rotation = /** @type {number} */ (-this.rotation_); var scale = /** @type {number} */ (this.scale_); var width = /** @type {number} */ (this.width_); var cos = Math.cos(rotation); diff --git a/test_rendering/spec/ol/style/expected/regularshape-webgl.png b/test_rendering/spec/ol/style/expected/regularshape-webgl.png index ae51d61dc5218a603ab5e98cb12b49b0942c967c..9219cc3085065917bf873c2d3970568d6e2bbb12 100644 GIT binary patch delta 1515 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