More luma updates (#3942)

docs/layers/scenegraph-layer.md

@@ -11,7 +11,7 @@ The `ScenegraphLayer` renders a number of instances of a complete luma.gl sceneg
 import DeckGL from '@deck.gl/react';
 import {ScenegraphLayer} from '@deck.gl/mesh-layers';
 import {registerLoaders} from '@loaders.gl/core';
-import {GLTFScenegraphLoader} from '@luma.gl/addons';
+import {GLTFScenegraphLoader} from '@luma.gl/experimental';
 
 // Register the proper loader for scenegraph.gltf
 registerLoaders([GLTFScenegraphLoader]);

examples/layer-browser/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@loaders.gl/ply": "^1.3.3",
     "@loaders.gl/gltf": "^1.3.3",
-    "@luma.gl/addons": "^8.0.0-alpha.10",
-    "@luma.gl/debug": "^8.0.0-alpha.10",
+    "@luma.gl/experimental": "^8.0.0-alpha.12",
+    "@luma.gl/debug": "^8.0.0-alpha.12",
     "colorbrewer": "^1.0.0",
     "d3-request": "^1.0.6",
     "d3-scale": "^3.1.0",

examples/layer-browser/src/examples/mesh-layers.js

@@ -1,7 +1,7 @@
 import {SimpleMeshLayer, ScenegraphLayer} from '@deck.gl/mesh-layers';
 import {registerLoaders} from '@loaders.gl/core';
 import {GLTFLoader} from '@loaders.gl/gltf';
-import {GLTFEnvironment} from '@luma.gl/addons';
+import {GLTFEnvironment} from '@luma.gl/experimental';
 import GL from '@luma.gl/constants';
 
 import * as dataSamples from '../data-samples';

examples/webpack.config.local.js

@@ -25,7 +25,7 @@ function makeLocalDevConfig(EXAMPLE_DIR = LIB_DIR, linkToLuma) {
     '@luma.gl/webgl': `${ROOT_DIR}/../luma.gl/modules/webgl/src`,
     '@luma.gl/gltools': `${ROOT_DIR}/../luma.gl/modules/gltools/src`,
     '@luma.gl/shadertools': `${ROOT_DIR}/../luma.gl/modules/shadertools/src`,
-    '@luma.gl/addons': `${ROOT_DIR}/../luma.gl/modules/addons/src`
+    '@luma.gl/experimental': `${ROOT_DIR}/../luma.gl/modules/experimental/src`
   };
   const LUMA_LOCAL_ALIASES = {
     '@luma.gl/constants': `${ROOT_DIR}/node_modules/@luma.gl/constants`,
@@ -34,8 +34,8 @@ function makeLocalDevConfig(EXAMPLE_DIR = LIB_DIR, linkToLuma) {
     '@luma.gl/webgl': `${ROOT_DIR}/node_modules/@luma.gl/webgl`,
     '@luma.gl/gltools': `${ROOT_DIR}/node_modules/@luma.gl/gltools`,
     '@luma.gl/shadertools': `${ROOT_DIR}/node_modules/@luma.gl/shadertools`,
-    '@luma.gl/addons': `${ROOT_DIR}/node_modules/@luma.gl/addons`,
-    // @luma.gl/addons is not available in the root node_modules, must be imported
+    '@luma.gl/experimental': `${ROOT_DIR}/node_modules/@luma.gl/experimental`,
+    // @luma.gl/experimental is not available in the root node_modules, must be imported
     // where required.
     '@loaders.gl/core': `${ROOT_DIR}/node_modules/@loaders.gl/core`
   };

examples/website/scenegraph-layer/app.js

@@ -6,7 +6,7 @@ import {StaticMap} from 'react-map-gl';
 import DeckGL from '@deck.gl/react';
 import {ScenegraphLayer} from '@deck.gl/mesh-layers';
 
-import {GLTFScenegraphLoader} from '@luma.gl/addons';
+import {GLTFScenegraphLoader} from '@luma.gl/experimental';
 import {registerLoaders} from '@loaders.gl/core';
 
 registerLoaders([GLTFScenegraphLoader]);

examples/website/scenegraph-layer/package.json

@@ -9,7 +9,7 @@
   "dependencies": {
     "@deck.gl/mesh-layers": "^7.3.0-beta",
     "@deck.gl/react": "^7.3.0-beta",
-    "@luma.gl/addons": "^8.0.0-alpha.10",
+    "@luma.gl/experimental": "^8.0.0-alpha.12",
     "react": "^16.3.0",
     "react-dom": "^16.3.0",
     "react-map-gl": "^5.0.0"

modules/core/package.json

@@ -32,7 +32,7 @@
   "dependencies": {
     "@loaders.gl/core": "^1.3.4",
     "@loaders.gl/images": "^1.3.4",
-    "@luma.gl/core": "^8.0.0-alpha.10",
+    "@luma.gl/core": "^8.0.0-alpha.12",
     "@math.gl/web-mercator": "^3.1.0-alpha",
     "gl-matrix": "^3.0.0",
     "math.gl": "^3.0.0",

modules/core/src/lib/deck.js

@@ -33,7 +33,7 @@ import GL from '@luma.gl/constants';
 import {
   AnimationLoop,
   createGLContext,
-  trackContextState,
+  instrumentGLContext,
   setParameters,
   Timeline,
   lumaStats
@@ -572,7 +572,7 @@ export default class Deck {
     // if external context...
     if (!this.canvas) {
       this.canvas = gl.canvas;
-      trackContextState(gl, {enable: true, copyState: true});
+      instrumentGLContext(gl, {enable: true, copyState: true});
     }
 
     this.tooltip = new Tooltip(this.canvas);

modules/mesh-layers/package.json

@@ -33,6 +33,6 @@
     "@deck.gl/core": "^7.3.0-beta"
   },
   "dependencies": {
-    "@luma.gl/addons": "^8.0.0-alpha.10"
+    "@luma.gl/experimental": "^8.0.0-alpha.12"
   }
 }

modules/mesh-layers/src/scenegraph-layer/scenegraph-layer.js

@@ -20,7 +20,7 @@
 
 import {Layer, project32, picking} from '@deck.gl/core';
 import {isWebGL2, pbr, log} from '@luma.gl/core';
-import {ScenegraphNode, createGLTFObjects} from '@luma.gl/addons';
+import {ScenegraphNode, createGLTFObjects} from '@luma.gl/experimental';
 import GL from '@luma.gl/constants';
 import {waitForGLTFAssets} from './gltf-utils';
 
@@ -112,7 +112,7 @@ export default class ScenegraphLayer extends Layer {
       // Signature 1: props.scenegraph is a proper luma.gl Scenegraph
       scenegraphData = {scenes: [props.scenegraph]};
     } else if (props.scenegraph && !props.scenegraph.gltf) {
-      // Converts loaders.gl gltf to luma.gl scenegraph using the undocumented @luma.gl/addons function
+      // Converts loaders.gl gltf to luma.gl scenegraph using the undocumented @luma.gl/experimental function
       const gltf = props.scenegraph;
       const gltfObjects = createGLTFObjects(gl, gltf, this.getLoadOptions());
       scenegraphData = Object.assign({gltf}, gltfObjects);

modules/test-utils/package.json

@@ -25,6 +25,7 @@
   ],
   "peerDependencies": {
     "@deck.gl/core": "^7.3.0-beta",
+    "@luma.gl/webgl": "^8.0.0-alpha.12",
     "@luma.gl/test-utils": "^8.0.0-alpha.10",
     "@probe.gl/test-utils": "^3.1.0"
   },

modules/test-utils/src/lifecycle-test.js

@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 import {LayerManager, MapView, DeckRenderer} from '@deck.gl/core';
-import {VertexArrayObject} from '@luma.gl/core';
+import {VertexArrayObject} from '@luma.gl/webgl';
 
 import {makeSpy} from '@probe.gl/test-utils';
 import gl from './utils/setup-gl';

ocular-dev-tools.config.js

@@ -9,7 +9,8 @@ const LUMA_ALIASES_LOCAL = {
   '@luma.gl/webgl': `${__dirname}/../luma.gl/modules/webgl/src`,
   '@luma.gl/gltools': `${__dirname}/../luma.gl/modules/gltools/src`,
   '@luma.gl/shadertools': `${__dirname}/../luma.gl/modules/shadertools/src`,
-  '@luma.gl/test-utils': `${__dirname}/../luma.gl/modules/test-utils/src`
+  '@luma.gl/test-utils': `${__dirname}/../luma.gl/modules/test-utils/src`,
+  '@luma.gl/experimental': `${__dirname}/../luma.gl/modules/experimental/src`
 };
 
 const useLocalLuma = false;

package.json

@@ -41,7 +41,7 @@
     "jsdom": false
   },
   "devDependencies": {
-    "@luma.gl/engine": "^8.0.0-alpha.10",
+    "@luma.gl/engine": "^8.0.0-alpha.12",
     "@luma.gl/test-utils": "^8.0.0-alpha.10",
     "@probe.gl/bench": "^3.1.1",
     "@probe.gl/test-utils": "^3.1.1",

test/apps/glsl-debugger/package.json

@@ -4,7 +4,7 @@
     "start-local": "webpack-dev-server --env.local --progress --hot --port 3000 --open"
   },
   "dependencies": {
-    "@luma.gl/debug": "^8.0.0-alpha.10",
+    "@luma.gl/debug": "^8.0.0-alpha.12",
     "deck.gl": "^7.3.0-beta",
     "glsl-transpiler": "^1.8.5"
   },

test/modules/layers/scenegraph-layer.spec.js

@@ -24,7 +24,7 @@ import {testLayer, generateLayerTests} from '@deck.gl/test-utils';
 import {project32} from '@deck.gl/core';
 import {ScenegraphLayer} from '@deck.gl/mesh-layers';
 import {CubeGeometry} from '@luma.gl/core';
-import {GroupNode, ModelNode} from '@luma.gl/addons';
+import {GroupNode, ModelNode} from '@luma.gl/experimental';
 
 import * as FIXTURES from 'deck.gl-test/data';
 

website-gatsby/package.json

@@ -16,10 +16,10 @@
   },
   "dependencies": {
     "@loaders.gl/las": "^1.0.3",
-    "@luma.gl/addons": "^8.0.0-alpha.10",
-    "@luma.gl/constants": "^8.0.0-alpha.10",
-    "@luma.gl/core": "^8.0.0-alpha.10",
-    "@luma.gl/webgl": "^8.0.0-alpha.10",
+    "@luma.gl/addons": "^8.0.0-alpha.12",
+    "@luma.gl/constants": "^8.0.0-alpha.12",
+    "@luma.gl/core": "^8.0.0-alpha.12",
+    "@luma.gl/webgl": "^8.0.0-alpha.12",
     "@probe.gl/stats-widget": "^3.0.1",
     "d3-color": "^1.4.0",
     "d3-request": "^1.0.6",

yarn.lock

@@ -1598,67 +1598,67 @@
     stream-to-async-iterator "^0.2.0"
     through "^2.3.8"
 
-"@luma.gl/addons@^8.0.0-alpha.10":
-  version "8.0.0-alpha.10"
-  resolved "https://registry.yarnpkg.com/@luma.gl/addons/-/addons-8.0.0-alpha.10.tgz#145f4a206625792b454a5d1dd9b8381a4e045af3"
-  integrity sha512-xR1omVvzdmptzNxyAspQzPrk9MAlPdFuyLQsZmifcF0umfkZT31rCSf9ZXY4irAKOoMpMSqqnGnQ2CEnl5Xxrg==
-  dependencies:
-    "@loaders.gl/gltf" "^1.3.0"
-    "@loaders.gl/images" "^1.3.0"
-    "@luma.gl/constants" "8.0.0-alpha.10"
-    math.gl "^3.0.0"
-
-"@luma.gl/constants@8.0.0-alpha.10":
-  version "8.0.0-alpha.10"
-  resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-8.0.0-alpha.10.tgz#45fe8971da0af821893dbf3a88ba55494407b913"
-  integrity sha512-bDOGc/6R4vpi/okmBhYetJMC80LJ/FeAsbKqrXs3/OqTG2dPQSfYsQ84QeiWwxhmETPNvKAAXuStBp9MaMqETw==
+"@luma.gl/constants@8.0.0-alpha.12":
+  version "8.0.0-alpha.12"
+  resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-8.0.0-alpha.12.tgz#b07a8f918b2db8d7e73a2395ac3b55c30e924a3b"
+  integrity sha512-sR5gIPwWcztPcRHgFOOOn4hKbLPrLYyY8hLLn6451lWIkJIT5jgOwp362UAXDdVyD2+1fE3awlnSTxliRNjoJA==
 
 "@luma.gl/constants@^7.3.0-alpha.1":
   version "7.3.0-alpha.8"
   resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-7.3.0-alpha.8.tgz#900dd18a157e9c9a0886aba6f79fae80006c2bc4"
   integrity sha512-MjEBfWCqYrYREMHh+XQneJlYDK+Z5Uh7cvodUhugaWRKoVbQI884ISAt4+6tWJj5DXQC/k8V1ypa+Hd3hY+oBw==
 
-"@luma.gl/core@^8.0.0-alpha.10":
-  version "8.0.0-alpha.10"
-  resolved "https://registry.yarnpkg.com/@luma.gl/core/-/core-8.0.0-alpha.10.tgz#7f245233b37978be5a3fc1c6ddfb23fa5ed0990f"
-  integrity sha512-D97tE9UX4s1MFVNNxlJUjJpIWkw0t/MV7tTFLpLYFDNKLud03o+rFV30E/rA1Zy8hU+978ZkACSz3l0k4Lh0Kg==
+"@luma.gl/core@^8.0.0-alpha.12":
+  version "8.0.0-alpha.12"
+  resolved "https://registry.yarnpkg.com/@luma.gl/core/-/core-8.0.0-alpha.12.tgz#2e95e10cd7b90bb3dd20835273af7155e3ab4118"
+  integrity sha512-Erp0etGNsaC/IM3XSN7Y/33jpJT0N6MeYlwyy8x+C/b/AVcAkxYIaWcyOZtZj1pNtV/iTFzmz1Une0GlUTz9Wg==
   dependencies:
     "@babel/runtime" "^7.0.0"
-    "@luma.gl/constants" "8.0.0-alpha.10"
-    "@luma.gl/engine" "8.0.0-alpha.10"
-    "@luma.gl/shadertools" "8.0.0-alpha.10"
-    "@luma.gl/webgl" "8.0.0-alpha.10"
+    "@luma.gl/constants" "8.0.0-alpha.12"
+    "@luma.gl/engine" "8.0.0-alpha.12"
+    "@luma.gl/shadertools" "8.0.0-alpha.12"
+    "@luma.gl/webgl" "8.0.0-alpha.12"
     math.gl "^3.0.0"
     probe.gl "^3.1.1"
     seer "^0.2.4"
 
-"@luma.gl/engine@8.0.0-alpha.10", "@luma.gl/engine@^8.0.0-alpha.10":
-  version "8.0.0-alpha.10"
-  resolved "https://registry.yarnpkg.com/@luma.gl/engine/-/engine-8.0.0-alpha.10.tgz#aab928bf3c206ebc5fb95d8b130dcdf2ed71c863"
-  integrity sha512-GNEL8RoQirJGgG3Gx0DaSq0xnDnZlAEtdrBn7dIkiiaoqqMlTbuXR1MGVIdfwzGUX5ezrLN53FzvzekBruXYug==
+"@luma.gl/engine@8.0.0-alpha.12", "@luma.gl/engine@^8.0.0-alpha.12":
+  version "8.0.0-alpha.12"
+  resolved "https://registry.yarnpkg.com/@luma.gl/engine/-/engine-8.0.0-alpha.12.tgz#30496156003120c314d0e17ae7da370bc16fb632"
+  integrity sha512-wspsyscWTPZSaC06xqsYXV1xtrmmUsUnBETViJ8PKv+TtEll+5QUKzj99CWhfDRof9MYdUIOTFv293dHJYgZuw==
   dependencies:
     "@babel/runtime" "^7.0.0"
-    "@luma.gl/constants" "8.0.0-alpha.10"
-    "@luma.gl/gltools" "8.0.0-alpha.10"
-    "@luma.gl/shadertools" "8.0.0-alpha.10"
-    "@luma.gl/webgl" "8.0.0-alpha.10"
+    "@luma.gl/constants" "8.0.0-alpha.12"
+    "@luma.gl/gltools" "8.0.0-alpha.12"
+    "@luma.gl/shadertools" "8.0.0-alpha.12"
+    "@luma.gl/webgl" "8.0.0-alpha.12"
     math.gl "^3.0.0"
     probe.gl "^3.1.1"
     seer "^0.2.4"
 
-"@luma.gl/gltools@8.0.0-alpha.10":
-  version "8.0.0-alpha.10"
-  resolved "https://registry.yarnpkg.com/@luma.gl/gltools/-/gltools-8.0.0-alpha.10.tgz#76a98d9956efadb035ea54be7c08ea4c16b38fdd"
-  integrity sha512-yBhfndA0MoZzgUp9PantQoyAsrOJfiRGCafzVLVk10sMLLQ6G6dPzBDX9QiLHckZ7LWMce9DCRjQoHLKAS8YXQ==
+"@luma.gl/experimental@^8.0.0-alpha.12":
+  version "8.0.0-alpha.12"
+  resolved "https://registry.yarnpkg.com/@luma.gl/experimental/-/experimental-8.0.0-alpha.12.tgz#f93608355545418af1ec46cae2358f613fe9acac"
+  integrity sha512-VbPCOtrCwAwQQyqcM5P1mnvp4E9n5vYh/t20sdcnBRQ0fPlFENJCTee+5utYzFQrpgBsX/Z+DkmUqEmMQbutzg==
+  dependencies:
+    "@loaders.gl/gltf" "^1.3.0"
+    "@loaders.gl/images" "^1.3.0"
+    "@luma.gl/constants" "8.0.0-alpha.12"
+    math.gl "^3.0.0"
+
+"@luma.gl/gltools@8.0.0-alpha.12":
+  version "8.0.0-alpha.12"
+  resolved "https://registry.yarnpkg.com/@luma.gl/gltools/-/gltools-8.0.0-alpha.12.tgz#e66718d66a3683364ab745281b2a19e759ba728e"
+  integrity sha512-hrvWfaG6v6dqx1Sp1K7jG5VvpWX0sTpt6UvWOdv37g0atuxi1CefVCWN+ZdLtPGeG90K6bEjBOurB4xc6b3jPA==
   dependencies:
     "@babel/runtime" "^7.0.0"
-    "@luma.gl/constants" "8.0.0-alpha.10"
+    "@luma.gl/constants" "8.0.0-alpha.12"
     probe.gl "^3.1.1"
 
-"@luma.gl/shadertools@8.0.0-alpha.10":
-  version "8.0.0-alpha.10"
-  resolved "https://registry.yarnpkg.com/@luma.gl/shadertools/-/shadertools-8.0.0-alpha.10.tgz#0078e1801100a9e0e260134930ec6baa1b6ea3a0"
-  integrity sha512-WD+XxfCeqAtHkO7/+iQyN57Ttzh3yBrMO19nGknS7oZjUj/uxZhiamiS2DF8dDj4CQfxd2ogFIIYjlji6gjJKA==
+"@luma.gl/shadertools@8.0.0-alpha.12":
+  version "8.0.0-alpha.12"
+  resolved "https://registry.yarnpkg.com/@luma.gl/shadertools/-/shadertools-8.0.0-alpha.12.tgz#a53992428db379a37affc6cbdbb98e87b928fa2d"
+  integrity sha512-PUsuc5SmLyRQg1S2vTCv2/g2wjWQ4MRLn3iRbfC7BpX4AFNjdJglcEYlIAdCpQidcgI5l2asevGhc4KGoIAarQ==
   dependencies:
     "@babel/runtime" "^7.0.0"
     math.gl "^3.0.0"
@@ -1670,14 +1670,14 @@
   dependencies:
     probe.gl "^3.1.1"
 
-"@luma.gl/webgl@8.0.0-alpha.10":
-  version "8.0.0-alpha.10"
-  resolved "https://registry.yarnpkg.com/@luma.gl/webgl/-/webgl-8.0.0-alpha.10.tgz#d695be31a290ddece057608e7388d1848dcf5bc7"
-  integrity sha512-l7s9rCNnPSUnXb/4o5vKV1jO4AG/zUeK8biXaZ7jkDtFREPk6r1hV7hQSGDt/mKmfwZe8mQPOQeS0wPrR9qV1g==
+"@luma.gl/webgl@8.0.0-alpha.12":
+  version "8.0.0-alpha.12"
+  resolved "https://registry.yarnpkg.com/@luma.gl/webgl/-/webgl-8.0.0-alpha.12.tgz#76b5043b833b79f54aea22f122d9af879b5ab083"
+  integrity sha512-8cViGdd62988LB+6No0u1vZYEsLzlBMrVqhhaDy8m0HkPPjkPVhzuAH4oz50CjJ9qnT7a8HtnL8keuEwsruOig==
   dependencies:
     "@babel/runtime" "^7.0.0"
-    "@luma.gl/constants" "8.0.0-alpha.10"
-    "@luma.gl/gltools" "8.0.0-alpha.10"
+    "@luma.gl/constants" "8.0.0-alpha.12"
+    "@luma.gl/gltools" "8.0.0-alpha.12"
     probe.gl "^3.1.1"
 
 "@mapbox/geojson-area@0.2.2":