@deck.gl/extensions 9.0.0-beta.6 → 9.0.0-beta.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "description": "Plug-and-play functionalities for deck.gl layers",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
- "version": "9.0.0-beta.6",
6
+ "version": "9.0.0-beta.8",
7
7
  "publishConfig": {
8
8
  "access": "public"
9
9
  },
@@ -38,18 +38,14 @@
38
38
  "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
39
39
  },
40
40
  "dependencies": {
41
- "@babel/runtime": "^7.0.0",
42
- "@luma.gl/shadertools": "9.0.0-beta.6"
41
+ "@luma.gl/constants": "9.0.0-beta.10",
42
+ "@luma.gl/shadertools": "9.0.0-beta.10",
43
+ "@math.gl/core": "^4.0.0"
43
44
  },
44
45
  "peerDependencies": {
45
- "@deck.gl/core": "^9.0.0-alpha",
46
- "@luma.gl/constants": "9.0.0-beta.6",
47
- "@luma.gl/core": "9.0.0-beta.6",
48
- "@luma.gl/engine": "9.0.0-beta.6",
49
- "@luma.gl/shadertools": "9.0.0-beta.6",
50
- "@luma.gl/webgl": "9.0.0-beta.6",
51
- "@math.gl/core": "^4.0.0",
52
- "@math.gl/web-mercator": "^4.0.0"
46
+ "@deck.gl/core": "^9.0.0-beta",
47
+ "@luma.gl/core": "9.0.0-beta.10",
48
+ "@luma.gl/engine": "9.0.0-beta.10"
53
49
  },
54
- "gitHead": "373729308eb3fdec4b7c8b5842ddeff4f2d70338"
50
+ "gitHead": "8867a1047c2693d44e4af9507c296cf7ab61f9e8"
55
51
  }
@@ -119,7 +119,7 @@ if ((terrain_mode == TERRAIN_MODE_USE_COVER) || (terrain_mode == TERRAIN_MODE_US
119
119
 
120
120
  let mode: number = terrainSkipRender ? TERRAIN_MODE.SKIP : TERRAIN_MODE.NONE;
121
121
  // height map if case USE_HEIGHT_MAP, terrain cover if USE_COVER, otherwise empty
122
- let sampler = dummyHeightMap as Texture;
122
+ let sampler: Texture | undefined = dummyHeightMap as Texture;
123
123
  // height map bounds if case USE_HEIGHT_MAP, terrain cover bounds if USE_COVER, otherwise null
124
124
  let bounds: number[] | null = null;
125
125
  if (drawToTerrainHeightMap) {
@@ -132,10 +132,10 @@ if ((terrain_mode == TERRAIN_MODE_USE_COVER) || (terrain_mode == TERRAIN_MODE_US
132
132
  } else if (terrainCover) {
133
133
  // This is a terrain layer
134
134
  const isPicking = opts.picking?.isActive;
135
- // @ts-expect-error
136
- sampler = isPicking
135
+ const fbo = isPicking
137
136
  ? terrainCover.getPickingFramebuffer()
138
137
  : terrainCover.getRenderFramebuffer();
138
+ sampler = fbo?.colorAttachments[0].texture;
139
139
  if (isPicking) {
140
140
  // Never render the layer itself in picking pass
141
141
  mode = TERRAIN_MODE.SKIP;
@@ -93,12 +93,11 @@ export class TerrainEffect implements Effect {
93
93
  this._updateTerrainCovers(terrainLayers, drapeLayers, viewport, opts);
94
94
  }
95
95
 
96
- getModuleParameters(layer: Layer): TerrainModuleSettings {
96
+ getModuleParameters(layer: Layer): Omit<TerrainModuleSettings, 'picking'> {
97
97
  const {terrainDrawMode} = layer.state;
98
98
 
99
99
  return {
100
- // @ts-expect-error
101
- heightMap: this.heightMap?.getRenderFramebuffer(),
100
+ heightMap: this.heightMap?.getRenderFramebuffer()?.colorAttachments[0].texture || null,
102
101
  heightMapBounds: this.heightMap?.bounds,
103
102
  dummyHeightMap: this.dummyHeightMap!,
104
103
  terrainCover: this.isDrapingEnabled ? this.terrainCovers.get(layer.id) : null,