feat: Remove webgl-legacy (#8043)

Co-authored-by: Xiaoji Chen <cxiaoji@gmail.com>

Author: ibgreen

.ocularrc.js

@@ -5,13 +5,10 @@ const nodeModules = join(packageRoot, 'node_modules');
 const lumaModules = join(packageRoot, '../luma.gl/modules');
 
 const LUMA_ALIASES_LOCAL = {
-  'luma.gl': `${lumaModules}/main/src`,
   '@luma.gl/constants': `${lumaModules}/constants/src`,
   '@luma.gl/core': `${lumaModules}/core/src`,
-  '@luma.gl/debug': `${lumaModules}/debug/src`,
   '@luma.gl/engine': `${lumaModules}/engine/src`,
   '@luma.gl/webgl': `${lumaModules}/webgl/src`,
-  '@luma.gl/gltools': `${lumaModules}/gltools/src`,
   '@luma.gl/shadertools': `${lumaModules}/shadertools/src`,
   '@luma.gl/test-utils': `${lumaModules}/test-utils/src`,
   '@luma.gl/experimental': `${lumaModules}/experimental/src`

CHANGELOG.md

@@ -3016,13 +3016,13 @@ For Earlier Beta Releases see below
 
 ### deck.gl v4.2 Beta Releases
 
-#### [4.2.0-alpha.31] - Dec 14
+#### [4.2.0-alpha.32] - Dec 14
 - API Audit: remove initWebGLParameters and move pure-js example  (#1235)
 - Fix for invalid triggerName in attribute-manager.invalidate(triggerName) function (#1238)
 - Add polygonLayer geojsonLayer elevationScale prop to whats-new.md (#1237)
 - OrbitController pure-js support (#1234)
 
-#### [4.2.0-alpha.30] - Dec 12
+#### [4.2.0-alpha.32] - Dec 12
 - DOCS: updates to clarify what is experimental in 4.2, in "What's New" and "API Reference".
 - DOCS: New Roadmap doc, linking to RFCs.
 - DOCS: List experimental 4.2 features in Roadmap doc.

docs/developer-guide/custom-layers/primitive-layers.md

@@ -69,7 +69,7 @@ export default class MyLayer extends Layer {
       id: this.props.id,
       geometry: new Geometry({
         id: this.props.id,
-        drawMode: gl.LINES
+        topology: 'line-list',
       }),
       vertexCount: 0,
       isIndexed: true

examples/experimental/bezier/src/bezier-curve-layer/bezier-curve-layer.js

@@ -112,7 +112,7 @@ export default class BezierCurveLayer extends Layer {
       Object.assign({}, this.getShaders(), {
         id: this.props.id,
         geometry: new Geometry({
-          drawMode: GL.TRIANGLE_STRIP,
+          topology: 'triangle-strip',
           attributes: {
             positions: new Float32Array(positions)
           }

examples/layer-browser/package.json

@@ -9,7 +9,6 @@
   "dependencies": {
     "@loaders.gl/ply": "^3.4.13",
     "@loaders.gl/gltf": "^3.4.13",
-    "@luma.gl/experimental": "^8.5.2",
     "@luma.gl/debug": "^8.5.2",
     "colorbrewer": "^1.0.0",
     "d3-request": "^1.0.6",

examples/layer-browser/src/app.jsx

@@ -165,14 +165,14 @@ export default class App extends PureComponent {
     let index = 1;
     const layers = [
       // the ground - for shadows to drop on
-      new SolidPolygonLayer({
-        id: 'ground',
-        data: LAND_COVER,
-        getPolygon: f => f,
-        extruded: false,
-        filled: true,
-        getFillColor: [0, 0, 0, 0]
-      })
+      // new SolidPolygonLayer({
+      //   id: 'ground',
+      //   data: LAND_COVER,
+      //   getPolygon: f => f,
+      //   extruded: false,
+      //   filled: true,
+      //   getFillColor: [0, 0, 0, 0]
+      // })
     ];
     const {activeExamples} = this.state;
 
@@ -185,7 +185,7 @@ export default class App extends PureComponent {
           const layer = this._renderExampleLayer(example, settings, index++);
 
           if (typeof settings !== 'object') {
-            activeExamples[exampleName] = LayerControls.getSettings(layer.props);
+            activeExamples[exampleName] = LayerControls.getSettings(layer.props, example.props);
           }
 
           layers.push(layer);

examples/layer-browser/src/components/layer-controls.jsx

@@ -36,7 +36,7 @@ function isAccessor(settingName) {
 }
 
 export default class LayerControls extends PureComponent {
-  static getSettings(props) {
+  static getSettings(props, defaults) {
     const keys = [];
     for (const key in props) {
       if (!PROP_BLACK_LIST.has(key)) {
@@ -47,7 +47,7 @@ export default class LayerControls extends PureComponent {
 
     const settings = {};
     for (const key of keys) {
-      settings[key] = props[key];
+      settings[key] = key in defaults ? defaults[key] : props[key];
     }
     return settings;
   }

examples/layer-browser/src/examples/index.js

@@ -1,15 +1,15 @@
 import coreLayerExamples from './core-layers';
-import meshLayerExamples from './mesh-layers';
+// import meshLayerExamples from './mesh-layers';
 import aggregationLayerExamples from './aggregation-layers';
 import additionalLayerExamples from './additional-layers';
-import infovisLayerExamples from './infovis-layers';
+// import infovisLayerExamples from './infovis-layers';
 import perfLayerExamples from './perf-layers';
 
 export default {
   ...coreLayerExamples,
-  ...meshLayerExamples,
+  // ...meshLayerExamples,
   ...aggregationLayerExamples,
   ...additionalLayerExamples,
-  ...infovisLayerExamples,
+  // ...infovisLayerExamples,
   ...perfLayerExamples
 };

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

@@ -2,7 +2,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/experimental';
-import GL from '@luma.gl/constants';
+import {GL} from '@luma.gl/constants';
 
 import * as dataSamples from '../data-samples';
 

examples/playground/json-examples/index.js

@@ -14,6 +14,7 @@ import usMap from './us-map.json';
 import dotText from './dot-text.json';
 
 export default {
+  'website/Scatterplot (ScatterplotLayer)': scatterplot,
   // WEBSITE EXAMPLES AS JSON PAYLOADS
   'website/3D Heatmap (HexagonLayer)': heatmap,
   'website/3D Heatmap (wth Minimap)': heatmapMinimap,