Skip to content

Commit 1a469b1

Browse files
tsheriftsherif
authored
More luma updates (visgl#3942)
1 parent 80ae951 commit 1a469b1

File tree

18 files changed

+71
-69
lines changed

18 files changed

+71
-69
lines changed

Diff for: ‎docs/layers/scenegraph-layer.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The `ScenegraphLayer` renders a number of instances of a complete luma.gl sceneg
1111
import DeckGL from '@deck.gl/react';
1212
import {ScenegraphLayer} from '@deck.gl/mesh-layers';
1313
import {registerLoaders} from '@loaders.gl/core';
14-
import {GLTFScenegraphLoader} from '@luma.gl/addons';
14+
import {GLTFScenegraphLoader} from '@luma.gl/experimental';
1515

1616
// Register the proper loader for scenegraph.gltf
1717
registerLoaders([GLTFScenegraphLoader]);

Diff for: ‎examples/layer-browser/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"dependencies": {
1212
"@loaders.gl/ply": "^1.3.3",
1313
"@loaders.gl/gltf": "^1.3.3",
14-
"@luma.gl/addons": "^8.0.0-alpha.10",
15-
"@luma.gl/debug": "^8.0.0-alpha.10",
14+
"@luma.gl/experimental": "^8.0.0-alpha.12",
15+
"@luma.gl/debug": "^8.0.0-alpha.12",
1616
"colorbrewer": "^1.0.0",
1717
"d3-request": "^1.0.6",
1818
"d3-scale": "^3.1.0",

Diff for: ‎examples/layer-browser/src/examples/mesh-layers.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {SimpleMeshLayer, ScenegraphLayer} from '@deck.gl/mesh-layers';
22
import {registerLoaders} from '@loaders.gl/core';
33
import {GLTFLoader} from '@loaders.gl/gltf';
4-
import {GLTFEnvironment} from '@luma.gl/addons';
4+
import {GLTFEnvironment} from '@luma.gl/experimental';
55
import GL from '@luma.gl/constants';
66

77
import * as dataSamples from '../data-samples';

Diff for: ‎examples/webpack.config.local.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ function makeLocalDevConfig(EXAMPLE_DIR = LIB_DIR, linkToLuma) {
2525
'@luma.gl/webgl': `${ROOT_DIR}/../luma.gl/modules/webgl/src`,
2626
'@luma.gl/gltools': `${ROOT_DIR}/../luma.gl/modules/gltools/src`,
2727
'@luma.gl/shadertools': `${ROOT_DIR}/../luma.gl/modules/shadertools/src`,
28-
'@luma.gl/addons': `${ROOT_DIR}/../luma.gl/modules/addons/src`
28+
'@luma.gl/experimental': `${ROOT_DIR}/../luma.gl/modules/experimental/src`
2929
};
3030
const LUMA_LOCAL_ALIASES = {
3131
'@luma.gl/constants': `${ROOT_DIR}/node_modules/@luma.gl/constants`,
@@ -34,8 +34,8 @@ function makeLocalDevConfig(EXAMPLE_DIR = LIB_DIR, linkToLuma) {
3434
'@luma.gl/webgl': `${ROOT_DIR}/node_modules/@luma.gl/webgl`,
3535
'@luma.gl/gltools': `${ROOT_DIR}/node_modules/@luma.gl/gltools`,
3636
'@luma.gl/shadertools': `${ROOT_DIR}/node_modules/@luma.gl/shadertools`,
37-
'@luma.gl/addons': `${ROOT_DIR}/node_modules/@luma.gl/addons`,
38-
// @luma.gl/addons is not available in the root node_modules, must be imported
37+
'@luma.gl/experimental': `${ROOT_DIR}/node_modules/@luma.gl/experimental`,
38+
// @luma.gl/experimental is not available in the root node_modules, must be imported
3939
// where required.
4040
'@loaders.gl/core': `${ROOT_DIR}/node_modules/@loaders.gl/core`
4141
};

Diff for: ‎examples/website/scenegraph-layer/app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {StaticMap} from 'react-map-gl';
66
import DeckGL from '@deck.gl/react';
77
import {ScenegraphLayer} from '@deck.gl/mesh-layers';
88

9-
import {GLTFScenegraphLoader} from '@luma.gl/addons';
9+
import {GLTFScenegraphLoader} from '@luma.gl/experimental';
1010
import {registerLoaders} from '@loaders.gl/core';
1111

1212
registerLoaders([GLTFScenegraphLoader]);

Diff for: ‎examples/website/scenegraph-layer/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"dependencies": {
1010
"@deck.gl/mesh-layers": "^7.3.0-beta",
1111
"@deck.gl/react": "^7.3.0-beta",
12-
"@luma.gl/addons": "^8.0.0-alpha.10",
12+
"@luma.gl/experimental": "^8.0.0-alpha.12",
1313
"react": "^16.3.0",
1414
"react-dom": "^16.3.0",
1515
"react-map-gl": "^5.0.0"

Diff for: ‎modules/core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"dependencies": {
3333
"@loaders.gl/core": "^1.3.4",
3434
"@loaders.gl/images": "^1.3.4",
35-
"@luma.gl/core": "^8.0.0-alpha.10",
35+
"@luma.gl/core": "^8.0.0-alpha.12",
3636
"@math.gl/web-mercator": "^3.1.0-alpha",
3737
"gl-matrix": "^3.0.0",
3838
"math.gl": "^3.0.0",

Diff for: ‎modules/core/src/lib/deck.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import GL from '@luma.gl/constants';
3333
import {
3434
AnimationLoop,
3535
createGLContext,
36-
trackContextState,
36+
instrumentGLContext,
3737
setParameters,
3838
Timeline,
3939
lumaStats
@@ -572,7 +572,7 @@ export default class Deck {
572572
// if external context...
573573
if (!this.canvas) {
574574
this.canvas = gl.canvas;
575-
trackContextState(gl, {enable: true, copyState: true});
575+
instrumentGLContext(gl, {enable: true, copyState: true});
576576
}
577577

578578
this.tooltip = new Tooltip(this.canvas);

Diff for: ‎modules/mesh-layers/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@
3333
"@deck.gl/core": "^7.3.0-beta"
3434
},
3535
"dependencies": {
36-
"@luma.gl/addons": "^8.0.0-alpha.10"
36+
"@luma.gl/experimental": "^8.0.0-alpha.12"
3737
}
3838
}

Diff for: ‎modules/mesh-layers/src/scenegraph-layer/scenegraph-layer.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import {Layer, project32, picking} from '@deck.gl/core';
2222
import {isWebGL2, pbr, log} from '@luma.gl/core';
23-
import {ScenegraphNode, createGLTFObjects} from '@luma.gl/addons';
23+
import {ScenegraphNode, createGLTFObjects} from '@luma.gl/experimental';
2424
import GL from '@luma.gl/constants';
2525
import {waitForGLTFAssets} from './gltf-utils';
2626

@@ -112,7 +112,7 @@ export default class ScenegraphLayer extends Layer {
112112
// Signature 1: props.scenegraph is a proper luma.gl Scenegraph
113113
scenegraphData = {scenes: [props.scenegraph]};
114114
} else if (props.scenegraph && !props.scenegraph.gltf) {
115-
// Converts loaders.gl gltf to luma.gl scenegraph using the undocumented @luma.gl/addons function
115+
// Converts loaders.gl gltf to luma.gl scenegraph using the undocumented @luma.gl/experimental function
116116
const gltf = props.scenegraph;
117117
const gltfObjects = createGLTFObjects(gl, gltf, this.getLoadOptions());
118118
scenegraphData = Object.assign({gltf}, gltfObjects);

Diff for: ‎modules/test-utils/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
],
2626
"peerDependencies": {
2727
"@deck.gl/core": "^7.3.0-beta",
28+
"@luma.gl/webgl": "^8.0.0-alpha.12",
2829
"@luma.gl/test-utils": "^8.0.0-alpha.10",
2930
"@probe.gl/test-utils": "^3.1.0"
3031
},

Diff for: ‎modules/test-utils/src/lifecycle-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
// THE SOFTWARE.
2020

2121
import {LayerManager, MapView, DeckRenderer} from '@deck.gl/core';
22-
import {VertexArrayObject} from '@luma.gl/core';
22+
import {VertexArrayObject} from '@luma.gl/webgl';
2323

2424
import {makeSpy} from '@probe.gl/test-utils';
2525
import gl from './utils/setup-gl';

Diff for: ‎ocular-dev-tools.config.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ const LUMA_ALIASES_LOCAL = {
99
'@luma.gl/webgl': `${__dirname}/../luma.gl/modules/webgl/src`,
1010
'@luma.gl/gltools': `${__dirname}/../luma.gl/modules/gltools/src`,
1111
'@luma.gl/shadertools': `${__dirname}/../luma.gl/modules/shadertools/src`,
12-
'@luma.gl/test-utils': `${__dirname}/../luma.gl/modules/test-utils/src`
12+
'@luma.gl/test-utils': `${__dirname}/../luma.gl/modules/test-utils/src`,
13+
'@luma.gl/experimental': `${__dirname}/../luma.gl/modules/experimental/src`
1314
};
1415

1516
const useLocalLuma = false;

Diff for: ‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"jsdom": false
4242
},
4343
"devDependencies": {
44-
"@luma.gl/engine": "^8.0.0-alpha.10",
44+
"@luma.gl/engine": "^8.0.0-alpha.12",
4545
"@luma.gl/test-utils": "^8.0.0-alpha.10",
4646
"@probe.gl/bench": "^3.1.1",
4747
"@probe.gl/test-utils": "^3.1.1",

Diff for: ‎test/apps/glsl-debugger/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"start-local": "webpack-dev-server --env.local --progress --hot --port 3000 --open"
55
},
66
"dependencies": {
7-
"@luma.gl/debug": "^8.0.0-alpha.10",
7+
"@luma.gl/debug": "^8.0.0-alpha.12",
88
"deck.gl": "^7.3.0-beta",
99
"glsl-transpiler": "^1.8.5"
1010
},

Diff for: ‎test/modules/layers/scenegraph-layer.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {testLayer, generateLayerTests} from '@deck.gl/test-utils';
2424
import {project32} from '@deck.gl/core';
2525
import {ScenegraphLayer} from '@deck.gl/mesh-layers';
2626
import {CubeGeometry} from '@luma.gl/core';
27-
import {GroupNode, ModelNode} from '@luma.gl/addons';
27+
import {GroupNode, ModelNode} from '@luma.gl/experimental';
2828

2929
import * as FIXTURES from 'deck.gl-test/data';
3030

Diff for: ‎website-gatsby/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
},
1717
"dependencies": {
1818
"@loaders.gl/las": "^1.0.3",
19-
"@luma.gl/addons": "^8.0.0-alpha.10",
20-
"@luma.gl/constants": "^8.0.0-alpha.10",
21-
"@luma.gl/core": "^8.0.0-alpha.10",
22-
"@luma.gl/webgl": "^8.0.0-alpha.10",
19+
"@luma.gl/addons": "^8.0.0-alpha.12",
20+
"@luma.gl/constants": "^8.0.0-alpha.12",
21+
"@luma.gl/core": "^8.0.0-alpha.12",
22+
"@luma.gl/webgl": "^8.0.0-alpha.12",
2323
"@probe.gl/stats-widget": "^3.0.1",
2424
"d3-color": "^1.4.0",
2525
"d3-request": "^1.0.6",

Diff for: ‎yarn.lock

+45-45
Original file line numberDiff line numberDiff line change
@@ -1598,67 +1598,67 @@
15981598
stream-to-async-iterator "^0.2.0"
15991599
through "^2.3.8"
16001600

1601-
"@luma.gl/addons@^8.0.0-alpha.10":
1602-
version "8.0.0-alpha.10"
1603-
resolved "https://registry.yarnpkg.com/@luma.gl/addons/-/addons-8.0.0-alpha.10.tgz#145f4a206625792b454a5d1dd9b8381a4e045af3"
1604-
integrity sha512-xR1omVvzdmptzNxyAspQzPrk9MAlPdFuyLQsZmifcF0umfkZT31rCSf9ZXY4irAKOoMpMSqqnGnQ2CEnl5Xxrg==
1605-
dependencies:
1606-
"@loaders.gl/gltf" "^1.3.0"
1607-
"@loaders.gl/images" "^1.3.0"
1608-
"@luma.gl/constants" "8.0.0-alpha.10"
1609-
math.gl "^3.0.0"
1610-
1611-
"@luma.gl/[email protected]":
1612-
version "8.0.0-alpha.10"
1613-
resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-8.0.0-alpha.10.tgz#45fe8971da0af821893dbf3a88ba55494407b913"
1614-
integrity sha512-bDOGc/6R4vpi/okmBhYetJMC80LJ/FeAsbKqrXs3/OqTG2dPQSfYsQ84QeiWwxhmETPNvKAAXuStBp9MaMqETw==
1601+
"@luma.gl/[email protected]":
1602+
version "8.0.0-alpha.12"
1603+
resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-8.0.0-alpha.12.tgz#b07a8f918b2db8d7e73a2395ac3b55c30e924a3b"
1604+
integrity sha512-sR5gIPwWcztPcRHgFOOOn4hKbLPrLYyY8hLLn6451lWIkJIT5jgOwp362UAXDdVyD2+1fE3awlnSTxliRNjoJA==
16151605

16161606
"@luma.gl/constants@^7.3.0-alpha.1":
16171607
version "7.3.0-alpha.8"
16181608
resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-7.3.0-alpha.8.tgz#900dd18a157e9c9a0886aba6f79fae80006c2bc4"
16191609
integrity sha512-MjEBfWCqYrYREMHh+XQneJlYDK+Z5Uh7cvodUhugaWRKoVbQI884ISAt4+6tWJj5DXQC/k8V1ypa+Hd3hY+oBw==
16201610

1621-
"@luma.gl/core@^8.0.0-alpha.10":
1622-
version "8.0.0-alpha.10"
1623-
resolved "https://registry.yarnpkg.com/@luma.gl/core/-/core-8.0.0-alpha.10.tgz#7f245233b37978be5a3fc1c6ddfb23fa5ed0990f"
1624-
integrity sha512-D97tE9UX4s1MFVNNxlJUjJpIWkw0t/MV7tTFLpLYFDNKLud03o+rFV30E/rA1Zy8hU+978ZkACSz3l0k4Lh0Kg==
1611+
"@luma.gl/core@^8.0.0-alpha.12":
1612+
version "8.0.0-alpha.12"
1613+
resolved "https://registry.yarnpkg.com/@luma.gl/core/-/core-8.0.0-alpha.12.tgz#2e95e10cd7b90bb3dd20835273af7155e3ab4118"
1614+
integrity sha512-Erp0etGNsaC/IM3XSN7Y/33jpJT0N6MeYlwyy8x+C/b/AVcAkxYIaWcyOZtZj1pNtV/iTFzmz1Une0GlUTz9Wg==
16251615
dependencies:
16261616
"@babel/runtime" "^7.0.0"
1627-
"@luma.gl/constants" "8.0.0-alpha.10"
1628-
"@luma.gl/engine" "8.0.0-alpha.10"
1629-
"@luma.gl/shadertools" "8.0.0-alpha.10"
1630-
"@luma.gl/webgl" "8.0.0-alpha.10"
1617+
"@luma.gl/constants" "8.0.0-alpha.12"
1618+
"@luma.gl/engine" "8.0.0-alpha.12"
1619+
"@luma.gl/shadertools" "8.0.0-alpha.12"
1620+
"@luma.gl/webgl" "8.0.0-alpha.12"
16311621
math.gl "^3.0.0"
16321622
probe.gl "^3.1.1"
16331623
seer "^0.2.4"
16341624

1635-
"@luma.gl/[email protected].10", "@luma.gl/engine@^8.0.0-alpha.10":
1636-
version "8.0.0-alpha.10"
1637-
resolved "https://registry.yarnpkg.com/@luma.gl/engine/-/engine-8.0.0-alpha.10.tgz#aab928bf3c206ebc5fb95d8b130dcdf2ed71c863"
1638-
integrity sha512-GNEL8RoQirJGgG3Gx0DaSq0xnDnZlAEtdrBn7dIkiiaoqqMlTbuXR1MGVIdfwzGUX5ezrLN53FzvzekBruXYug==
1625+
"@luma.gl/[email protected].12", "@luma.gl/engine@^8.0.0-alpha.12":
1626+
version "8.0.0-alpha.12"
1627+
resolved "https://registry.yarnpkg.com/@luma.gl/engine/-/engine-8.0.0-alpha.12.tgz#30496156003120c314d0e17ae7da370bc16fb632"
1628+
integrity sha512-wspsyscWTPZSaC06xqsYXV1xtrmmUsUnBETViJ8PKv+TtEll+5QUKzj99CWhfDRof9MYdUIOTFv293dHJYgZuw==
16391629
dependencies:
16401630
"@babel/runtime" "^7.0.0"
1641-
"@luma.gl/constants" "8.0.0-alpha.10"
1642-
"@luma.gl/gltools" "8.0.0-alpha.10"
1643-
"@luma.gl/shadertools" "8.0.0-alpha.10"
1644-
"@luma.gl/webgl" "8.0.0-alpha.10"
1631+
"@luma.gl/constants" "8.0.0-alpha.12"
1632+
"@luma.gl/gltools" "8.0.0-alpha.12"
1633+
"@luma.gl/shadertools" "8.0.0-alpha.12"
1634+
"@luma.gl/webgl" "8.0.0-alpha.12"
16451635
math.gl "^3.0.0"
16461636
probe.gl "^3.1.1"
16471637
seer "^0.2.4"
16481638

1649-
"@luma.gl/[email protected]":
1650-
version "8.0.0-alpha.10"
1651-
resolved "https://registry.yarnpkg.com/@luma.gl/gltools/-/gltools-8.0.0-alpha.10.tgz#76a98d9956efadb035ea54be7c08ea4c16b38fdd"
1652-
integrity sha512-yBhfndA0MoZzgUp9PantQoyAsrOJfiRGCafzVLVk10sMLLQ6G6dPzBDX9QiLHckZ7LWMce9DCRjQoHLKAS8YXQ==
1639+
"@luma.gl/experimental@^8.0.0-alpha.12":
1640+
version "8.0.0-alpha.12"
1641+
resolved "https://registry.yarnpkg.com/@luma.gl/experimental/-/experimental-8.0.0-alpha.12.tgz#f93608355545418af1ec46cae2358f613fe9acac"
1642+
integrity sha512-VbPCOtrCwAwQQyqcM5P1mnvp4E9n5vYh/t20sdcnBRQ0fPlFENJCTee+5utYzFQrpgBsX/Z+DkmUqEmMQbutzg==
1643+
dependencies:
1644+
"@loaders.gl/gltf" "^1.3.0"
1645+
"@loaders.gl/images" "^1.3.0"
1646+
"@luma.gl/constants" "8.0.0-alpha.12"
1647+
math.gl "^3.0.0"
1648+
1649+
"@luma.gl/[email protected]":
1650+
version "8.0.0-alpha.12"
1651+
resolved "https://registry.yarnpkg.com/@luma.gl/gltools/-/gltools-8.0.0-alpha.12.tgz#e66718d66a3683364ab745281b2a19e759ba728e"
1652+
integrity sha512-hrvWfaG6v6dqx1Sp1K7jG5VvpWX0sTpt6UvWOdv37g0atuxi1CefVCWN+ZdLtPGeG90K6bEjBOurB4xc6b3jPA==
16531653
dependencies:
16541654
"@babel/runtime" "^7.0.0"
1655-
"@luma.gl/constants" "8.0.0-alpha.10"
1655+
"@luma.gl/constants" "8.0.0-alpha.12"
16561656
probe.gl "^3.1.1"
16571657

1658-
"@luma.gl/[email protected].10":
1659-
version "8.0.0-alpha.10"
1660-
resolved "https://registry.yarnpkg.com/@luma.gl/shadertools/-/shadertools-8.0.0-alpha.10.tgz#0078e1801100a9e0e260134930ec6baa1b6ea3a0"
1661-
integrity sha512-WD+XxfCeqAtHkO7/+iQyN57Ttzh3yBrMO19nGknS7oZjUj/uxZhiamiS2DF8dDj4CQfxd2ogFIIYjlji6gjJKA==
1658+
"@luma.gl/[email protected].12":
1659+
version "8.0.0-alpha.12"
1660+
resolved "https://registry.yarnpkg.com/@luma.gl/shadertools/-/shadertools-8.0.0-alpha.12.tgz#a53992428db379a37affc6cbdbb98e87b928fa2d"
1661+
integrity sha512-PUsuc5SmLyRQg1S2vTCv2/g2wjWQ4MRLn3iRbfC7BpX4AFNjdJglcEYlIAdCpQidcgI5l2asevGhc4KGoIAarQ==
16621662
dependencies:
16631663
"@babel/runtime" "^7.0.0"
16641664
math.gl "^3.0.0"
@@ -1670,14 +1670,14 @@
16701670
dependencies:
16711671
probe.gl "^3.1.1"
16721672

1673-
"@luma.gl/[email protected].10":
1674-
version "8.0.0-alpha.10"
1675-
resolved "https://registry.yarnpkg.com/@luma.gl/webgl/-/webgl-8.0.0-alpha.10.tgz#d695be31a290ddece057608e7388d1848dcf5bc7"
1676-
integrity sha512-l7s9rCNnPSUnXb/4o5vKV1jO4AG/zUeK8biXaZ7jkDtFREPk6r1hV7hQSGDt/mKmfwZe8mQPOQeS0wPrR9qV1g==
1673+
"@luma.gl/[email protected].12":
1674+
version "8.0.0-alpha.12"
1675+
resolved "https://registry.yarnpkg.com/@luma.gl/webgl/-/webgl-8.0.0-alpha.12.tgz#76b5043b833b79f54aea22f122d9af879b5ab083"
1676+
integrity sha512-8cViGdd62988LB+6No0u1vZYEsLzlBMrVqhhaDy8m0HkPPjkPVhzuAH4oz50CjJ9qnT7a8HtnL8keuEwsruOig==
16771677
dependencies:
16781678
"@babel/runtime" "^7.0.0"
1679-
"@luma.gl/constants" "8.0.0-alpha.10"
1680-
"@luma.gl/gltools" "8.0.0-alpha.10"
1679+
"@luma.gl/constants" "8.0.0-alpha.12"
1680+
"@luma.gl/gltools" "8.0.0-alpha.12"
16811681
probe.gl "^3.1.1"
16821682

16831683
"@mapbox/[email protected]":

0 commit comments

Comments
 (0)