ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1428 from tschaub/image-scale

Browse Source 
Properly scale and rotate images with anchor offsets.
This commit is contained in:
Tim Schaub
2013-12-20 13:44:10 -08:00
parent 5a39927846 f5b9687479
commit 86374d1fde
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ol/render/canvas/canvasimmediate.js
View File

@@ -144,8 +144,11 @@ ol.render.canvas.Immediate.prototype.drawImages_ = function(geometry) {
y = (y + 0.5) | 0;
}
if (state.scale != 1 || state.rotation !== 0) {
var centerX = x + state.anchorX;
var centerY = y + state.anchorY;
ol.vec.Mat4.makeTransform2D(localTransform,
x, y, state.scale, state.scale, state.rotation, -x, -y);
centerX, centerY, state.scale, state.scale,
state.rotation, -centerX, -centerY);
context.setTransform(
goog.vec.Mat4.getElement(localTransform, 0, 0),
goog.vec.Mat4.getElement(localTransform, 1, 0),

5
src/ol/render/canvas/canvasreplay.js
View File

@@ -227,8 +227,11 @@ ol.render.canvas.Replay.prototype.replay_ =
y = (y + 0.5) | 0;
}
if (scale != 1 || rotation !== 0) {
var centerX = x + anchorX;
var centerY = y + anchorY;
ol.vec.Mat4.makeTransform2D(
localTransform, x, y, scale, scale, rotation, -x, -y);
localTransform, centerX, centerY, scale, scale,
rotation, -centerX, -centerY);
context.setTransform(
goog.vec.Mat4.getElement(localTransform, 0, 0),
goog.vec.Mat4.getElement(localTransform, 1, 0),