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

Merge pull request #5964 from ahocevar/icon-text-transform

Browse Source 
Set one-off transform instead of transforming back and forth
This commit is contained in:
Andreas Hocevar
2016-10-15 19:46:47 +02:00
committed by GitHub
parent 8d68d68c9d fdae2e8e00
commit cba270efa1
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ol/render/canvas/replay.js
View File

@@ -116,7 +116,7 @@ ol.render.canvas.Replay = function(tolerance, maxExtent, resolution, overlaps) {
* @private
* @type {ol.Transform}
*/
this.tmpLocalTransformInv_ = ol.transform.create();
this.resetTransform_ = ol.transform.create();
};
ol.inherits(ol.render.canvas.Replay, ol.render.VectorContext);
@@ -247,7 +247,7 @@ ol.render.canvas.Replay.prototype.replay_ = function(
var d = 0; // data index
var dd; // end of per-instruction data
var localTransform = this.tmpLocalTransform_;
var localTransformInv = this.tmpLocalTransformInv_;
var resetTransform = this.resetTransform_;
var prevX, prevY, roundX, roundY;
var pendingFill = 0;
var pendingStroke = 0;
@@ -342,7 +342,7 @@ ol.render.canvas.Replay.prototype.replay_ = function(
var centerY = y + anchorY;
ol.transform.compose(localTransform,
centerX, centerY, scale, scale, rotation, -centerX, -centerY);
context.transform.apply(context, localTransform);
context.setTransform.apply(context, localTransform);
}
var alpha = context.globalAlpha;
if (opacity != 1) {
@@ -359,8 +359,7 @@ ol.render.canvas.Replay.prototype.replay_ = function(
context.globalAlpha = alpha;
}
if (scale != 1 || rotation !== 0) {
ol.transform.invert(ol.transform.setFromArray(localTransformInv, localTransform));
context.transform.apply(context, localTransformInv);
context.setTransform.apply(context, resetTransform);
}
}
++i;
@@ -402,7 +401,7 @@ ol.render.canvas.Replay.prototype.replay_ = function(
y = pixelCoordinates[d + 1] + offsetY;
if (scale != 1 || rotation !== 0) {
ol.transform.compose(localTransform, x, y, scale, scale, rotation, -x, -y);
context.transform.apply(context, localTransform);
context.setTransform.apply(context, localTransform);
}
// Support multiple lines separated by \n
@@ -433,8 +432,7 @@ ol.render.canvas.Replay.prototype.replay_ = function(
}
if (scale != 1 || rotation !== 0) {
ol.transform.invert(ol.transform.setFromArray(localTransformInv, localTransform));
context.transform.apply(context, localTransformInv);
context.setTransform.apply(context, resetTransform);
}
}
++i;