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

Faster extent calculation with less garbage

Browse Source
This commit is contained in:
ahocevar
2019-01-14 18:52:36 +01:00
parent 79f5283ce9
commit 5389e9675c
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/render/canvas/Executor.js
+25 -19
View File
@@ -4,7 +4,7 @@
import {getUid} from '../../util.js'; import {getUid} from '../../util.js';
import {equals} from '../../array.js'; import {equals} from '../../array.js';
import {createEmpty, createOrUpdate, import {createEmpty, createOrUpdate,
createOrUpdateEmpty, extend, extendCoordinate, intersects} from '../../extent.js'; createOrUpdateEmpty, extend, intersects} from '../../extent.js';
import {lineStringLength} from '../../geom/flat/length.js'; import {lineStringLength} from '../../geom/flat/length.js';
import {drawTextOnPath} from '../../geom/flat/textpath.js'; import {drawTextOnPath} from '../../geom/flat/textpath.js';
import {transform2D} from '../../geom/flat/transform.js'; import {transform2D} from '../../geom/flat/transform.js';
@@ -37,12 +37,20 @@ import {labelCache, defaultTextAlign, measureTextHeight, measureAndCacheTextWidt
*/ */
const tmpExtent = createEmpty(); const tmpExtent = createEmpty();
/** /**
* @type {!import("../../transform.js").Transform} * @type {!import("../../transform.js").Transform}
*/ */
const tmpTransform = createTransform(); const tmpTransform = createTransform();
/** @type {import("../../coordinate.js").Coordinate} */
const p1 = [];
/** @type {import("../../coordinate.js").Coordinate} */
const p2 = [];
/** @type {import("../../coordinate.js").Coordinate} */
const p3 = [];
/** @type {import("../../coordinate.js").Coordinate} */
const p4 = [];
class Executor { class Executor {
/** /**
@@ -304,19 +312,11 @@ class Executor {
const boxX = x - padding[3]; const boxX = x - padding[3];
const boxY = y - padding[0]; const boxY = y - padding[0];
/** @type {import("../../coordinate.js").Coordinate} */
let p1;
/** @type {import("../../coordinate.js").Coordinate} */
let p2;
/** @type {import("../../coordinate.js").Coordinate} */
let p3;
/** @type {import("../../coordinate.js").Coordinate} */
let p4;
if (fillStroke || rotation !== 0) { if (fillStroke || rotation !== 0) {
p1 = [boxX, boxY]; p1[0] = p4[0] = boxX;
p2 = [boxX + boxW, boxY]; p1[1] = p2[1] = boxY;
p3 = [boxX + boxW, boxY + boxH]; p2[0] = p3[0] = boxX + boxW;
p4 = [boxX, boxY + boxH]; p3[1] = p4[1] = boxY + boxH;
} }
let transform = null; let transform = null;
@@ -325,11 +325,17 @@ class Executor {
const centerY = y + anchorY; const centerY = y + anchorY;
transform = composeTransform(tmpTransform, centerX, centerY, 1, 1, rotation, -centerX, -centerY); transform = composeTransform(tmpTransform, centerX, centerY, 1, 1, rotation, -centerX, -centerY);
createOrUpdateEmpty(tmpExtent); applyTransform(tmpTransform, p1);
extendCoordinate(tmpExtent, applyTransform(tmpTransform, p1)); applyTransform(tmpTransform, p2);
extendCoordinate(tmpExtent, applyTransform(tmpTransform, p2)); applyTransform(tmpTransform, p3);
extendCoordinate(tmpExtent, applyTransform(tmpTransform, p3)); applyTransform(tmpTransform, p4);
extendCoordinate(tmpExtent, applyTransform(tmpTransform, p4)); createOrUpdate(
Math.min(p1[0], p2[0], p3[0], p4[0]),
Math.min(p1[1], p2[1], p3[1], p4[1]),
Math.max(p1[0], p2[0], p3[0], p4[0]),
Math.max(p1[1], p2[1], p3[1], p4[1]),
tmpExtent
);
} else { } else {
createOrUpdate(boxX, boxY, boxX + boxW, boxY + boxH, tmpExtent); createOrUpdate(boxX, boxY, boxX + boxW, boxY + boxH, tmpExtent);
} }