Target, source arg order for make* transform functions
This commit is contained in:
@@ -66,7 +66,7 @@ class MapRenderer extends Disposable {
|
|||||||
-viewState.rotation,
|
-viewState.rotation,
|
||||||
-viewState.center[0], -viewState.center[1]);
|
-viewState.center[0], -viewState.center[1]);
|
||||||
|
|
||||||
makeInverse(coordinateToPixelTransform, pixelToCoordinateTransform);
|
makeInverse(pixelToCoordinateTransform, coordinateToPixelTransform);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ class CanvasImageLayerRenderer extends CanvasLayerRenderer {
|
|||||||
rotation,
|
rotation,
|
||||||
-width / 2, -height / 2
|
-width / 2, -height / 2
|
||||||
);
|
);
|
||||||
makeInverse(this.pixelTransform_, this.inversePixelTransform_);
|
makeInverse(this.inversePixelTransform_, this.pixelTransform_);
|
||||||
|
|
||||||
const context = this.context;
|
const context = this.context;
|
||||||
const canvas = context.canvas;
|
const canvas = context.canvas;
|
||||||
|
|||||||
@@ -233,7 +233,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
|
|||||||
rotation,
|
rotation,
|
||||||
-width / 2, -height / 2
|
-width / 2, -height / 2
|
||||||
);
|
);
|
||||||
makeInverse(this.pixelTransform_, this.inversePixelTransform_);
|
makeInverse(this.inversePixelTransform_, this.pixelTransform_);
|
||||||
|
|
||||||
if (canvas.width != width || canvas.height != height) {
|
if (canvas.width != width || canvas.height != height) {
|
||||||
canvas.width = width;
|
canvas.width = width;
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import {listen, unlisten} from '../../events.js';
|
|||||||
import EventType from '../../events/EventType.js';
|
import EventType from '../../events/EventType.js';
|
||||||
import rbush from 'rbush';
|
import rbush from 'rbush';
|
||||||
import {buffer, createEmpty, containsExtent, getWidth} from '../../extent.js';
|
import {buffer, createEmpty, containsExtent, getWidth} from '../../extent.js';
|
||||||
import RenderEventType from '../../render/EventType.js';
|
|
||||||
import {labelCache} from '../../render/canvas.js';
|
import {labelCache} from '../../render/canvas.js';
|
||||||
import CanvasBuilderGroup from '../../render/canvas/BuilderGroup.js';
|
import CanvasBuilderGroup from '../../render/canvas/BuilderGroup.js';
|
||||||
import InstructionsGroupExecutor from '../../render/canvas/ExecutorGroup.js';
|
import InstructionsGroupExecutor from '../../render/canvas/ExecutorGroup.js';
|
||||||
@@ -107,7 +106,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
|
|||||||
|
|
||||||
// set forward and inverse pixel transforms
|
// set forward and inverse pixel transforms
|
||||||
makeScale(this.pixelTransform_, 1 / pixelRatio, 1 / pixelRatio);
|
makeScale(this.pixelTransform_, 1 / pixelRatio, 1 / pixelRatio);
|
||||||
makeInverse(this.pixelTransform_, this.inversePixelTransform_);
|
makeInverse(this.inversePixelTransform_, this.pixelTransform_);
|
||||||
|
|
||||||
// resize and clear
|
// resize and clear
|
||||||
const width = Math.round(frameState.size[0] * pixelRatio);
|
const width = Math.round(frameState.size[0] * pixelRatio);
|
||||||
|
|||||||
@@ -394,7 +394,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
|
|||||||
|
|
||||||
// set forward and inverse pixel transforms
|
// set forward and inverse pixel transforms
|
||||||
makeScale(this.overlayPixelTransform_, 1 / pixelRatio, 1 / pixelRatio);
|
makeScale(this.overlayPixelTransform_, 1 / pixelRatio, 1 / pixelRatio);
|
||||||
makeInverse(this.overlayPixelTransform_, this.inverseOverlayPixelTransform_);
|
makeInverse(this.inverseOverlayPixelTransform_, this.overlayPixelTransform_);
|
||||||
|
|
||||||
// resize and clear
|
// resize and clear
|
||||||
const canvas = context.canvas;
|
const canvas = context.canvas;
|
||||||
|
|||||||
+2
-2
@@ -222,12 +222,12 @@ export function invert(source) {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Invert the given transform.
|
* Invert the given transform.
|
||||||
* @param {!Transform} source The source transform to invert.
|
|
||||||
* @param {!Transform} target Transform to be set as the inverse of
|
* @param {!Transform} target Transform to be set as the inverse of
|
||||||
* the source transform.
|
* the source transform.
|
||||||
|
* @param {!Transform} source The source transform to invert.
|
||||||
* @return {!Transform} The inverted (target) transform.
|
* @return {!Transform} The inverted (target) transform.
|
||||||
*/
|
*/
|
||||||
export function makeInverse(source, target) {
|
export function makeInverse(target, source) {
|
||||||
const det = determinant(source);
|
const det = determinant(source);
|
||||||
assert(det !== 0, 32); // Transformation matrix cannot be inverted
|
assert(det !== 0, 32); // Transformation matrix cannot be inverted
|
||||||
|
|
||||||
|
|||||||
@@ -149,7 +149,7 @@ describe('ol.transform', function() {
|
|||||||
it('makes the target the inverse of the source', function() {
|
it('makes the target the inverse of the source', function() {
|
||||||
const source = [1, 1, 1, 2, 2, 0];
|
const source = [1, 1, 1, 2, 2, 0];
|
||||||
const target = [1, 0, 0, 1, 0, 0];
|
const target = [1, 0, 0, 1, 0, 0];
|
||||||
makeInverse(source, target);
|
makeInverse(target, source);
|
||||||
expect(source).to.eql([1, 1, 1, 2, 2, 0]);
|
expect(source).to.eql([1, 1, 1, 2, 2, 0]);
|
||||||
expect(target).to.eql([2, -1, -1, 1, -4, 2]);
|
expect(target).to.eql([2, -1, -1, 1, -4, 2]);
|
||||||
});
|
});
|
||||||
@@ -157,7 +157,7 @@ describe('ol.transform', function() {
|
|||||||
it('returns the target', function() {
|
it('returns the target', function() {
|
||||||
const source = [1, 1, 1, 2, 2, 0];
|
const source = [1, 1, 1, 2, 2, 0];
|
||||||
const target = [1, 0, 0, 1, 0, 0];
|
const target = [1, 0, 0, 1, 0, 0];
|
||||||
const inverted = makeInverse(source, target);
|
const inverted = makeInverse(target, source);
|
||||||
expect(target).to.be(inverted);
|
expect(target).to.be(inverted);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user