@deck.gl/extensions 9.0.11 → 9.0.13

package/dist/index.cjs

@@ -43,11 +43,7 @@ uniform bool brushing_enabled;
 uniform int brushing_target;
 uniform vec2 brushing_mousePos;
 uniform float brushing_radius;
-#ifdef NON_INSTANCED_MODEL
 in vec2 brushingTargets;
-#else
-in vec2 instanceBrushingTargets;
-#endif
 out float brushing_isVisible;
 bool brushing_isPointInRange(vec2 position) {
 if (!brushing_enabled) {
@@ -87,11 +83,7 @@ brushingTarget = geometry.worldPosition.xy;
 } else if (brushing_target == 1) {
 brushingTarget = geometry.worldPositionAlt.xy;
 } else {
-#ifdef NON_INSTANCED_MODEL
 brushingTarget = brushingTargets;
-#else
-brushingTarget = instanceBrushingTargets;
-#endif
 }
 bool visible;
 if (brushing_target == 3) {
@@ -146,15 +138,8 @@ var _BrushingExtension = class extends import_core2.LayerExtension {
       attributeManager.add({
         brushingTargets: {
           size: 2,
-          accessor: "getBrushingTarget",
-          shaderAttributes: {
-            brushingTargets: {
-              divisor: 0
-            },
-            instanceBrushingTargets: {
-              divisor: 1
-            }
-          }
+          stepMode: "dynamic",
+          accessor: "getBrushingTarget"
         }
       });
     }
@@ -202,27 +187,15 @@ 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
-#else
-#define DATAFILTER_ATTRIB instanceFilterValues
-#define DATAFILTER_ATTRIB_64LOW instanceFilterValues64Low
-#endif
-in DATAFILTER_TYPE DATAFILTER_ATTRIB;
+in DATAFILTER_TYPE filterValues;
 #ifdef DATAFILTER_DOUBLE
-in DATAFILTER_TYPE DATAFILTER_ATTRIB_64LOW;
+in DATAFILTER_TYPE filterValues64Low;
 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;
+in DATACATEGORY_TYPE filterCategoryValues;
 #endif
 out float dataFilter_value;
 float dataFilter_reduceValue(float value) {
@@ -258,7 +231,7 @@ step(filter_min, valueFromMin) * step(valueFromMax, filter_max)
 }
 }
 #endif
-#ifdef DATACATEGORY_ATTRIB
+#ifdef DATACATEGORY_TYPE
 void dataFilter_setCategoryValue(DATACATEGORY_TYPE category) {
 #if DATACATEGORY_CHANNELS == 1
 int dataFilter_masks = filter_categoryBitMask[int(category / 32.0)];
@@ -340,18 +313,18 @@ var inject2 = {
   "vs:#main-start": `
 dataFilter_value = 1.0;
 if (filter_enabled) {
-#ifdef DATAFILTER_ATTRIB
+#ifdef DATAFILTER_TYPE
 #ifdef DATAFILTER_DOUBLE
 dataFilter_setValue(
-DATAFILTER_ATTRIB - filter_min64High + DATAFILTER_ATTRIB_64LOW,
-DATAFILTER_ATTRIB - filter_max64High + DATAFILTER_ATTRIB_64LOW
+filterValues - filter_min64High + filterValues64Low,
+filterValues - filter_max64High + filterValues64Low
 );
 #else
-dataFilter_setValue(DATAFILTER_ATTRIB, DATAFILTER_ATTRIB);
+dataFilter_setValue(filterValues, filterValues);
 #endif
 #endif
-#ifdef DATACATEGORY_ATTRIB
-dataFilter_setCategoryValue(DATACATEGORY_ATTRIB);
+#ifdef DATACATEGORY_TYPE
+dataFilter_setCategoryValue(filterCategoryValues);
 #endif
 }
 `,
@@ -536,15 +509,8 @@ var _DataFilterExtension = class extends import_core3.LayerExtension {
           filterValues: {
             size: filterSize,
             type: fp642 ? "float64" : "float32",
-            accessor: "getFilterValue",
-            shaderAttributes: {
-              filterValues: {
-                divisor: 0
-              },
-              instanceFilterValues: {
-                divisor: 1
-              }
-            }
+            stepMode: "dynamic",
+            accessor: "getFilterValue"
           }
         });
       }
@@ -552,16 +518,9 @@ var _DataFilterExtension = class extends import_core3.LayerExtension {
         attributeManager.add({
           filterCategoryValues: {
             size: categorySize,
+            stepMode: "dynamic",
             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
-              }
-            }
+            transform: categorySize === 1 ? (d) => extension._getCategoryKey.call(this, d, 0) : (d) => d.map((x, i) => extension._getCategoryKey.call(this, x, i))
           }
         });
       }
@@ -992,18 +951,9 @@ var import_core9 = require("@deck.gl/core");
 // dist/fill-style/shader-module.js
 var import_core8 = require("@deck.gl/core");
 var patternVs = `
-#ifdef NON_INSTANCED_MODEL
-#define FILL_PATTERN_FRAME_ATTRIB fillPatternFrames
-#define FILL_PATTERN_SCALE_ATTRIB fillPatternScales
-#define FILL_PATTERN_OFFSET_ATTRIB fillPatternOffsets
-#else
-#define FILL_PATTERN_FRAME_ATTRIB instanceFillPatternFrames
-#define FILL_PATTERN_SCALE_ATTRIB instanceFillPatternScales
-#define FILL_PATTERN_OFFSET_ATTRIB instanceFillPatternOffsets
-#endif
-in vec4 FILL_PATTERN_FRAME_ATTRIB;
-in float FILL_PATTERN_SCALE_ATTRIB;
-in vec2 FILL_PATTERN_OFFSET_ATTRIB;
+in vec4 fillPatternFrames;
+in float fillPatternScales;
+in vec2 fillPatternOffsets;
 uniform bool fill_patternEnabled;
 uniform vec2 fill_patternTextureSize;
 out vec2 fill_uv;
@@ -1027,9 +977,9 @@ fill_uv = geometry.position.xy;
 `,
   "vs:DECKGL_FILTER_COLOR": `
 if (fill_patternEnabled) {
-fill_patternBounds = FILL_PATTERN_FRAME_ATTRIB / vec4(fill_patternTextureSize, fill_patternTextureSize);
-fill_patternPlacement.xy = FILL_PATTERN_OFFSET_ATTRIB;
-fill_patternPlacement.zw = FILL_PATTERN_SCALE_ATTRIB * FILL_PATTERN_FRAME_ATTRIB.zw;
+fill_patternBounds = fillPatternFrames / vec4(fill_patternTextureSize, fill_patternTextureSize);
+fill_patternPlacement.xy = fillPatternOffsets;
+fill_patternPlacement.zw = fillPatternScales * fillPatternFrames.zw;
 }
 `,
   "fs:DECKGL_FILTER_COLOR": `
@@ -1121,41 +1071,20 @@ var _FillStyleExtension = class extends import_core9.LayerExtension {
       attributeManager.add({
         fillPatternFrames: {
           size: 4,
+          stepMode: "dynamic",
           accessor: "getFillPattern",
-          transform: extension.getPatternFrame.bind(this),
-          shaderAttributes: {
-            fillPatternFrames: {
-              divisor: 0
-            },
-            instanceFillPatternFrames: {
-              divisor: 1
-            }
-          }
+          transform: extension.getPatternFrame.bind(this)
         },
         fillPatternScales: {
           size: 1,
+          stepMode: "dynamic",
           accessor: "getFillPatternScale",
-          defaultValue: 1,
-          shaderAttributes: {
-            fillPatternScales: {
-              divisor: 0
-            },
-            instanceFillPatternScales: {
-              divisor: 1
-            }
-          }
+          defaultValue: 1
         },
         fillPatternOffsets: {
           size: 2,
-          accessor: "getFillPatternOffset",
-          shaderAttributes: {
-            fillPatternOffsets: {
-              divisor: 0
-            },
-            instanceFillPatternOffsets: {
-              divisor: 1
-            }
-          }
+          stepMode: "dynamic",
+          accessor: "getFillPatternOffset"
         }
       });
     }
@@ -1295,11 +1224,7 @@ var import_core15 = require("@deck.gl/core");
 // dist/collision-filter/shader-module.js
 var import_core11 = require("@deck.gl/core");
 var vs3 = `
-#ifdef NON_INSTANCED_MODEL
 in float collisionPriorities;
-#else
-in float instanceCollisionPriorities;
-#endif
 uniform sampler2D collision_texture;
 uniform bool collision_sort;
 uniform bool collision_enabled;
@@ -1340,11 +1265,7 @@ float collision_fade = 1.0;
 `,
   "vs:DECKGL_FILTER_GL_POSITION": `
 if (collision_sort) {
-#ifdef NON_INSTANCED_MODEL
 float collisionPriority = collisionPriorities;
-#else
-float collisionPriority = instanceCollisionPriorities;
-#endif
 position.z = -0.001 * collisionPriority * position.w;
 }
 if (collision_enabled) {
@@ -1602,11 +1523,8 @@ var _CollisionFilterExtension = class extends import_core15.LayerExtension {
     attributeManager.add({
       collisionPriorities: {
         size: 1,
-        accessor: "getCollisionPriority",
-        shaderAttributes: {
-          collisionPriorities: { divisor: 0 },
-          instanceCollisionPriorities: { divisor: 1 }
-        }
+        stepMode: "dynamic",
+        accessor: "getCollisionPriority"
       }
     });
   }