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

package/dist/data-filter/shader-module.js

@@ -1,3 +1,4 @@
+import { glsl } from "../utils/syntax-tags.js";
 /*
  * data filter shader module
  */
@@ -10,78 +11,69 @@ uniform bool filter_useSoftMargin;
 uniform bool filter_enabled;
 uniform bool filter_transformSize;
 uniform ivec4 filter_categoryBitMask;
-
 #ifdef NON_INSTANCED_MODEL
-  #define DATAFILTER_ATTRIB filterValues
-  #define DATAFILTER_ATTRIB_64LOW filterValues64Low
-  #define DATACATEGORY_ATTRIB filterCategoryValues
+#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
+#define DATAFILTER_ATTRIB instanceFilterValues
+#define DATAFILTER_ATTRIB_64LOW instanceFilterValues64Low
+#define DATACATEGORY_ATTRIB instanceFilterCategoryValues
 #endif
-
 in DATAFILTER_TYPE DATAFILTER_ATTRIB;
 #ifdef DATAFILTER_DOUBLE
-  in DATAFILTER_TYPE DATAFILTER_ATTRIB_64LOW;
-
-  uniform DATAFILTER_TYPE filter_min64High;
-  uniform DATAFILTER_TYPE filter_max64High;
+in DATAFILTER_TYPE DATAFILTER_ATTRIB_64LOW;
+uniform DATAFILTER_TYPE filter_min64High;
+uniform DATAFILTER_TYPE filter_max64High;
 #endif
 in DATACATEGORY_TYPE DATACATEGORY_ATTRIB;
-
 out float dataFilter_value;
-
 float dataFilter_reduceValue(float value) {
-  return value;
+return value;
 }
 float dataFilter_reduceValue(vec2 value) {
-  return min(value.x, value.y);
+return min(value.x, value.y);
 }
 float dataFilter_reduceValue(vec3 value) {
-  return min(min(value.x, value.y), value.z);
+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));
+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) {
-    if (filter_useSoftMargin) {
-      dataFilter_value = dataFilter_reduceValue(
-        smoothstep(filter_min, filter_softMin, valueFromMin) *
-        (1.0 - smoothstep(filter_softMax, filter_max, valueFromMax))
-      );
-    } else {
-      dataFilter_value = dataFilter_reduceValue(
-        step(filter_min, valueFromMin) * step(valueFromMax, filter_max)
-      );
-    }
-
-    #if DATACATEGORY_CHANNELS == 1 // One 128-bit mask
-      int dataFilter_masks = filter_categoryBitMask[int(category / 32.0)];
-    #elif DATACATEGORY_CHANNELS == 2 // Two 64-bit masks
-      ivec2 dataFilter_masks = ivec2(
-        filter_categoryBitMask[int(category.x / 32.0)],
-        filter_categoryBitMask[int(category.y / 32.0) + 2]
-      );
-    #elif DATACATEGORY_CHANNELS == 3 // Three 32-bit masks
-      ivec3 dataFilter_masks = filter_categoryBitMask.xyz;
-    #else // Four 32-bit masks
-      ivec4 dataFilter_masks = filter_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);
-
-    #if DATACATEGORY_CHANNELS == 1
-      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;
-  }
+if (filter_enabled) {
+if (filter_useSoftMargin) {
+dataFilter_value = dataFilter_reduceValue(
+smoothstep(filter_min, filter_softMin, valueFromMin) *
+(1.0 - smoothstep(filter_softMax, filter_max, valueFromMax))
+);
+} else {
+dataFilter_value = dataFilter_reduceValue(
+step(filter_min, valueFromMin) * step(valueFromMax, filter_max)
+);
+}
+#if DATACATEGORY_CHANNELS == 1
+int dataFilter_masks = filter_categoryBitMask[int(category / 32.0)];
+#elif DATACATEGORY_CHANNELS == 2
+ivec2 dataFilter_masks = ivec2(
+filter_categoryBitMask[int(category.x / 32.0)],
+filter_categoryBitMask[int(category.y / 32.0) + 2]
+);
+#elif DATACATEGORY_CHANNELS == 3
+ivec3 dataFilter_masks = filter_categoryBitMask.xyz;
+#else
+ivec4 dataFilter_masks = filter_categoryBitMask;
+#endif
+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);
+#if DATACATEGORY_CHANNELS == 1
+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;
+}
 }
 `;
 const fs = `
@@ -144,32 +136,32 @@ function getUniforms64(opts) {
 }
 const inject = {
     'vs:#main-start': `
-    #ifdef DATAFILTER_DOUBLE
-      dataFilter_setValue(
-        DATAFILTER_ATTRIB - filter_min64High + DATAFILTER_ATTRIB_64LOW,
-        DATAFILTER_ATTRIB - filter_max64High + DATAFILTER_ATTRIB_64LOW,
-        DATACATEGORY_ATTRIB
-      );
-    #else
-      dataFilter_setValue(DATAFILTER_ATTRIB, DATAFILTER_ATTRIB, DATACATEGORY_ATTRIB);
-    #endif
-  `,
+#ifdef DATAFILTER_DOUBLE
+dataFilter_setValue(
+DATAFILTER_ATTRIB - filter_min64High + DATAFILTER_ATTRIB_64LOW,
+DATAFILTER_ATTRIB - filter_max64High + DATAFILTER_ATTRIB_64LOW,
+DATACATEGORY_ATTRIB
+);
+#else
+dataFilter_setValue(DATAFILTER_ATTRIB, DATAFILTER_ATTRIB, DATACATEGORY_ATTRIB);
+#endif
+`,
     'vs:#main-end': `
-    if (dataFilter_value == 0.0) {
-      gl_Position = vec4(0.);
-    }
-  `,
+if (dataFilter_value == 0.0) {
+gl_Position = vec4(0.);
+}
+`,
     'vs:DECKGL_FILTER_SIZE': `
-    if (filter_transformSize) {
-      size = size * dataFilter_value;
-    }
-  `,
+if (filter_transformSize) {
+size = size * dataFilter_value;
+}
+`,
     'fs:DECKGL_FILTER_COLOR': `
-    if (dataFilter_value == 0.0) discard;
-    if (filter_transformColor) {
-      color.a *= dataFilter_value;
-    }
-  `
+if (dataFilter_value == 0.0) discard;
+if (filter_transformColor) {
+color.a *= dataFilter_value;
+}
+`
 };
 export const shaderModule = {
     name: 'data-filter',