@deck.gl/extensions 9.1.0-beta.1 → 9.1.0

package/src/data-filter/shader-module.ts

@@ -14,7 +14,7 @@ export type Defines = {
   /**
    * Primitive type of parameter used for category filtering. If undefined, category filtering disabled.
    */
-  DATACATEGORY_TYPE?: 'float' | 'vec2' | 'vec3' | 'vec4';
+  DATACATEGORY_TYPE?: 'uint' | 'uvec2' | 'uvec3' | 'uvec4';
   /**
    * Number of category filtering channels. Must match dimension of `DATACATEGORY_TYPE`
    */
@@ -48,7 +48,7 @@ uniform dataFilterUniforms {
 #endif
 #endif
 #ifdef DATACATEGORY_TYPE
-  highp ivec4 categoryBitMask;
+  highp uvec4 categoryBitMask;
 #endif
 } dataFilter;
 `;
@@ -107,26 +107,26 @@ float dataFilter_reduceValue(vec4 value) {
 #ifdef DATACATEGORY_TYPE
   void dataFilter_setCategoryValue(DATACATEGORY_TYPE category) {
     #if DATACATEGORY_CHANNELS == 1 // One 128-bit mask
-    int dataFilter_masks = dataFilter.categoryBitMask[int(category / 32.0)];
+    uint dataFilter_masks = dataFilter.categoryBitMask[category / 32u];
     #elif DATACATEGORY_CHANNELS == 2 // Two 64-bit masks
-    ivec2 dataFilter_masks = ivec2(
-      dataFilter.categoryBitMask[int(category.x / 32.0)],
-      dataFilter.categoryBitMask[int(category.y / 32.0) + 2]
+    uvec2 dataFilter_masks = uvec2(
+      dataFilter.categoryBitMask[category.x / 32u],
+      dataFilter.categoryBitMask[category.y / 32u + 2u]
     );
     #elif DATACATEGORY_CHANNELS == 3 // Three 32-bit masks
-    ivec3 dataFilter_masks = dataFilter.categoryBitMask.xyz;
+    uvec3 dataFilter_masks = dataFilter.categoryBitMask.xyz;
     #else // Four 32-bit masks
-    ivec4 dataFilter_masks = dataFilter.categoryBitMask;
+    uvec4 dataFilter_masks = dataFilter.categoryBitMask;
     #endif
 
     // Shift mask and extract relevant bits
-    DATACATEGORY_TYPE dataFilter_bits = DATACATEGORY_TYPE(dataFilter_masks) / pow(DATACATEGORY_TYPE(2.0), mod(category, 32.0));
-    dataFilter_bits = mod(floor(dataFilter_bits), 2.0);
+    DATACATEGORY_TYPE dataFilter_bits = DATACATEGORY_TYPE(dataFilter_masks) >> (category & 31u);
+    dataFilter_bits &= 1u;
 
     #if DATACATEGORY_CHANNELS == 1
-    if(dataFilter_bits == 0.0) dataFilter_value = 0.0;
+    if(dataFilter_bits == 0u) dataFilter_value = 0.0;
     #else
-    if(any(equal(dataFilter_bits, DATACATEGORY_TYPE(0.0)))) dataFilter_value = 0.0;
+    if(any(equal(dataFilter_bits, DATACATEGORY_TYPE(0u)))) dataFilter_value = 0.0;
     #endif
   }
 #endif
@@ -162,7 +162,7 @@ function getUniforms(opts?: DataFilterModuleProps | {}): Record<string, any> {
     filterEnabled = true,
     filterTransformSize = true,
     filterTransformColor = true,
-    categoryBitMask = [0, 0, 0, 0]
+    categoryBitMask
   } = opts;
   const filterSoftRange = opts.filterSoftRange || filterRange;
 
@@ -184,7 +184,7 @@ function getUniforms(opts?: DataFilterModuleProps | {}): Record<string, any> {
     useSoftMargin: Boolean(opts.filterSoftRange),
     transformSize: filterEnabled && filterTransformSize,
     transformColor: filterEnabled && filterTransformColor,
-    categoryBitMask
+    ...(categoryBitMask && {categoryBitMask})
   };
 }
 

package/src/mask/mask-pass.ts

@@ -2,7 +2,13 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {Device, Framebuffer, RenderPipelineParameters, Texture} from '@luma.gl/core';
+import type {
+  Device,
+  Framebuffer,
+  Parameters,
+  RenderPipelineParameters,
+  Texture
+} from '@luma.gl/core';
 import {Layer, _LayersPass as LayersPass, LayersPassRenderOptions, Viewport} from '@deck.gl/core';
 
 type MaskPassRenderOptions = LayersPassRenderOptions & {
@@ -54,11 +60,15 @@ export default class MaskPass extends LayersPass {
     super.render({...options, clearColor, colorMask, target: this.fbo, pass: 'mask'});
   }
 
-  protected getLayerParameters(layer: Layer<{}>, layerIndex: number, viewport: Viewport) {
+  protected getLayerParameters(
+    layer: Layer<{}>,
+    layerIndex: number,
+    viewport: Viewport
+  ): Parameters {
     return {
       ...layer.props.parameters,
       blend: true,
-      depthTest: false,
+      depthCompare: 'always',
       ...MASK_BLENDING
     };
   }

package/src/terrain/shader-module.ts

@@ -5,7 +5,7 @@
 /* eslint-disable camelcase */
 
 import type {ShaderModule} from '@luma.gl/shadertools';
-import {project, ProjectProps, ProjectUniforms, Viewport} from '@deck.gl/core';
+import {project, ProjectProps, ProjectUniforms} from '@deck.gl/core';
 
 import type {Texture} from '@luma.gl/core';
 import type {Bounds} from '../utils/projection-utils';

package/src/terrain/terrain-pass.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {RenderPipelineParameters} from '@luma.gl/core';
+import {Parameters, RenderPipelineParameters} from '@luma.gl/core';
 import {Layer, Viewport, _LayersPass as LayersPass, LayersPassRenderOptions} from '@deck.gl/core';
 import type {HeightMapBuilder} from './height-map-builder';
 import type {TerrainCover} from './terrain-cover';
@@ -79,11 +79,15 @@ export class TerrainPass extends LayersPass {
     });
   }
 
-  protected getLayerParameters(layer: Layer<{}>, layerIndex: number, viewport: Viewport) {
+  protected getLayerParameters(
+    layer: Layer<{}>,
+    layerIndex: number,
+    viewport: Viewport
+  ): Parameters {
     return {
       ...layer.props.parameters,
       blend: true,
-      depthTest: false,
+      depthCompare: 'always',
       ...(layer.props.operation.includes('terrain') && TERRAIN_BLENDING)
     };
   }

package/src/terrain/terrain-picking-pass.ts

@@ -9,6 +9,7 @@ import {
   _PickLayersPass as PickLayersPass
 } from '@deck.gl/core';
 import type {TerrainCover} from './terrain-cover';
+import {Parameters} from '@luma.gl/core';
 
 export type TerrainPickingPassRenderOptions = LayersPassRenderOptions & {
   pickZ: boolean;
@@ -72,7 +73,7 @@ export class TerrainPickingPass extends PickLayersPass {
     });
   }
 
-  protected getLayerParameters(layer: Layer, layerIndex: number, viewport: Viewport): any {
+  protected getLayerParameters(layer: Layer, layerIndex: number, viewport: Viewport): Parameters {
     let parameters: any;
     if (this.drawParameters[layer.id]) {
       parameters = this.drawParameters[layer.id];
@@ -80,7 +81,7 @@ export class TerrainPickingPass extends PickLayersPass {
       parameters = super.getLayerParameters(layer, layerIndex, viewport);
       parameters.blend = true;
     }
-    return {...parameters, depthTest: false};
+    return {...parameters, depthCompare: 'always'};
   }
 
   getShaderModuleProps(layer: Layer, effects: any, otherShaderModuleProps: Record<string, any>) {