Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Upgrade v8.10 to math.gl@4.0.0. Remove gl-matrix #8200

Merged
merged 8 commits into from
Oct 23, 2023
Merged

chore: Upgrade v8.10 to math.gl@4.0.0. Remove gl-matrix #8200

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
81aadee
chore: Upgrade to math.gl@4.0.0-beta.1. Remove gl-matrix
ibgreen Oct 13, 2023
b790c45
wip
ibgreen Oct 13, 2023
f27499d
wip
ibgreen Oct 13, 2023
e7a3f94
4.0.0
ibgreen Oct 14, 2023
b7aa186
merge
ibgreen Oct 20, 2023
1e91236
fixes
ibgreen Oct 21, 2023
5a7ee3e
tests
ibgreen Oct 22, 2023
3e23733
address comments
ibgreen Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/website/mesh/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"dependencies": {
"@loaders.gl/obj": "^3.4.13",
"@math.gl/core": "^3.6.0",
"@math.gl/core": "^4.0.0",
"deck.gl": "^8.8.0",
"react": "^18.0.0",
"react-dom": "^18.0.0"
Expand Down
2 changes: 1 addition & 1 deletion modules/aggregation-layers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@babel/runtime": "^7.0.0",
"@luma.gl/constants": "^8.5.20",
"@luma.gl/shadertools": "^8.5.20",
"@math.gl/web-mercator": "^3.6.2",
"@math.gl/web-mercator": "^4.0.0",
"d3-hexbin": "^0.2.1"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion modules/carto/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@loaders.gl/mvt": "^3.4.13",
"@loaders.gl/tiles": "^3.4.13",
"@luma.gl/constants": "^8.5.20",
"@math.gl/web-mercator": "^3.6.2",
"@math.gl/web-mercator": "^4.0.0",
"cartocolor": "^4.0.2",
"d3-array": "^3.2.0",
"d3-color": "^3.1.0",
Expand Down
14 changes: 6 additions & 8 deletions modules/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,12 @@
"@luma.gl/constants": "^8.5.20",
"@luma.gl/core": "^8.5.20",
"@luma.gl/webgl": "^8.5.20",
"@math.gl/core": "^3.6.2",
"@math.gl/sun": "^3.6.2",
"@math.gl/web-mercator": "^3.6.2",
"@probe.gl/env": "^3.5.0",
"@probe.gl/log": "^3.5.0",
"@probe.gl/stats": "^3.5.0",
"gl-matrix": "^3.0.0",
"math.gl": "^3.6.2",
"@math.gl/core": "^4.0.0",
"@math.gl/sun": "^4.0.0",
"@math.gl/web-mercator": "^4.0.0",
"@probe.gl/env": "^4.0.0",
"@probe.gl/log": "^4.0.0",
"@probe.gl/stats": "^4.0.0",
"mjolnir.js": "^2.7.0"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
Expand Down
3 changes: 1 addition & 2 deletions modules/core/src/shaderlib/project/project-functions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ import {COORDINATE_SYSTEM} from '../../lib/constants';
import {getOffsetOrigin} from './viewport-uniforms';
import WebMercatorViewport from '../../viewports/web-mercator-viewport';

import * as vec4 from 'gl-matrix/vec4';
import * as vec3 from 'gl-matrix/vec3';
import {vec3, vec4} from '@math.gl/core';
import {addMetersToLngLat} from '@math.gl/web-mercator';

import type {CoordinateSystem} from '../../lib/constants';
Expand Down
3 changes: 1 addition & 2 deletions modules/core/src/shaderlib/project/viewport-uniforms.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
// THE SOFTWARE.
/* eslint-disable complexity, camelcase */

import * as mat4 from 'gl-matrix/mat4';
import * as vec4 from 'gl-matrix/vec4';
import {mat4, vec4} from '@math.gl/core';

import {COORDINATE_SYSTEM, PROJECTION_MODE} from '../../lib/constants';

Expand Down
3 changes: 1 addition & 2 deletions modules/core/src/viewports/globe-viewport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ import {Matrix4} from '@math.gl/core';
import Viewport from './viewport';
import {PROJECTION_MODE} from '../lib/constants';

import * as vec3 from 'gl-matrix/vec3';
import * as vec4 from 'gl-matrix/vec4';
import {vec3, vec4} from '@math.gl/core';

const DEGREES_TO_RADIANS = Math.PI / 180;
const RADIANS_TO_DEGREES = 180 / Math.PI;
Expand Down
3 changes: 1 addition & 2 deletions modules/core/src/viewports/orthographic-viewport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import Viewport from '../viewports/viewport';

import {Matrix4, clamp} from '@math.gl/core';
import {Matrix4, clamp, vec2} from '@math.gl/core';
import {pixelsToWorld} from '@math.gl/web-mercator';
import * as vec2 from 'gl-matrix/vec2';

import type {Padding} from './viewport';

Expand Down
3 changes: 1 addition & 2 deletions modules/core/src/viewports/viewport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
import log from '../utils/log';
import {createMat4, getCameraPosition, getFrustumPlanes, FrustumPlane} from '../utils/math-utils';

import {Matrix4, Vector3, equals, clamp} from '@math.gl/core';
import * as mat4 from 'gl-matrix/mat4';
import {Matrix4, Vector3, equals, clamp, mat4} from '@math.gl/core';

import {
getDistanceScales,
Expand Down
4 changes: 1 addition & 3 deletions modules/core/src/viewports/web-mercator-viewport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ import {
} from '@math.gl/web-mercator';
import {Padding} from './viewport';

// TODO - import from math.gl
import * as vec2 from 'gl-matrix/vec2';
import {Matrix4, clamp} from '@math.gl/core';
import {Matrix4, clamp, vec2} from '@math.gl/core';

export type WebMercatorViewportOptions = {
/** Name of the viewport */
Expand Down
5 changes: 2 additions & 3 deletions modules/extensions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@
"@deck.gl/core": "^8.0.0",
"@luma.gl/constants": "^8.0.0",
"@luma.gl/core": "^8.0.0",
"@math.gl/core": "^3.6.2",
"@math.gl/web-mercator": "^3.6.2",
"gl-matrix": "^3.0.0"
"@math.gl/core": "^4.0.0",
"@math.gl/web-mercator": "^4.0.0"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
4 changes: 2 additions & 2 deletions modules/extensions/src/path-style/path-style-extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
// THE SOFTWARE.

import {LayerExtension, _mergeShaders as mergeShaders} from '@deck.gl/core';
import {vec3} from '@math.gl/core';
import {dashShaders, offsetShaders} from './shaders.glsl';
import {dist} from 'gl-matrix/vec3';

import type {Layer, LayerContext, Accessor, UpdateParameters} from '@deck.gl/core';

Expand Down Expand Up @@ -167,7 +167,7 @@ export default class PathStyleExtension extends LayerExtension<PathStyleExtensio
p = this.projectPosition(p);

if (i > 0) {
result[i] = result[i - 1] + dist(prevP, p);
result[i] = result[i - 1] + vec3.dist(prevP, p);
}

prevP = p;
Expand Down
6 changes: 3 additions & 3 deletions modules/geo-layers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
"@loaders.gl/wms": "^3.4.13",
"@luma.gl/constants": "^8.5.20",
"@luma.gl/experimental": "^8.5.20",
"@math.gl/core": "^3.6.2",
"@math.gl/culling": "^3.6.2",
"@math.gl/web-mercator": "^3.6.2",
"@math.gl/core": "^4.0.0",
"@math.gl/culling": "^4.0.0",
"@math.gl/web-mercator": "^4.0.0",
"@types/geojson": "^7946.0.8",
"h3-js": "^4.1.0",
"long": "^3.2.0"
Expand Down
2 changes: 1 addition & 1 deletion modules/google-maps/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@deck.gl/core": "^8.0.0",
"@luma.gl/constants": "^8.5.0",
"@luma.gl/core": "^8.5.0",
"@math.gl/core": "^3.6.0"
"@math.gl/core": "^4.0.0"
},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
}
6 changes: 3 additions & 3 deletions modules/layers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
"@loaders.gl/schema": "^3.4.13",
"@luma.gl/constants": "^8.5.20",
"@mapbox/tiny-sdf": "^2.0.5",
"@math.gl/core": "^3.6.2",
"@math.gl/polygon": "^3.6.2",
"@math.gl/web-mercator": "^3.6.2",
"@math.gl/core": "^4.0.0",
"@math.gl/polygon": "^4.0.0",
"@math.gl/web-mercator": "^4.0.0",
"earcut": "^2.2.4"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion modules/mapbox/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"dependencies": {
"@babel/runtime": "^7.0.0",
"@luma.gl/constants": "^8.5.16",
"@math.gl/web-mercator": "^3.6.2",
"@math.gl/web-mercator": "^4.0.0",
"@types/mapbox-gl": "^2.6.3"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion modules/test-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@deck.gl/core": "^8.0.0",
"@luma.gl/test-utils": "^8.5.0",
"@luma.gl/webgl": "^8.5.0",
"@probe.gl/test-utils": "^3.5.0"
"@probe.gl/test-utils": "^4.0.0"
},
"scripts": {},
"gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
Expand Down
21 changes: 16 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,17 @@
"modules/*"
],
"resolution_comments": {
"escaper": "v2 has an invalid main field in package.json, breaks esbuild during browser test"
"escaper": "v2 has an invalid main field in package.json, breaks esbuild during browser test",
"math.gl": "loaders.gl pulls in v3 packages"
},
"resolutions": {
"escaper": "3.0.6",
"math.gl": "^4.0.0",
"@math.gl/core": "^4.0.0",
"@math.gl/web-mercator": "^4.0.0",
"@math.gl/culling": "^4.0.0",
"@math.gl/geospatial": "^4.0.0",
"@math.gl/proj4": "^4.0.0",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are not going to help end users.

"puppeteer": "^21.3.8"
},
"scripts": {
Expand Down Expand Up @@ -53,9 +60,9 @@
"@loaders.gl/csv": "^3.4.13",
"@loaders.gl/polyfills": "^3.4.13",
"@luma.gl/test-utils": "^8.5.20",
"@math.gl/proj4": "^3.6.3",
"@probe.gl/bench": "^3.5.4",
"@probe.gl/test-utils": "^3.5.4",
"@math.gl/proj4": "^4.0.0",
"@probe.gl/bench": "^4.0.0",
"@probe.gl/test-utils": "^4.0.0",
"@types/react": "^18.0.0",
"babel-loader": "^8.0.0",
"babel-plugin-inline-webgl-constants": "^1.0.3",
Expand All @@ -80,5 +87,9 @@
"engines": {
"node": ">=14"
},
"dependencies": {}
"dependencies": {},
"volta": {
"node": "18.18.2",
"yarn": "1.22.19"
}
}
3 changes: 1 addition & 2 deletions test/apps/frustum-cull/frustum-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {Vector3} from '@math.gl/core';
import * as mat3 from 'gl-matrix/mat3';
import {Vector3, mat3} from '@math.gl/core';

const NEAR = [255, 0, 128];
const FAR = [128, 0, 255];
Expand Down
2 changes: 1 addition & 1 deletion test/apps/mask-first-person/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"dependencies": {
"deck.gl": "^8.4.0",
"@math.gl/core": "3.6.0",
"@math.gl/core": "^4.0.0",
"@turf/circle": "6.5.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion test/apps/multi-viewport/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"dependencies": {
"deck.gl": "^8.4.0",
"@math.gl/core": "3.6.0",
"@math.gl/core": "^4.0.0",
"maplibre-gl": "^2.4.0",
"react": "^18.0.0",
"react-dom": "^18.0.0",
Expand Down
5 changes: 2 additions & 3 deletions test/modules/core/effects/lighting/sunlight.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
import test from 'tape-promise/tape';
import {WebMercatorViewport, _GlobeViewport as GlobeViewport, PolygonLayer} from 'deck.gl';
import {_SunLight as SunLight} from '@deck.gl/core';

import {angle} from 'gl-matrix/vec3';
import {vec3} from '@math.gl/core';

test('Sunlight#Constructor', t => {
const sunLight = new SunLight({
Expand Down Expand Up @@ -110,7 +109,7 @@ test('Sunlight#getProjectedLight', t => {
layer.context.viewport = testCase.viewport;
const projectedLight = sunLight.getProjectedLight({layer});
t.comment(projectedLight.direction.join(','));
t.ok(angle(projectedLight.direction, testCase.expected) < 0.05, testCase.title);
t.ok(vec3.angle(projectedLight.direction, testCase.expected) < 0.05, testCase.title);
}

t.end();
Expand Down
6 changes: 4 additions & 2 deletions test/modules/geo-layers/mvt-layer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,8 @@ test('MVTLayer#dataInWGS84', async t => {
t.end();
});

test('MVTLayer#triangulation', async t => {
// TODO - loaders.gl v4 does not modify builtin fetch to load from file system.
test.skip('MVTLayer#triangulation', async t => {
const viewport = new WebMercatorViewport({
longitude: -100,
latitude: 40,
Expand Down Expand Up @@ -526,7 +527,8 @@ test('MVTLayer#triangulation', async t => {
});

for (const tileset of ['mvt-tiles', 'mvt-with-hole']) {
test(`MVTLayer#data.length ${tileset}`, async t => {
// TODO - loaders.gl v4 does not modify builtin fetch to load from file system.
test.skip(`MVTLayer#data.length ${tileset}`, async t => {
const viewport = new WebMercatorViewport({
longitude: -100,
latitude: 40,
Expand Down
3 changes: 2 additions & 1 deletion test/modules/geo-layers/tile-3d-layer/tile-3d-layer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ import {testLayerAsync} from '@deck.gl/test-utils';
import {Tile3DLayer} from '@deck.gl/geo-layers';
import {WebMercatorViewport} from '@deck.gl/core';

test('Tile3DLayer', async t => {
// TODO - loaders.gl v4 does not modify builtin fetch to load from file system.
test.skip('Tile3DLayer', async t => {
const testCases = [
{
props: {
Expand Down
2 changes: 1 addition & 1 deletion test/modules/geo-layers/tileset-2d/tileset-2d.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import test from 'tape-promise/tape';
import {_Tileset2D as Tileset2D} from '@deck.gl/geo-layers';
import {Matrix4} from 'math.gl';
import {Matrix4} from '@math.gl/core';

import {WebMercatorViewport, OrthographicView} from '@deck.gl/core';

Expand Down
2 changes: 1 addition & 1 deletion test/modules/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ import './mapbox';
import './json';
import './react';
import './jupyter-widget';
import './extensions';
// import './extensions';
2 changes: 1 addition & 1 deletion test/render/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import TEST_CASES from './test-cases';
import {WIDTH, HEIGHT} from './constants';
import {SnapshotTestRunner} from '@deck.gl/test-utils';

import './jupyter-widget';
// import './jupyter-widget';
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Pessimistress @ajduberstein

As far as I can tell, math.gl 4.0 breaks jupyter-widget tests. The tests just freeze, I haven't figured out how to proceed with debugging

Copy link
Collaborator

@Pessimistress Pessimistress Oct 23, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a TODO comment.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The good news is that these tests seem to work again on 9.0, so it is presumably related to ES / CJS incompatibility causing some problems for Jupyter on 8.10.

We may need to make a decision on whether we can land this on 8.10 and temporarily break jupyter support). Since 8.10 is only dev releases and not for production this may be acceptable.

(I understand there is a new 8.0 python widgets library, maybe it addresses some of these things.)


test('Render Test', t => {
// tape's default timeout is 500ms
Expand Down
Loading
Loading