@deck.gl/core 9.3.0-alpha.1 → 9.3.0-alpha.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/debug.min.js +1 -1
- package/dist/controllers/controller.d.ts +5 -4
- package/dist/controllers/controller.d.ts.map +1 -1
- package/dist/controllers/controller.js +18 -7
- package/dist/controllers/controller.js.map +1 -1
- package/dist/controllers/first-person-controller.d.ts +3 -2
- package/dist/controllers/first-person-controller.d.ts.map +1 -1
- package/dist/controllers/first-person-controller.js +13 -5
- package/dist/controllers/first-person-controller.js.map +1 -1
- package/dist/controllers/globe-controller.d.ts +1 -0
- package/dist/controllers/globe-controller.d.ts.map +1 -1
- package/dist/controllers/globe-controller.js +66 -5
- package/dist/controllers/globe-controller.js.map +1 -1
- package/dist/controllers/map-controller.d.ts +7 -18
- package/dist/controllers/map-controller.d.ts.map +1 -1
- package/dist/controllers/map-controller.js +94 -50
- package/dist/controllers/map-controller.js.map +1 -1
- package/dist/controllers/orbit-controller.d.ts +12 -4
- package/dist/controllers/orbit-controller.d.ts.map +1 -1
- package/dist/controllers/orbit-controller.js +118 -10
- package/dist/controllers/orbit-controller.js.map +1 -1
- package/dist/controllers/orthographic-controller.d.ts +117 -9
- package/dist/controllers/orthographic-controller.d.ts.map +1 -1
- package/dist/controllers/orthographic-controller.js +302 -37
- package/dist/controllers/orthographic-controller.js.map +1 -1
- package/dist/controllers/view-state.d.ts +2 -1
- package/dist/controllers/view-state.d.ts.map +1 -1
- package/dist/controllers/view-state.js +2 -1
- package/dist/controllers/view-state.js.map +1 -1
- package/dist/debug/loggers.d.ts.map +1 -1
- package/dist/debug/loggers.js +1 -4
- package/dist/debug/loggers.js.map +1 -1
- package/dist/dist.dev.js +3705 -1678
- package/dist/effects/lighting/lighting-effect.d.ts +1 -0
- package/dist/effects/lighting/lighting-effect.d.ts.map +1 -1
- package/dist/effects/lighting/lighting-effect.js +14 -5
- package/dist/effects/lighting/lighting-effect.js.map +1 -1
- package/dist/index.cjs +685 -123
- package/dist/index.cjs.map +4 -4
- package/dist/lib/attribute/attribute-manager.d.ts.map +1 -1
- package/dist/lib/attribute/attribute-manager.js +2 -0
- package/dist/lib/attribute/attribute-manager.js.map +1 -1
- package/dist/lib/deck-picker.d.ts +6 -1
- package/dist/lib/deck-picker.d.ts.map +1 -1
- package/dist/lib/deck-picker.js +15 -3
- package/dist/lib/deck-picker.js.map +1 -1
- package/dist/lib/deck-renderer.d.ts +6 -1
- package/dist/lib/deck-renderer.d.ts.map +1 -1
- package/dist/lib/deck-renderer.js +14 -2
- package/dist/lib/deck-renderer.js.map +1 -1
- package/dist/lib/deck.d.ts +5 -0
- package/dist/lib/deck.d.ts.map +1 -1
- package/dist/lib/deck.js +13 -3
- package/dist/lib/deck.js.map +1 -1
- package/dist/lib/init.js +2 -2
- package/dist/lib/layer.d.ts.map +1 -1
- package/dist/lib/layer.js +1 -0
- package/dist/lib/layer.js.map +1 -1
- package/dist/passes/draw-layers-pass.d.ts +2 -0
- package/dist/passes/draw-layers-pass.d.ts.map +1 -1
- package/dist/passes/draw-layers-pass.js +3 -0
- package/dist/passes/draw-layers-pass.js.map +1 -1
- package/dist/passes/layers-pass.d.ts +2 -1
- package/dist/passes/layers-pass.d.ts.map +1 -1
- package/dist/passes/layers-pass.js +3 -0
- package/dist/passes/layers-pass.js.map +1 -1
- package/dist/passes/pick-layers-pass.d.ts +5 -2
- package/dist/passes/pick-layers-pass.d.ts.map +1 -1
- package/dist/passes/pick-layers-pass.js +3 -2
- package/dist/passes/pick-layers-pass.js.map +1 -1
- package/dist/shaderlib/project/project.glsl.d.ts.map +1 -1
- package/dist/shaderlib/project/project.glsl.js +3 -0
- package/dist/shaderlib/project/project.glsl.js.map +1 -1
- package/dist/utils/deep-merge.d.ts +5 -0
- package/dist/utils/deep-merge.d.ts.map +1 -0
- package/dist/utils/deep-merge.js +31 -0
- package/dist/utils/deep-merge.js.map +1 -0
- package/dist/utils/math-utils.d.ts +4 -0
- package/dist/utils/math-utils.d.ts.map +1 -1
- package/dist/utils/math-utils.js +8 -0
- package/dist/utils/math-utils.js.map +1 -1
- package/dist/viewports/globe-viewport.d.ts +1 -0
- package/dist/viewports/globe-viewport.d.ts.map +1 -1
- package/dist/viewports/globe-viewport.js +1 -1
- package/dist/viewports/globe-viewport.js.map +1 -1
- package/dist/viewports/orbit-viewport.d.ts.map +1 -1
- package/dist/viewports/orbit-viewport.js +7 -2
- package/dist/viewports/orbit-viewport.js.map +1 -1
- package/dist/viewports/orthographic-viewport.d.ts +8 -2
- package/dist/viewports/orthographic-viewport.d.ts.map +1 -1
- package/dist/viewports/orthographic-viewport.js.map +1 -1
- package/dist/views/orthographic-view.d.ts +38 -4
- package/dist/views/orthographic-view.d.ts.map +1 -1
- package/dist/views/orthographic-view.js.map +1 -1
- package/dist/views/view.d.ts.map +1 -1
- package/dist/views/view.js +2 -8
- package/dist/views/view.js.map +1 -1
- package/dist.min.js +220 -144
- package/package.json +9 -9
- package/src/controllers/controller.ts +23 -9
- package/src/controllers/first-person-controller.ts +18 -8
- package/src/controllers/globe-controller.ts +89 -5
- package/src/controllers/map-controller.ts +105 -56
- package/src/controllers/orbit-controller.ts +147 -13
- package/src/controllers/orthographic-controller.ts +417 -41
- package/src/controllers/view-state.ts +8 -1
- package/src/debug/loggers.ts +1 -5
- package/src/effects/lighting/lighting-effect.ts +20 -8
- package/src/lib/attribute/attribute-manager.ts +1 -0
- package/src/lib/deck-picker.ts +18 -4
- package/src/lib/deck-renderer.ts +17 -3
- package/src/lib/deck.ts +19 -3
- package/src/lib/layer.ts +1 -0
- package/src/passes/draw-layers-pass.ts +5 -0
- package/src/passes/layers-pass.ts +5 -1
- package/src/passes/pick-layers-pass.ts +8 -4
- package/src/shaderlib/project/project.glsl.ts +3 -0
- package/src/utils/deep-merge.ts +33 -0
- package/src/utils/math-utils.ts +12 -0
- package/src/viewports/globe-viewport.ts +1 -1
- package/src/viewports/orbit-viewport.ts +8 -2
- package/src/viewports/orthographic-viewport.ts +8 -2
- package/src/views/orthographic-view.ts +38 -4
- package/src/views/view.ts +2 -8
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
// deck.gl
|
|
2
|
+
// SPDX-License-Identifier: MIT
|
|
3
|
+
// Copyright (c) vis.gl contributors
|
|
4
|
+
/** Merge two viewstates, except `id`
|
|
5
|
+
* For position arrays such as `target`, only override the components that are defined.
|
|
6
|
+
*/
|
|
7
|
+
export function deepMergeViewState(a, b) {
|
|
8
|
+
const result = { ...a };
|
|
9
|
+
for (const key in b) {
|
|
10
|
+
if (key === 'id')
|
|
11
|
+
continue;
|
|
12
|
+
if (Array.isArray(result[key]) && Array.isArray(b[key])) {
|
|
13
|
+
result[key] = mergeNumericArray(result[key], b[key]);
|
|
14
|
+
}
|
|
15
|
+
else {
|
|
16
|
+
result[key] = b[key];
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
return result;
|
|
20
|
+
}
|
|
21
|
+
function mergeNumericArray(target, source) {
|
|
22
|
+
target = target.slice();
|
|
23
|
+
for (let i = 0; i < source.length; i++) {
|
|
24
|
+
const v = source[i];
|
|
25
|
+
if (Number.isFinite(v)) {
|
|
26
|
+
target[i] = v;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
return target;
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=deep-merge.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deep-merge.js","sourceRoot":"","sources":["../../src/utils/deep-merge.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAChC,CAAa,EACb,CAAa;IAEb,MAAM,MAAM,GAAG,EAAC,GAAG,CAAC,EAAC,CAAC;IACtB,KAAK,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;QACpB,IAAI,GAAG,KAAK,IAAI;YAAE,SAAS;QAC3B,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YACxD,MAAM,CAAC,GAAG,CAAC,GAAG,iBAAiB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAQ,CAAC;QAC9D,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAgB,EAAE,MAAgB;IAC3D,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;IACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;YACvB,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAChB,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -3,6 +3,10 @@ import type { Matrix4 } from '@math.gl/core';
|
|
|
3
3
|
export declare function createMat4(): number[];
|
|
4
4
|
export declare function mod(value: number, divisor: number): number;
|
|
5
5
|
export declare function getCameraPosition(viewMatrixInverse: Matrix4 | NumericArray): [number, number, number];
|
|
6
|
+
export declare function getProjectionParameters(projectionMatrix: Matrix4 | NumericArray): {
|
|
7
|
+
near: number;
|
|
8
|
+
far: number;
|
|
9
|
+
};
|
|
6
10
|
export type FrustumPlane = {
|
|
7
11
|
distance: number;
|
|
8
12
|
normal: Vector3;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"math-utils.d.ts","sourceRoot":"","sources":["../../src/utils/math-utils.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,OAAO,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAEpD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAG3C,wBAAgB,UAAU,IAAI,MAAM,EAAE,CAErC;AAED,wBAAgB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAG1D;AAGD,wBAAgB,iBAAiB,CAC/B,iBAAiB,EAAE,OAAO,GAAG,YAAY,GACxC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAG1B;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAGF,wBAAgB,gBAAgB,CAAC,oBAAoB,EAAE,OAAO,GAAG,YAAY,GAAG;IAC9E,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,YAAY,CAAC;IACpB,GAAG,EAAE,YAAY,CAAC;IAClB,MAAM,EAAE,YAAY,CAAC;IACrB,IAAI,EAAE,YAAY,CAAC;IACnB,GAAG,EAAE,YAAY,CAAC;CACnB,CAuCA;AAUD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE7C;AAID;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,YAAY,EACxB,OAAO,EAAE;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAC,GAC/D,YAAY,CAuBd;AAED,KAAK,WAAW,GAAG,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;AACxC,wBAAgB,WAAW,CAAC,UAAU,EAAE,CAAC,WAAW,GAAG,IAAI,CAAC,EAAE,GAAG,WAAW,GAAG,IAAI,CA2BlF"}
|
|
1
|
+
{"version":3,"file":"math-utils.d.ts","sourceRoot":"","sources":["../../src/utils/math-utils.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,OAAO,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAEpD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAG3C,wBAAgB,UAAU,IAAI,MAAM,EAAE,CAErC;AAED,wBAAgB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAG1D;AAGD,wBAAgB,iBAAiB,CAC/B,iBAAiB,EAAE,OAAO,GAAG,YAAY,GACxC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAG1B;AAED,wBAAgB,uBAAuB,CAAC,gBAAgB,EAAE,OAAO,GAAG,YAAY,GAAG;IACjF,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb,CAOA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAGF,wBAAgB,gBAAgB,CAAC,oBAAoB,EAAE,OAAO,GAAG,YAAY,GAAG;IAC9E,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,YAAY,CAAC;IACpB,GAAG,EAAE,YAAY,CAAC;IAClB,MAAM,EAAE,YAAY,CAAC;IACrB,IAAI,EAAE,YAAY,CAAC;IACnB,GAAG,EAAE,YAAY,CAAC;CACnB,CAuCA;AAUD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE7C;AAID;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,YAAY,EACxB,OAAO,EAAE;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAC,GAC/D,YAAY,CAuBd;AAED,KAAK,WAAW,GAAG,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;AACxC,wBAAgB,WAAW,CAAC,UAAU,EAAE,CAAC,WAAW,GAAG,IAAI,CAAC,EAAE,GAAG,WAAW,GAAG,IAAI,CA2BlF"}
|
package/dist/utils/math-utils.js
CHANGED
|
@@ -17,6 +17,14 @@ export function getCameraPosition(viewMatrixInverse) {
|
|
|
17
17
|
// Read the translation from the inverse view matrix
|
|
18
18
|
return [viewMatrixInverse[12], viewMatrixInverse[13], viewMatrixInverse[14]];
|
|
19
19
|
}
|
|
20
|
+
export function getProjectionParameters(projectionMatrix) {
|
|
21
|
+
const m22 = projectionMatrix[10];
|
|
22
|
+
const m23 = projectionMatrix[14];
|
|
23
|
+
return {
|
|
24
|
+
near: m23 / (m22 - 1),
|
|
25
|
+
far: m23 / (m22 + 1)
|
|
26
|
+
};
|
|
27
|
+
}
|
|
20
28
|
// https://www.gamedevs.org/uploads/fast-extraction-viewing-frustum-planes-from-world-view-projection-matrix.pdf
|
|
21
29
|
export function getFrustumPlanes(viewProjectionMatrix) {
|
|
22
30
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"math-utils.js","sourceRoot":"","sources":["../../src/utils/math-utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"math-utils.js","sourceRoot":"","sources":["../../src/utils/math-utils.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,6DAA6D;AAC7D,OAAO,iBAAiB,iCAA8B;AACtD,OAAO,EAAC,OAAO,EAAe,MAAM,eAAe,CAAC;AAIpD,4EAA4E;AAC5E,MAAM,UAAU,UAAU;IACxB,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,GAAG,CAAC,KAAa,EAAE,OAAe;IAChD,MAAM,OAAO,GAAG,KAAK,GAAG,OAAO,CAAC;IAChC,OAAO,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;AACnD,CAAC;AAED,iDAAiD;AACjD,MAAM,UAAU,iBAAiB,CAC/B,iBAAyC;IAEzC,oDAAoD;IACpD,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE,iBAAiB,CAAC,EAAE,CAAC,EAAE,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC;AAC/E,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,gBAAwC;IAI9E,MAAM,GAAG,GAAG,gBAAgB,CAAC,EAAE,CAAC,CAAC;IACjC,MAAM,GAAG,GAAG,gBAAgB,CAAC,EAAE,CAAC,CAAC;IACjC,OAAO;QACL,IAAI,EAAE,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;QACrB,GAAG,EAAE,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;KACrB,CAAC;AACJ,CAAC;AAOD,gHAAgH;AAChH,MAAM,UAAU,gBAAgB,CAAC,oBAA4C;IAQ3E,OAAO;QACL,IAAI,EAAE,eAAe,CACnB,oBAAoB,CAAC,CAAC,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,EACjD,oBAAoB,CAAC,CAAC,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,EACjD,oBAAoB,CAAC,EAAE,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,EAClD,oBAAoB,CAAC,EAAE,CAAC,GAAG,oBAAoB,CAAC,EAAE,CAAC,CACpD;QACD,KAAK,EAAE,eAAe,CACpB,oBAAoB,CAAC,CAAC,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,EACjD,oBAAoB,CAAC,CAAC,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,EACjD,oBAAoB,CAAC,EAAE,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,EAClD,oBAAoB,CAAC,EAAE,CAAC,GAAG,oBAAoB,CAAC,EAAE,CAAC,CACpD;QACD,MAAM,EAAE,eAAe,CACrB,oBAAoB,CAAC,CAAC,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,EACjD,oBAAoB,CAAC,CAAC,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,EACjD,oBAAoB,CAAC,EAAE,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,EAClD,oBAAoB,CAAC,EAAE,CAAC,GAAG,oBAAoB,CAAC,EAAE,CAAC,CACpD;QACD,GAAG,EAAE,eAAe,CAClB,oBAAoB,CAAC,CAAC,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,EACjD,oBAAoB,CAAC,CAAC,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,EACjD,oBAAoB,CAAC,EAAE,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,EAClD,oBAAoB,CAAC,EAAE,CAAC,GAAG,oBAAoB,CAAC,EAAE,CAAC,CACpD;QACD,IAAI,EAAE,eAAe,CACnB,oBAAoB,CAAC,CAAC,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,EACjD,oBAAoB,CAAC,CAAC,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,EACjD,oBAAoB,CAAC,EAAE,CAAC,GAAG,oBAAoB,CAAC,EAAE,CAAC,EACnD,oBAAoB,CAAC,EAAE,CAAC,GAAG,oBAAoB,CAAC,EAAE,CAAC,CACpD;QACD,GAAG,EAAE,eAAe,CAClB,oBAAoB,CAAC,CAAC,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,EACjD,oBAAoB,CAAC,CAAC,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,EACjD,oBAAoB,CAAC,EAAE,CAAC,GAAG,oBAAoB,CAAC,EAAE,CAAC,EACnD,oBAAoB,CAAC,EAAE,CAAC,GAAG,oBAAoB,CAAC,EAAE,CAAC,CACpD;KACF,CAAC;AACJ,CAAC;AAED,MAAM,aAAa,GAAG,IAAI,OAAO,EAAE,CAAC;AAEpC,SAAS,eAAe,CAAC,CAAS,EAAE,CAAS,EAAE,CAAS,EAAE,CAAS;IACjE,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3B,MAAM,CAAC,GAAG,aAAa,CAAC,GAAG,EAAE,CAAC;IAC9B,OAAO,EAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,IAAI,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAC,CAAC;AACxE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,WAAW,CAAC,CAAS;IACnC,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAC5B,CAAC;AAED,IAAI,YAAY,CAAC;AAEjB;;;;;;;;;GASG;AACH,MAAM,UAAU,sBAAsB,CACpC,UAAwB,EACxB,OAAgE;IAEhE,MAAM,EAAC,IAAI,GAAG,CAAC,EAAE,UAAU,GAAG,CAAC,EAAC,GAAG,OAAO,CAAC;IAE3C,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC;IAEvF,MAAM,KAAK,GAAG,CAAC,QAAQ,GAAG,UAAU,CAAC,GAAG,IAAI,CAAC;IAC7C,YAAY,GAAG,iBAAiB,CAAC,QAAQ,CAAC,YAAY,EAAE,KAAK,EAAE;QAC7D,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE,IAAI,GAAG,CAAC;KACf,CAAC,CAAC;IAEH,IAAI,WAAW,GAAG,UAAU,CAAC;IAC7B,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,OAAO,WAAW,GAAG,QAAQ,EAAE,CAAC;QAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC;YAC9B,MAAM,KAAK,GAAG,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;YACxC,YAAY,CAAC,WAAW,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;YACtC,YAAY,CAAC,WAAW,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5D,CAAC;QACD,WAAW,IAAI,IAAI,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED,OAAO,YAAY,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC;AACpD,CAAC;AAGD,MAAM,UAAU,WAAW,CAAC,UAAkC;IAC5D,IAAI,YAAY,GAAuB,IAAI,CAAC;IAC5C,IAAI,QAAQ,GAAG,KAAK,CAAC;IAErB,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE,CAAC;QAChC,0CAA0C;QAC1C,IAAI,CAAC,MAAM;YAAE,SAAS;QACtB,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,YAAY,GAAG,MAAM,CAAC;QACxB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,sCAAsC;gBACtC,YAAY,GAAG;oBACb,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACxC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;iBACzC,CAAC;gBACF,QAAQ,GAAG,IAAI,CAAC;YAClB,CAAC;YAED,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAChE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAChE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAChE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"globe-viewport.d.ts","sourceRoot":"","sources":["../../src/viewports/globe-viewport.ts"],"names":[],"mappings":"AAKA,OAAO,QAAQ,sBAAmB;
|
|
1
|
+
{"version":3,"file":"globe-viewport.d.ts","sourceRoot":"","sources":["../../src/viewports/globe-viewport.ts"],"names":[],"mappings":"AAKA,OAAO,QAAQ,sBAAmB;AAUlC,eAAO,MAAM,YAAY,MAAM,CAAC;AAgBhC,MAAM,MAAM,oBAAoB,GAAG;IACjC,2BAA2B;IAC3B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,kDAAkD;IAClD,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,iDAAiD;IACjD,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,+BAA+B;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gCAAgC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,2BAA2B;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0BAA0B;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,8FAA8F;IAC9F,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,iBAAiB;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kCAAkC;IAClC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,gEAAgE;IAChE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,4FAA4F;IAC5F,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,qHAAqH;IACrH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,wGAAwG;IACxG,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,qGAAqG;IACrG,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,+IAA+I;IAC/I,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,QAAQ;IACjD,MAAM,CAAC,WAAW,SAAmB;IAErC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;gBAEP,IAAI,GAAE,oBAAyB;IA6D3C,IAAI,cAAc,MAEjB;IAED,iBAAiB;IAIjB,SAAS,CAAC,OAAO,GAAE;QAAC,CAAC,CAAC,EAAE,MAAM,CAAA;KAAM,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;IAmBvE,SAAS,CACP,GAAG,EAAE,MAAM,EAAE,EACb,EAAC,OAAc,EAAE,OAAO,EAAC,GAAE;QAAC,OAAO,CAAC,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAM,GACpE,MAAM,EAAE;IAoCX,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;IAUxD,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;IAY1D,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAI5C,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAI9C;;;;;;OAMG;IACH,aAAa,CACX,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,EACzC,KAAK,EAAE,MAAM,EAAE,EACf,UAAU,EAAE,MAAM,EAAE,GACnB,oBAAoB;CAYxB;AAED,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAGnD"}
|
|
@@ -10,7 +10,7 @@ import { vec3, vec4 } from '@math.gl/core';
|
|
|
10
10
|
const DEGREES_TO_RADIANS = Math.PI / 180;
|
|
11
11
|
const RADIANS_TO_DEGREES = 180 / Math.PI;
|
|
12
12
|
const EARTH_RADIUS = 6370972;
|
|
13
|
-
const GLOBE_RADIUS = 256;
|
|
13
|
+
export const GLOBE_RADIUS = 256;
|
|
14
14
|
function getDistanceScales() {
|
|
15
15
|
const unitsPerMeter = GLOBE_RADIUS / EARTH_RADIUS;
|
|
16
16
|
const unitsPerDegree = (Math.PI / 180) * GLOBE_RADIUS;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"globe-viewport.js","sourceRoot":"","sources":["../../src/viewports/globe-viewport.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AACtC,OAAO,QAAQ,sBAAmB;AAClC,OAAO,EAAC,eAAe,EAAC,4BAAyB;AACjD,OAAO,EAAC,cAAc,EAAE,cAAc,EAAC,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAC,IAAI,EAAE,IAAI,EAAC,MAAM,eAAe,CAAC;AAEzC,MAAM,kBAAkB,GAAG,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC;AACzC,MAAM,kBAAkB,GAAG,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC;AACzC,MAAM,YAAY,GAAG,OAAO,CAAC;AAC7B,MAAM,YAAY,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"globe-viewport.js","sourceRoot":"","sources":["../../src/viewports/globe-viewport.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orbit-viewport.d.ts","sourceRoot":"","sources":["../../src/viewports/orbit-viewport.ts"],"names":[],"mappings":"AAIA,OAAO,QAAQ,iCAA8B;
|
|
1
|
+
{"version":3,"file":"orbit-viewport.d.ts","sourceRoot":"","sources":["../../src/viewports/orbit-viewport.ts"],"names":[],"mappings":"AAIA,OAAO,QAAQ,iCAA8B;AAmD7C,MAAM,MAAM,oBAAoB,GAAG;IACjC,2BAA2B;IAC3B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,kDAAkD;IAClD,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,iDAAiD;IACjD,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,+BAA+B;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gCAAgC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uFAAuF;IACvF,SAAS,CAAC,EAAE,GAAG,GAAG,GAAG,CAAC;IACtB,6EAA6E;IAC7E,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,mLAAmL;IACnL,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qDAAqD;IACrD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qDAAqD;IACrD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,+BAA+B;IAC/B,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,0FAA0F;IAC1F,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,sDAAsD;IACtD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,sDAAsD;IACtD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,uHAAuH;IACvH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,QAAQ;IACjD,MAAM,CAAC,WAAW,SAAmB;IAErC,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,SAAS,EAAE,GAAG,GAAG,GAAG,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;gBAED,KAAK,EAAE,oBAAoB;IA6CvC,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAC,OAAc,EAAC,GAAE;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAM,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;IAQ9F,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,oBAAoB;CAgB9F"}
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
import Viewport from "../viewports/viewport.js";
|
|
5
5
|
import { Matrix4 } from '@math.gl/core';
|
|
6
6
|
import { pixelsToWorld, fovyToAltitude } from '@math.gl/web-mercator';
|
|
7
|
+
import { getProjectionParameters } from "../utils/math-utils.js";
|
|
7
8
|
const DEGREES_TO_RADIANS = Math.PI / 180;
|
|
8
9
|
function getViewMatrix({ height, focalDistance, orbitAxis, rotationX, rotationOrbit, zoom }) {
|
|
9
10
|
// We position the camera so that one common space unit (world space unit scaled by zoom)
|
|
@@ -72,9 +73,13 @@ class OrbitViewport extends Viewport {
|
|
|
72
73
|
}
|
|
73
74
|
panByPosition(coords, pixel, startPixel) {
|
|
74
75
|
const p0 = this.project(coords);
|
|
76
|
+
const { near, far } = getProjectionParameters(this.projectionMatrix);
|
|
77
|
+
const pz = (near * far) / (far - p0[2] * (far - near));
|
|
78
|
+
const centerZ = (near * far) / (far - this.projectedCenter[2] * (far - near));
|
|
79
|
+
const shiftScale = pz / centerZ;
|
|
75
80
|
const nextCenter = [
|
|
76
|
-
this.width / 2 + p0[0] - pixel[0],
|
|
77
|
-
this.height / 2 + p0[1] - pixel[1],
|
|
81
|
+
this.width / 2 + (p0[0] - pixel[0]) * shiftScale,
|
|
82
|
+
this.height / 2 + (p0[1] - pixel[1]) * shiftScale,
|
|
78
83
|
this.projectedCenter[2]
|
|
79
84
|
];
|
|
80
85
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orbit-viewport.js","sourceRoot":"","sources":["../../src/viewports/orbit-viewport.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,QAAQ,iCAA8B;AAE7C,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AACtC,OAAO,EAAC,aAAa,EAAE,cAAc,EAAC,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"orbit-viewport.js","sourceRoot":"","sources":["../../src/viewports/orbit-viewport.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import Viewport from "../viewports/viewport.js";
|
|
2
2
|
import type { Padding } from "./viewport.js";
|
|
3
|
+
/** independent zoom levels for X and Y axes
|
|
4
|
+
* @deprecated use `zoomX` and `zoomY` instead */
|
|
5
|
+
type Deprecated2DZoom = [number, number];
|
|
3
6
|
export type OrthographicViewportOptions = {
|
|
4
7
|
/** Name of the viewport */
|
|
5
8
|
id?: string;
|
|
@@ -14,8 +17,10 @@ export type OrthographicViewportOptions = {
|
|
|
14
17
|
/** The world position at the center of the viewport. Default `[0, 0, 0]`. */
|
|
15
18
|
target?: [number, number, number] | [number, number];
|
|
16
19
|
/** The zoom level of the viewport. `zoom: 0` maps one unit distance to one pixel on screen, and increasing `zoom` by `1` scales the same object to twice as large.
|
|
17
|
-
* To apply independent zoom levels to the X and Y axes,
|
|
18
|
-
|
|
20
|
+
* To apply independent zoom levels to the X and Y axes, use `zoomX` and `zoomY`.
|
|
21
|
+
* @default 0
|
|
22
|
+
*/
|
|
23
|
+
zoom?: number | Deprecated2DZoom;
|
|
19
24
|
/** Independent zoom along the X axis. Overrides `zoom`. */
|
|
20
25
|
zoomX?: number;
|
|
21
26
|
/** Independent zoom along the Y axis. Overrides `zoom`. */
|
|
@@ -40,4 +45,5 @@ export default class OrthographicViewport extends Viewport {
|
|
|
40
45
|
unprojectFlat([x, y]: number[]): [number, number];
|
|
41
46
|
panByPosition(coords: number[], pixel: number[], startPixel?: number[]): OrthographicViewportOptions;
|
|
42
47
|
}
|
|
48
|
+
export {};
|
|
43
49
|
//# sourceMappingURL=orthographic-viewport.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orthographic-viewport.d.ts","sourceRoot":"","sources":["../../src/viewports/orthographic-viewport.ts"],"names":[],"mappings":"AAIA,OAAO,QAAQ,iCAA8B;AAK7C,OAAO,KAAK,EAAC,OAAO,EAAC,sBAAmB;AAyCxC,MAAM,MAAM,2BAA2B,GAAG;IACxC,2BAA2B;IAC3B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,kDAAkD;IAClD,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,iDAAiD;IACjD,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,+BAA+B;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gCAAgC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,6EAA6E;IAC7E,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrD;
|
|
1
|
+
{"version":3,"file":"orthographic-viewport.d.ts","sourceRoot":"","sources":["../../src/viewports/orthographic-viewport.ts"],"names":[],"mappings":"AAIA,OAAO,QAAQ,iCAA8B;AAK7C,OAAO,KAAK,EAAC,OAAO,EAAC,sBAAmB;AAyCxC;iDACiD;AACjD,KAAK,gBAAgB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAEzC,MAAM,MAAM,2BAA2B,GAAG;IACxC,2BAA2B;IAC3B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,kDAAkD;IAClD,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,iDAAiD;IACjD,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,+BAA+B;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gCAAgC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,6EAA6E;IAC7E,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrD;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC;IACjC,2DAA2D;IAC3D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,2DAA2D;IAC3D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,8CAA8C;IAC9C,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACzB,sDAAsD;IACtD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,sDAAsD;IACtD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,yGAAyG;IACzG,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,QAAQ;IACxD,MAAM,CAAC,WAAW,SAA0B;IAE5C,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpD,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;gBAEH,KAAK,EAAE,2BAA2B;IAmD9C,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAK/C,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAMjD,aAAa,CACX,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EAAE,EACf,UAAU,CAAC,EAAE,MAAM,EAAE,GACpB,2BAA2B;CAS/B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orthographic-viewport.js","sourceRoot":"","sources":["../../src/viewports/orthographic-viewport.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,QAAQ,iCAA8B;AAE7C,OAAO,EAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAC,MAAM,eAAe,CAAC;AACnD,OAAO,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAIpD,MAAM,UAAU,GAAG,IAAI,OAAO,EAAE,CAAC,MAAM,CAAC,EAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAC,CAAC,CAAC;AAE1D,SAAS,mBAAmB,CAAC,EAC3B,KAAK,EACL,MAAM,EACN,IAAI,EACJ,GAAG,EACH,OAAO,EAOR;IACC,IAAI,IAAI,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC;IACtB,IAAI,KAAK,GAAG,KAAK,GAAG,CAAC,CAAC;IACtB,IAAI,MAAM,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;IACzB,IAAI,GAAG,GAAG,MAAM,GAAG,CAAC,CAAC;IACrB,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,EAAC,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,EAAC,GAAG,OAAO,CAAC;QACvE,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;QACjE,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC;QACpE,IAAI,IAAI,OAAO,CAAC;QAChB,KAAK,IAAI,OAAO,CAAC;QACjB,MAAM,IAAI,OAAO,CAAC;QAClB,GAAG,IAAI,OAAO,CAAC;IACjB,CAAC;IAED,OAAO,IAAI,OAAO,EAAE,CAAC,KAAK,CAAC;QACzB,IAAI;QACJ,KAAK;QACL,MAAM;QACN,GAAG;QACH,IAAI;QACJ,GAAG;KACJ,CAAC,CAAC;AACL,CAAC;
|
|
1
|
+
{"version":3,"file":"orthographic-viewport.js","sourceRoot":"","sources":["../../src/viewports/orthographic-viewport.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,49 @@
|
|
|
1
1
|
import View, { CommonViewState, CommonViewProps } from "./view.js";
|
|
2
2
|
import OrthographicViewport from "../viewports/orthographic-viewport.js";
|
|
3
3
|
import OrthographicController from "../controllers/orthographic-controller.js";
|
|
4
|
+
/** independent zoom levels for X and Y axes
|
|
5
|
+
* @deprecated use `zoomX` and `zoomY` instead */
|
|
6
|
+
type Deprecated2DZoom = [number, number];
|
|
4
7
|
export type OrthographicViewState = {
|
|
5
8
|
/** The world position at the center of the viewport. Default `[0, 0, 0]`. */
|
|
6
9
|
target?: [number, number, number] | [number, number];
|
|
7
10
|
/** The zoom level of the viewport. `zoom: 0` maps one unit distance to one pixel on screen, and increasing `zoom` by `1` scales the same object to twice as large.
|
|
8
|
-
* To apply independent zoom levels to the X and Y axes,
|
|
9
|
-
|
|
10
|
-
|
|
11
|
+
* To apply independent zoom levels to the X and Y axes, use `zoomX` and `zoomY`.
|
|
12
|
+
* @default 0
|
|
13
|
+
*/
|
|
14
|
+
zoom?: number | Deprecated2DZoom;
|
|
15
|
+
/** Which axes to apply zoom to. One of 'X', 'Y' or 'all'
|
|
16
|
+
* @default 'all'
|
|
17
|
+
*/
|
|
18
|
+
zoomAxis?: 'X' | 'Y' | 'all';
|
|
19
|
+
/** The zoom level along X axis. Overrides `zoom` if supplied. */
|
|
20
|
+
zoomX?: number;
|
|
21
|
+
/** The zoom level along Y axis. Overrides `zoom` if supplied. */
|
|
22
|
+
zoomY?: number;
|
|
23
|
+
/** The min zoom level of the viewport.
|
|
24
|
+
* @default -Infinity
|
|
25
|
+
*/
|
|
11
26
|
minZoom?: number;
|
|
12
|
-
/** The max zoom level of the viewport.
|
|
27
|
+
/** The max zoom level of the viewport.
|
|
28
|
+
* @default Infinity
|
|
29
|
+
*/
|
|
13
30
|
maxZoom?: number;
|
|
31
|
+
/** The min zoom level along X axis.
|
|
32
|
+
* @default `minZoom`
|
|
33
|
+
*/
|
|
34
|
+
maxZoomX?: number;
|
|
35
|
+
/** The max zoom level along X axis.
|
|
36
|
+
* @default `maxZoom`
|
|
37
|
+
*/
|
|
38
|
+
minZoomX?: number;
|
|
39
|
+
/** The min zoom level along Y axis.
|
|
40
|
+
* @default `minZoom`
|
|
41
|
+
*/
|
|
42
|
+
maxZoomY?: number;
|
|
43
|
+
/** The max zoom level along Y axis.
|
|
44
|
+
* @default `maxZoom`
|
|
45
|
+
*/
|
|
46
|
+
minZoomY?: number;
|
|
14
47
|
} & CommonViewState;
|
|
15
48
|
export type OrthographicViewProps = {
|
|
16
49
|
/** Distance of near clipping plane. Default `0.1`. */
|
|
@@ -26,4 +59,5 @@ export default class OrthographicView extends View<OrthographicViewState, Orthog
|
|
|
26
59
|
getViewportType(): typeof OrthographicViewport;
|
|
27
60
|
get ControllerType(): typeof OrthographicController;
|
|
28
61
|
}
|
|
62
|
+
export {};
|
|
29
63
|
//# sourceMappingURL=orthographic-view.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orthographic-view.d.ts","sourceRoot":"","sources":["../../src/views/orthographic-view.ts"],"names":[],"mappings":"AAIA,OAAO,IAAI,EAAE,EAAC,eAAe,EAAE,eAAe,EAAC,kBAAe;AAC9D,OAAO,oBAAoB,8CAA2C;AACtE,OAAO,sBAAsB,kDAA+C;AAE5E,MAAM,MAAM,qBAAqB,GAAG;IAClC,6EAA6E;IAC7E,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrD;
|
|
1
|
+
{"version":3,"file":"orthographic-view.d.ts","sourceRoot":"","sources":["../../src/views/orthographic-view.ts"],"names":[],"mappings":"AAIA,OAAO,IAAI,EAAE,EAAC,eAAe,EAAE,eAAe,EAAC,kBAAe;AAC9D,OAAO,oBAAoB,8CAA2C;AACtE,OAAO,sBAAsB,kDAA+C;AAE5E;iDACiD;AACjD,KAAK,gBAAgB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAEzC,MAAM,MAAM,qBAAqB,GAAG;IAClC,6EAA6E;IAC7E,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrD;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC;IACjC;;OAEG;IACH,QAAQ,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,KAAK,CAAC;IAC7B,iEAAiE;IACjE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iEAAiE;IACjE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,eAAe,CAAC;AAEpB,MAAM,MAAM,qBAAqB,GAAG;IAClC,sDAAsD;IACtD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,sDAAsD;IACtD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,yGAAyG;IACzG,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,GAAG,eAAe,CAAC,qBAAqB,CAAC,CAAC;AAE3C,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,IAAI,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAC9F,MAAM,CAAC,WAAW,SAAsB;gBAE5B,KAAK,GAAE,qBAA0B;IAI7C,eAAe;IAIf,IAAI,cAAc,kCAEjB;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orthographic-view.js","sourceRoot":"","sources":["../../src/views/orthographic-view.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,IAAwC,kBAAe;AAC9D,OAAO,oBAAoB,8CAA2C;AACtE,OAAO,sBAAsB,kDAA+C;
|
|
1
|
+
{"version":3,"file":"orthographic-view.js","sourceRoot":"","sources":["../../src/views/orthographic-view.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,IAAwC,kBAAe;AAC9D,OAAO,oBAAoB,8CAA2C;AACtE,OAAO,sBAAsB,kDAA+C;AAyD5E,MAAqB,gBAAiB,SAAQ,IAAkD;IAG9F,YAAY,QAA+B,EAAE;QAC3C,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAED,eAAe;QACb,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,sBAAsB,CAAC;IAChC,CAAC;;AAZM,4BAAW,GAAG,kBAAkB,CAAC;eADrB,gBAAgB"}
|
package/dist/views/view.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../src/views/view.ts"],"names":[],"mappings":"AAIA,OAAO,QAAQ,iCAA8B;
|
|
1
|
+
{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../src/views/view.ts"],"names":[],"mappings":"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"}
|
package/dist/views/view.js
CHANGED
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
import { parsePosition, getPosition } from "../utils/positions.js";
|
|
5
5
|
import { deepEqual } from "../utils/deep-equal.js";
|
|
6
|
+
import { deepMergeViewState } from "../utils/deep-merge.js";
|
|
6
7
|
export default class View {
|
|
7
8
|
constructor(props) {
|
|
8
9
|
const { id, x = 0, y = 0, width = '100%', height = '100%', padding = null } = props;
|
|
@@ -63,14 +64,7 @@ export default class View {
|
|
|
63
64
|
if (!this.props.viewState.id) {
|
|
64
65
|
return this.props.viewState;
|
|
65
66
|
}
|
|
66
|
-
|
|
67
|
-
const newViewState = { ...viewState };
|
|
68
|
-
for (const key in this.props.viewState) {
|
|
69
|
-
if (key !== 'id') {
|
|
70
|
-
newViewState[key] = this.props.viewState[key];
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
return newViewState;
|
|
67
|
+
return deepMergeViewState(viewState, this.props.viewState);
|
|
74
68
|
}
|
|
75
69
|
return viewState;
|
|
76
70
|
}
|
package/dist/views/view.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"view.js","sourceRoot":"","sources":["../../src/views/view.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAC,aAAa,EAAE,WAAW,EAAmB,8BAA2B;AAChF,OAAO,EAAC,SAAS,EAAC,+BAA4B;
|
|
1
|
+
{"version":3,"file":"view.js","sourceRoot":"","sources":["../../src/views/view.ts"],"names":[],"mappings":"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"}
|