Merge branch 'master' into x/arcgis-ts

visgl · Mar 11, 2024 · 09d505c · 09d505c
2 parents 96c015a + 8867a10
commit 09d505c
Show file tree

Hide file tree

Showing 20 changed files with 53 additions and 41 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,19 @@ Ref: http://keepachangelog.com/en/0.3.0/
 
 ### deck.gl v9.0 Prereleases
 
+#### deck.gl [9.0.0-beta.8] - Mar 11 2024
+
+- TerrainExtension: bind texture rather than FBO (#8611)
+- Remove dev dependency on react-map-gl v5 (#8618)
+- chore: Bump luma to beta.10 (#8610)
+- fix(arcgis): DeckGL rendering integration (#8545)
+- chore: bump probe.gl (#8617)
+- prevent js files in venv from being identified as part of deckgl module (#8609)
+- chore(deps): Update to loaders.gl v4.2.0-alpha.5 (#8604)
+- fix(core) warn and error when WebGL1 detected (#8548)
+- ignore bindings directory when running linter (#8598)
+- Correct operator precedence for clearColor in LayersPass (#8599)
+
 #### deck.gl [9.0.0-beta.7] - Mar 7 2024
 
 - chore: bump luma 9.0.0 beta.8 (#8586)

diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
   "lerna": "2.0.0",
-  "version": "9.0.0-beta.7",
+  "version": "9.0.0-beta.8",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": [

diff --git a/modules/aggregation-layers/package.json b/modules/aggregation-layers/package.json
@@ -3,7 +3,7 @@
   "description": "deck.gl layers that aggregate the input data into alternative representations",
   "license": "MIT",
   "type": "module",
-  "version": "9.0.0-beta.7",
+  "version": "9.0.0-beta.8",
   "publishConfig": {
     "access": "public"
   },

diff --git a/modules/arcgis/package.json b/modules/arcgis/package.json
@@ -3,7 +3,7 @@
   "description": "Use deck.gl as a custom ArcGIS API for JavaScript layer",
   "license": "MIT",
   "type": "module",
-  "version": "9.0.0-beta.7",
+  "version": "9.0.0-beta.8",
   "publishConfig": {
     "access": "public"
   },

diff --git a/modules/carto/package.json b/modules/carto/package.json
@@ -3,7 +3,7 @@
   "description": "CARTO official integration with Deck.gl. Build geospatial applications using CARTO and Deck.gl.",
   "license": "MIT",
   "type": "module",
-  "version": "9.0.0-beta.7",
+  "version": "9.0.0-beta.8",
   "publishConfig": {
     "access": "public"
   },

diff --git a/modules/core/package.json b/modules/core/package.json
@@ -3,7 +3,7 @@
   "description": "deck.gl core library",
   "license": "MIT",
   "type": "module",
-  "version": "9.0.0-beta.7",
+  "version": "9.0.0-beta.8",
   "publishConfig": {
     "access": "public"
   },

diff --git a/modules/extensions/package.json b/modules/extensions/package.json
@@ -3,7 +3,7 @@
   "description": "Plug-and-play functionalities for deck.gl layers",
   "license": "MIT",
   "type": "module",
-  "version": "9.0.0-beta.7",
+  "version": "9.0.0-beta.8",
   "publishConfig": {
     "access": "public"
   },

diff --git a/modules/extensions/src/terrain/shader-module.ts b/modules/extensions/src/terrain/shader-module.ts
@@ -119,7 +119,7 @@ if ((terrain_mode == TERRAIN_MODE_USE_COVER) || (terrain_mode == TERRAIN_MODE_US
 
       let mode: number = terrainSkipRender ? TERRAIN_MODE.SKIP : TERRAIN_MODE.NONE;
       // height map if case USE_HEIGHT_MAP, terrain cover if USE_COVER, otherwise empty
-      let sampler = dummyHeightMap as Texture;
+      let sampler: Texture | undefined = dummyHeightMap as Texture;
       // height map bounds if case USE_HEIGHT_MAP, terrain cover bounds if USE_COVER, otherwise null
       let bounds: number[] | null = null;
       if (drawToTerrainHeightMap) {
@@ -132,10 +132,10 @@ if ((terrain_mode == TERRAIN_MODE_USE_COVER) || (terrain_mode == TERRAIN_MODE_US
       } else if (terrainCover) {
         // This is a terrain layer
         const isPicking = opts.picking?.isActive;
-        // @ts-expect-error
-        sampler = isPicking
+        const fbo = isPicking
           ? terrainCover.getPickingFramebuffer()
           : terrainCover.getRenderFramebuffer();
+        sampler = fbo?.colorAttachments[0].texture;
         if (isPicking) {
           // Never render the layer itself in picking pass
           mode = TERRAIN_MODE.SKIP;

diff --git a/modules/extensions/src/terrain/terrain-effect.ts b/modules/extensions/src/terrain/terrain-effect.ts
@@ -93,12 +93,11 @@ export class TerrainEffect implements Effect {
     this._updateTerrainCovers(terrainLayers, drapeLayers, viewport, opts);
   }
 
-  getModuleParameters(layer: Layer): TerrainModuleSettings {
+  getModuleParameters(layer: Layer): Omit<TerrainModuleSettings, 'picking'> {
     const {terrainDrawMode} = layer.state;
 
     return {
-      // @ts-expect-error
-      heightMap: this.heightMap?.getRenderFramebuffer(),
+      heightMap: this.heightMap?.getRenderFramebuffer()?.colorAttachments[0].texture || null,
       heightMapBounds: this.heightMap?.bounds,
       dummyHeightMap: this.dummyHeightMap!,
       terrainCover: this.isDrapingEnabled ? this.terrainCovers.get(layer.id) : null,

diff --git a/modules/geo-layers/package.json b/modules/geo-layers/package.json
@@ -3,7 +3,7 @@
   "description": "deck.gl layers supporting geospatial use cases and GIS formats",
   "license": "MIT",
   "type": "module",
-  "version": "9.0.0-beta.7",
+  "version": "9.0.0-beta.8",
   "publishConfig": {
     "access": "public"
   },

diff --git a/modules/google-maps/package.json b/modules/google-maps/package.json
@@ -3,7 +3,7 @@
   "description": "Use deck.gl as a custom Google Maps overlay",
   "license": "MIT",
   "type": "module",
-  "version": "9.0.0-beta.7",
+  "version": "9.0.0-beta.8",
   "publishConfig": {
     "access": "public"
   },

diff --git a/modules/json/package.json b/modules/json/package.json
@@ -3,7 +3,7 @@
   "description": "JSON format rendering components for deck.gl",
   "license": "MIT",
   "type": "module",
-  "version": "9.0.0-beta.7",
+  "version": "9.0.0-beta.8",
   "publishConfig": {
     "access": "public"
   },

diff --git a/modules/jupyter-widget/package.json b/modules/jupyter-widget/package.json
@@ -2,7 +2,7 @@
   "name": "@deck.gl/jupyter-widget",
   "description": "Jupyter widget for rendering deck.gl in a Jupyter notebook",
   "license": "MIT",
-  "version": "9.0.0-beta.7",
+  "version": "9.0.0-beta.8",
   "keywords": [
     "jupyter",
     "jupyterlab",
@@ -29,12 +29,12 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@deck.gl/aggregation-layers": "9.0.0-beta.7",
-    "@deck.gl/geo-layers": "9.0.0-beta.7",
-    "@deck.gl/google-maps": "9.0.0-beta.7",
-    "@deck.gl/json": "9.0.0-beta.7",
-    "@deck.gl/layers": "9.0.0-beta.7",
-    "@deck.gl/mesh-layers": "9.0.0-beta.7",
+    "@deck.gl/aggregation-layers": "9.0.0-beta.8",
+    "@deck.gl/geo-layers": "9.0.0-beta.8",
+    "@deck.gl/google-maps": "9.0.0-beta.8",
+    "@deck.gl/json": "9.0.0-beta.8",
+    "@deck.gl/layers": "9.0.0-beta.8",
+    "@deck.gl/mesh-layers": "9.0.0-beta.8",
     "@jupyter-widgets/base": "^1.1.10 || ^2 || ^3 || ^4",
     "@loaders.gl/3d-tiles": "^4.2.0-alpha.5",
     "@loaders.gl/core": "^4.2.0-alpha.5",

diff --git a/modules/layers/package.json b/modules/layers/package.json
@@ -3,7 +3,7 @@
   "description": "deck.gl core layers",
   "license": "MIT",
   "type": "module",
-  "version": "9.0.0-beta.7",
+  "version": "9.0.0-beta.8",
   "publishConfig": {
     "access": "public"
   },

diff --git a/modules/main/package.json b/modules/main/package.json
@@ -3,7 +3,7 @@
   "description": "A suite of 3D-enabled data visualization overlays, suitable for react-map-gl",
   "license": "MIT",
   "type": "module",
-  "version": "9.0.0-beta.7",
+  "version": "9.0.0-beta.8",
   "keywords": [
     "webgl",
     "visualization",
@@ -36,18 +36,18 @@
     "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
   },
   "dependencies": {
-    "@deck.gl/aggregation-layers": "9.0.0-beta.7",
-    "@deck.gl/carto": "9.0.0-beta.7",
-    "@deck.gl/core": "9.0.0-beta.7",
-    "@deck.gl/extensions": "9.0.0-beta.7",
-    "@deck.gl/geo-layers": "9.0.0-beta.7",
-    "@deck.gl/google-maps": "9.0.0-beta.7",
-    "@deck.gl/json": "9.0.0-beta.7",
-    "@deck.gl/layers": "9.0.0-beta.7",
-    "@deck.gl/mapbox": "9.0.0-beta.7",
-    "@deck.gl/mesh-layers": "9.0.0-beta.7",
-    "@deck.gl/react": "9.0.0-beta.7",
-    "@deck.gl/widgets": "9.0.0-beta.7"
+    "@deck.gl/aggregation-layers": "9.0.0-beta.8",
+    "@deck.gl/carto": "9.0.0-beta.8",
+    "@deck.gl/core": "9.0.0-beta.8",
+    "@deck.gl/extensions": "9.0.0-beta.8",
+    "@deck.gl/geo-layers": "9.0.0-beta.8",
+    "@deck.gl/google-maps": "9.0.0-beta.8",
+    "@deck.gl/json": "9.0.0-beta.8",
+    "@deck.gl/layers": "9.0.0-beta.8",
+    "@deck.gl/mapbox": "9.0.0-beta.8",
+    "@deck.gl/mesh-layers": "9.0.0-beta.8",
+    "@deck.gl/react": "9.0.0-beta.8",
+    "@deck.gl/widgets": "9.0.0-beta.8"
   },
   "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
 }
diff --git a/modules/mapbox/package.json b/modules/mapbox/package.json
@@ -3,7 +3,7 @@
   "description": "Use deck.gl layers as custom mapbox-gl-js layers",
   "license": "MIT",
   "type": "module",
-  "version": "9.0.0-beta.7",
+  "version": "9.0.0-beta.8",
   "publishConfig": {
     "access": "public"
   },

diff --git a/modules/mesh-layers/package.json b/modules/mesh-layers/package.json
@@ -3,7 +3,7 @@
   "description": "deck.gl layers that loads 3D meshes or scene graphs",
   "license": "MIT",
   "type": "module",
-  "version": "9.0.0-beta.7",
+  "version": "9.0.0-beta.8",
   "publishConfig": {
     "access": "public"
   },

diff --git a/modules/react/package.json b/modules/react/package.json
@@ -3,7 +3,7 @@
   "description": "React Components for deck.gl",
   "license": "MIT",
   "type": "module",
-  "version": "9.0.0-beta.7",
+  "version": "9.0.0-beta.8",
   "publishConfig": {
     "access": "public"
   },

diff --git a/modules/test-utils/package.json b/modules/test-utils/package.json
@@ -3,7 +3,7 @@
   "description": "Test utilities for deck.gl layers",
   "license": "MIT",
   "type": "module",
-  "version": "9.0.0-beta.7",
+  "version": "9.0.0-beta.8",
   "publishConfig": {
     "access": "public"
   },

diff --git a/modules/widgets/package.json b/modules/widgets/package.json
@@ -3,7 +3,7 @@
   "description": "UI widgets for deck.gl",
   "license": "MIT",
   "type": "module",
-  "version": "9.0.0-beta.7",
+  "version": "9.0.0-beta.8",
   "publishConfig": {
     "access": "public"
   },