@deck.gl/extensions 9.0.5 → 9.0.7

package/dist/index.cjs

@@ -193,22 +193,21 @@ var import_core3 = require("@deck.gl/core");
 
 // dist/data-filter/shader-module.js
 var vs2 = `
-uniform DATAFILTER_TYPE filter_min;
-uniform DATAFILTER_TYPE filter_softMin;
-uniform DATAFILTER_TYPE filter_softMax;
-uniform DATAFILTER_TYPE filter_max;
 uniform bool filter_useSoftMargin;
 uniform bool filter_enabled;
 uniform bool filter_transformSize;
 uniform ivec4 filter_categoryBitMask;
+#ifdef DATAFILTER_TYPE
+uniform DATAFILTER_TYPE filter_min;
+uniform DATAFILTER_TYPE filter_softMin;
+uniform DATAFILTER_TYPE filter_softMax;
+uniform DATAFILTER_TYPE filter_max;
 #ifdef NON_INSTANCED_MODEL
 #define DATAFILTER_ATTRIB filterValues
 #define DATAFILTER_ATTRIB_64LOW filterValues64Low
-#define DATACATEGORY_ATTRIB filterCategoryValues
 #else
 #define DATAFILTER_ATTRIB instanceFilterValues
 #define DATAFILTER_ATTRIB_64LOW instanceFilterValues64Low
-#define DATACATEGORY_ATTRIB instanceFilterCategoryValues
 #endif
 in DATAFILTER_TYPE DATAFILTER_ATTRIB;
 #ifdef DATAFILTER_DOUBLE
@@ -216,7 +215,15 @@ in DATAFILTER_TYPE DATAFILTER_ATTRIB_64LOW;
 uniform DATAFILTER_TYPE filter_min64High;
 uniform DATAFILTER_TYPE filter_max64High;
 #endif
+#endif
+#ifdef DATACATEGORY_TYPE
+#ifdef NON_INSTANCED_MODEL
+#define DATACATEGORY_ATTRIB filterCategoryValues
+#else
+#define DATACATEGORY_ATTRIB instanceFilterCategoryValues
+#endif
 in DATACATEGORY_TYPE DATACATEGORY_ATTRIB;
+#endif
 out float dataFilter_value;
 float dataFilter_reduceValue(float value) {
 return value;
@@ -230,8 +237,8 @@ return min(min(value.x, value.y), value.z);
 float dataFilter_reduceValue(vec4 value) {
 return min(min(value.x, value.y), min(value.z, value.w));
 }
-void dataFilter_setValue(DATAFILTER_TYPE valueFromMin, DATAFILTER_TYPE valueFromMax, DATACATEGORY_TYPE category) {
-if (filter_enabled) {
+#ifdef DATAFILTER_ATTRIB
+void dataFilter_setValue(DATAFILTER_TYPE valueFromMin, DATAFILTER_TYPE valueFromMax) {
 if (filter_useSoftMargin) {
 dataFilter_value = dataFilter_reduceValue(
 smoothstep(filter_min, filter_softMin, valueFromMin) *
@@ -242,6 +249,10 @@ dataFilter_value = dataFilter_reduceValue(
 step(filter_min, valueFromMin) * step(valueFromMax, filter_max)
 );
 }
+}
+#endif
+#ifdef DATACATEGORY_ATTRIB
+void dataFilter_setCategoryValue(DATACATEGORY_TYPE category) {
 #if DATACATEGORY_CHANNELS == 1
 int dataFilter_masks = filter_categoryBitMask[int(category / 32.0)];
 #elif DATACATEGORY_CHANNELS == 2
@@ -261,10 +272,8 @@ if(dataFilter_bits == 0.0) dataFilter_value = 0.0;
 #else
 if(any(equal(dataFilter_bits, DATACATEGORY_TYPE(0.0)))) dataFilter_value = 0.0;
 #endif
-} else {
-dataFilter_value = 1.0;
-}
 }
+#endif
 `;
 var fs2 = `
 uniform bool filter_transformColor;
@@ -322,15 +331,22 @@ function getUniforms64(opts) {
 }
 var inject2 = {
   "vs:#main-start": `
+dataFilter_value = 1.0;
+if (filter_enabled) {
+#ifdef DATAFILTER_ATTRIB
 #ifdef DATAFILTER_DOUBLE
 dataFilter_setValue(
 DATAFILTER_ATTRIB - filter_min64High + DATAFILTER_ATTRIB_64LOW,
-DATAFILTER_ATTRIB - filter_max64High + DATAFILTER_ATTRIB_64LOW,
-DATACATEGORY_ATTRIB
+DATAFILTER_ATTRIB - filter_max64High + DATAFILTER_ATTRIB_64LOW
 );
 #else
-dataFilter_setValue(DATAFILTER_ATTRIB, DATAFILTER_ATTRIB, DATACATEGORY_ATTRIB);
+dataFilter_setValue(DATAFILTER_ATTRIB, DATAFILTER_ATTRIB);
+#endif
 #endif
+#ifdef DATACATEGORY_ATTRIB
+dataFilter_setCategoryValue(DATACATEGORY_ATTRIB);
+#endif
+}
 `,
   "vs:#main-end": `
 if (dataFilter_value == 0.0) {
@@ -476,7 +492,7 @@ var defaultProps2 = {
   filterTransformColor: true
 };
 var defaultOptions = {
-  categorySize: 1,
+  categorySize: 0,
   filterSize: 1,
   fp64: false,
   countItems: false
@@ -493,48 +509,55 @@ var _DataFilterExtension = class extends import_core3.LayerExtension {
   }
   getShaders(extension) {
     const { categorySize, filterSize, fp64: fp642 } = extension.opts;
-    return {
-      modules: [fp642 ? shaderModule64 : shaderModule],
-      defines: {
-        DATACATEGORY_TYPE: DATA_TYPE_FROM_SIZE[categorySize],
-        DATACATEGORY_CHANNELS: categorySize,
-        DATAFILTER_TYPE: DATA_TYPE_FROM_SIZE[filterSize],
-        DATAFILTER_DOUBLE: Boolean(fp642)
-      }
-    };
+    const defines = {};
+    if (categorySize) {
+      defines.DATACATEGORY_TYPE = DATA_TYPE_FROM_SIZE[categorySize];
+      defines.DATACATEGORY_CHANNELS = categorySize;
+    }
+    if (filterSize) {
+      defines.DATAFILTER_TYPE = DATA_TYPE_FROM_SIZE[filterSize];
+      defines.DATAFILTER_DOUBLE = Boolean(fp642);
+    }
+    return { modules: [fp642 ? shaderModule64 : shaderModule], defines };
   }
   initializeState(context, extension) {
     const attributeManager = this.getAttributeManager();
     const { categorySize, filterSize, fp64: fp642 } = extension.opts;
     if (attributeManager) {
-      attributeManager.add({
-        filterValues: {
-          size: filterSize,
-          type: fp642 ? "float64" : "float32",
-          accessor: "getFilterValue",
-          shaderAttributes: {
-            filterValues: {
-              divisor: 0
-            },
-            instanceFilterValues: {
-              divisor: 1
+      if (filterSize) {
+        attributeManager.add({
+          filterValues: {
+            size: filterSize,
+            type: fp642 ? "float64" : "float32",
+            accessor: "getFilterValue",
+            shaderAttributes: {
+              filterValues: {
+                divisor: 0
+              },
+              instanceFilterValues: {
+                divisor: 1
+              }
             }
           }
-        },
-        filterCategoryValues: {
-          size: categorySize,
-          accessor: "getFilterCategory",
-          transform: categorySize === 1 ? (d) => extension._getCategoryKey.call(this, d, 0) : (d) => d.map((x, i) => extension._getCategoryKey.call(this, x, i)),
-          shaderAttributes: {
-            filterCategoryValues: {
-              divisor: 0
-            },
-            instanceFilterCategoryValues: {
-              divisor: 1
+        });
+      }
+      if (categorySize) {
+        attributeManager.add({
+          filterCategoryValues: {
+            size: categorySize,
+            accessor: "getFilterCategory",
+            transform: categorySize === 1 ? (d) => extension._getCategoryKey.call(this, d, 0) : (d) => d.map((x, i) => extension._getCategoryKey.call(this, x, i)),
+            shaderAttributes: {
+              filterCategoryValues: {
+                divisor: 0
+              },
+              instanceFilterCategoryValues: {
+                divisor: 1
+              }
             }
           }
-        }
-      });
+        });
+      }
     }
     const { device } = this.context;
     if (attributeManager && extension.opts.countItems) {
@@ -564,11 +587,11 @@ var _DataFilterExtension = class extends import_core3.LayerExtension {
     }
   }
   updateState({ props, oldProps, changeFlags }, extension) {
-    var _a;
+    var _a, _b;
     const attributeManager = this.getAttributeManager();
     const { categorySize } = extension.opts;
     if (this.state.filterModel) {
-      const filterNeedsUpdate = attributeManager.attributes.filterValues.needsUpdate() || ((_a = attributeManager.attributes.filterCategoryValues) == null ? void 0 : _a.needsUpdate()) || props.filterEnabled !== oldProps.filterEnabled || props.filterRange !== oldProps.filterRange || props.filterSoftRange !== oldProps.filterSoftRange || props.filterCategories !== oldProps.filterCategories;
+      const filterNeedsUpdate = ((_a = attributeManager.attributes.filterValues) == null ? void 0 : _a.needsUpdate()) || ((_b = attributeManager.attributes.filterCategoryValues) == null ? void 0 : _b.needsUpdate()) || props.filterEnabled !== oldProps.filterEnabled || props.filterRange !== oldProps.filterRange || props.filterSoftRange !== oldProps.filterSoftRange || props.filterCategories !== oldProps.filterCategories;
       if (filterNeedsUpdate) {
         this.setState({ filterNeedsUpdate });
       }
@@ -602,7 +625,7 @@ var _DataFilterExtension = class extends import_core3.LayerExtension {
       this.context.device.clearWebGL({ framebuffer: filterFBO, color: [0, 0, 0, 0] });
       filterModel.updateModuleSettings(params.moduleParameters);
       filterModel.setAttributes({
-        ...filterValues.getValue(),
+        ...filterValues == null ? void 0 : filterValues.getValue(),
         ...filterCategoryValues == null ? void 0 : filterCategoryValues.getValue(),
         ...filterIndices == null ? void 0 : filterIndices.getValue()
       });
@@ -2195,11 +2218,12 @@ function createRenderTarget(device, opts) {
           type: 5126
         },
         mipmaps: false,
-        sampler: {
+        sampler: opts.interpolate === false ? {
+          minFilter: "nearest",
+          magFilter: "nearest"
+        } : {
           minFilter: "linear",
-          magFilter: "linear",
-          addressModeU: "clamp-to-edge",
-          addressModeV: "clamp-to-edge"
+          magFilter: "linear"
         }
       })
     ]
@@ -2319,7 +2343,8 @@ var TerrainCover = class {
     }
     if (!this.pickingFbo) {
       this.pickingFbo = createRenderTarget(this.targetLayer.context.device, {
-        id: `${this.id}-picking`
+        id: `${this.id}-picking`,
+        interpolate: false
       });
     }
     return this.pickingFbo;