@deck.gl/extensions 9.0.11 → 9.0.13

package/dist/brushing/brushing-extension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"brushing-extension.d.ts","sourceRoot":"","sources":["../../src/brushing/brushing-extension.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAG7C,OAAO,KAAK,EAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAC,MAAM,eAAe,CAAC;AAUjE,MAAM,MAAM,sBAAsB,CAAC,KAAK,GAAG,GAAG,IAAI;IAChD;;;OAGG;IACH,iBAAiB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACtD;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;OAEG;IACH,cAAc,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,eAAe,GAAG,QAAQ,CAAC;IAClE;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,8IAA8I;AAC9I,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,cAAc;IAC3D,MAAM,CAAC,YAAY;;;;;;;;MAAgB;IACnC,MAAM,CAAC,aAAa,SAAuB;IAE3C,UAAU,IAAI,GAAG;IAMjB,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,sBAAsB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI;IAkC3F,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,sBAAsB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI;CAW1F"}
+{"version":3,"file":"brushing-extension.d.ts","sourceRoot":"","sources":["../../src/brushing/brushing-extension.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAG7C,OAAO,KAAK,EAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAC,MAAM,eAAe,CAAC;AAUjE,MAAM,MAAM,sBAAsB,CAAC,KAAK,GAAG,GAAG,IAAI;IAChD;;;OAGG;IACH,iBAAiB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACtD;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;OAEG;IACH,cAAc,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,eAAe,GAAG,QAAQ,CAAC;IAClE;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,8IAA8I;AAC9I,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,cAAc;IAC3D,MAAM,CAAC,YAAY;;;;;;;;MAAgB;IACnC,MAAM,CAAC,aAAa,SAAuB;IAE3C,UAAU,IAAI,GAAG;IAMjB,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,sBAAsB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI;IA2B3F,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,sBAAsB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI;CAW1F"}

package/dist/brushing/brushing-extension.js

@@ -40,15 +40,8 @@ export default class BrushingExtension extends LayerExtension {
             attributeManager.add({
                 brushingTargets: {
                     size: 2,
-                    accessor: 'getBrushingTarget',
-                    shaderAttributes: {
-                        brushingTargets: {
-                            divisor: 0
-                        },
-                        instanceBrushingTargets: {
-                            divisor: 1
-                        }
-                    }
+                    stepMode: 'dynamic',
+                    accessor: 'getBrushingTarget'
                 }
             });
         }

package/dist/brushing/shader-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/brushing/shader-module.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAEvD,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAE5C,OAAO,KAAK,EAAC,sBAAsB,EAAC,gCAA6B;AAGjE,KAAK,sBAAsB,GAAG;IAE5B,QAAQ,EAAE,QAAQ,CAAC;IACnB,aAAa,CAAC,EAAE;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAC,CAAC;CACxC,GAAG,sBAAsB,CAAC;;AAkF3B,wBA4B0C"}
+{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/brushing/shader-module.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAEvD,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAE5C,OAAO,KAAK,EAAC,sBAAsB,EAAC,gCAA6B;AAGjE,KAAK,sBAAsB,GAAG;IAE5B,QAAQ,EAAE,QAAQ,CAAC;IACnB,aAAa,CAAC,EAAE;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAC,CAAC;CACxC,GAAG,sBAAsB,CAAC;;AA0E3B,wBA4B0C"}

package/dist/brushing/shader-module.js

@@ -5,11 +5,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) {
@@ -49,11 +45,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) {

package/dist/collision-filter/collision-filter-extension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collision-filter-extension.d.ts","sourceRoot":"","sources":["../../src/collision-filter/collision-filter-extension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,KAAK,EAAE,YAAY,EAAE,cAAc,EAAC,MAAM,eAAe,CAAC;AAW5E,MAAM,MAAM,6BAA6B,CAAC,KAAK,GAAG,GAAG,IAAI;IACvD;;OAEG;IACH,oBAAoB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAE/C;;;OAGG;IACH,gBAAgB,EAAE,OAAO,CAAC;IAE1B;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,kBAAkB,CAAC,EAAE,EAAE,CAAC;CACzB,CAAC;AAEF,iDAAiD;AACjD,MAAM,CAAC,OAAO,OAAO,wBAAyB,SAAQ,cAAc;IAClE,MAAM,CAAC,YAAY;;;;;;;;;;;MAAgB;IACnC,MAAM,CAAC,aAAa,SAA8B;IAElD,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,6BAA6B,CAAC,GAAG,GAAG;IAK3D,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,6BAA6B,CAAC,EAAE,EAAC,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAC,EAAE,GAAG;IAa3F,eAAe,CACb,IAAI,EAAE,KAAK,CAAC,6BAA6B,CAAC,EAC1C,OAAO,EAAE,YAAY,EACrB,SAAS,EAAE,IAAI;IAmBjB,qBAAqB,CAAC,IAAI,EAAE,KAAK,CAAC,6BAA6B,CAAC,GAAG,OAAO;CAG3E"}
+{"version":3,"file":"collision-filter-extension.d.ts","sourceRoot":"","sources":["../../src/collision-filter/collision-filter-extension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,KAAK,EAAE,YAAY,EAAE,cAAc,EAAC,MAAM,eAAe,CAAC;AAW5E,MAAM,MAAM,6BAA6B,CAAC,KAAK,GAAG,GAAG,IAAI;IACvD;;OAEG;IACH,oBAAoB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAE/C;;;OAGG;IACH,gBAAgB,EAAE,OAAO,CAAC;IAE1B;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,kBAAkB,CAAC,EAAE,EAAE,CAAC;CACzB,CAAC;AAEF,iDAAiD;AACjD,MAAM,CAAC,OAAO,OAAO,wBAAyB,SAAQ,cAAc;IAClE,MAAM,CAAC,YAAY;;;;;;;;;;;MAAgB;IACnC,MAAM,CAAC,aAAa,SAA8B;IAElD,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,6BAA6B,CAAC,GAAG,GAAG;IAK3D,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,6BAA6B,CAAC,EAAE,EAAC,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAC,EAAE,GAAG;IAa3F,eAAe,CACb,IAAI,EAAE,KAAK,CAAC,6BAA6B,CAAC,EAC1C,OAAO,EAAE,YAAY,EACrB,SAAS,EAAE,IAAI;IAgBjB,qBAAqB,CAAC,IAAI,EAAE,KAAK,CAAC,6BAA6B,CAAC,GAAG,OAAO;CAG3E"}

package/dist/collision-filter/collision-filter-extension.js

@@ -35,11 +35,8 @@ export default class CollisionFilterExtension extends LayerExtension {
         attributeManager.add({
             collisionPriorities: {
                 size: 1,
-                accessor: 'getCollisionPriority',
-                shaderAttributes: {
-                    collisionPriorities: { divisor: 0 },
-                    instanceCollisionPriorities: { divisor: 1 }
-                }
+                stepMode: 'dynamic',
+                accessor: 'getCollisionPriority'
             }
         });
     }

package/dist/collision-filter/shader-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/collision-filter/shader-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AACnD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAoFvD,KAAK,uBAAuB,GAAG;IAC7B,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;;AAsBF,wBAM2C"}
+{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/collision-filter/shader-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AACnD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AA4EvD,KAAK,uBAAuB,GAAG;IAC7B,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;;AAsBF,wBAM2C"}

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

@@ -1,11 +1,7 @@
 import { project } from '@deck.gl/core';
 import { glsl } from "../utils/syntax-tags.js";
 const vs = `
-#ifdef NON_INSTANCED_MODEL
 in float collisionPriorities;
-#else
-in float instanceCollisionPriorities;
-#endif
 uniform sampler2D collision_texture;
 uniform bool collision_sort;
 uniform bool collision_enabled;
@@ -46,11 +42,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) {

package/dist/data-filter/data-filter-extension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-filter-extension.d.ts","sourceRoot":"","sources":["../../src/data-filter/data-filter-extension.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"data-filter-extension.d.ts","sourceRoot":"","sources":["../../src/data-filter/data-filter-extension.ts"],"names":[],"mappings":"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"}

package/dist/data-filter/data-filter-extension.js

@@ -72,15 +72,8 @@ export default class DataFilterExtension extends LayerExtension {
                     filterValues: {
                         size: filterSize,
                         type: fp64 ? 'float64' : 'float32',
-                        accessor: 'getFilterValue',
-                        shaderAttributes: {
-                            filterValues: {
-                                divisor: 0
-                            },
-                            instanceFilterValues: {
-                                divisor: 1
-                            }
-                        }
+                        stepMode: 'dynamic',
+                        accessor: 'getFilterValue'
                     }
                 });
             }
@@ -88,18 +81,11 @@ export default class DataFilterExtension extends 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
-                            }
-                        }
+                            : d => d.map((x, i) => extension._getCategoryKey.call(this, x, i))
                     }
                 });
             }

package/dist/data-filter/shader-module.d.ts

@@ -17,18 +17,6 @@ export type Defines = {
      * Enable 64-bit precision in numeric filter.
      */
     DATAFILTER_DOUBLE?: boolean;
-    /**
-     * Numeric filter attribute
-     */
-    DATAFILTER_ATTRIB?: 'filterValues' | 'instanceFilterValues';
-    /**
-     * Numeric filter attribute (low bits). Only used when `DATAFILTER_DOUBLE = true`
-     */
-    DATAFILTER_ATTRIB_64LOW?: 'filterValues64Low' | 'instanceFilterValues64Low';
-    /**
-     * Category filter attribute
-     */
-    DATACATEGORY_ATTRIB?: 'filterCategoryValues' | 'instanceFilterCategoryValues';
 };
 type DataFilterModuleSettings = {
     extensions: any[];

package/dist/data-filter/shader-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/data-filter/shader-module.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAC,wBAAwB,EAAC,mCAAgC;AAMtE,MAAM,MAAM,OAAO,GAAG;IAEpB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IACvD;;OAEG;IACH,qBAAqB,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEtC;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IAErD;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAG5B;;OAEG;IACH,iBAAiB,CAAC,EAAE,cAAc,GAAG,sBAAsB,CAAC;IAC5D;;OAEG;IACH,uBAAuB,CAAC,EAAE,mBAAmB,GAAG,2BAA2B,CAAC;IAC5E;;OAEG;IACH,mBAAmB,CAAC,EAAE,sBAAsB,GAAG,8BAA8B,CAAC;CAC/E,CAAC;AAiHF,KAAK,wBAAwB,GAAG;IAC9B,UAAU,EAAE,GAAG,EAAE,CAAC;CACnB,GAAG,wBAAwB,CAAC;AA0G7B,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,wBAAwB,CAM/D,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,wBAAwB,CAMjE,CAAC"}
+{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/data-filter/shader-module.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAC,wBAAwB,EAAC,mCAAgC;AAMtE,MAAM,MAAM,OAAO,GAAG;IAEpB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IACvD;;OAEG;IACH,qBAAqB,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEtC;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IAErD;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAoGF,KAAK,wBAAwB,GAAG;IAC9B,UAAU,EAAE,GAAG,EAAE,CAAC;CACnB,GAAG,wBAAwB,CAAC;AA0G7B,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,wBAAwB,CAM/D,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,wBAAwB,CAMjE,CAAC"}

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

@@ -9,27 +9,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) {
@@ -65,7 +53,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)];
@@ -151,18 +139,18 @@ const inject = {
     '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
 }
 `,

package/dist/dist.dev.js

@@ -90,11 +90,7 @@ var __exports__ = (() => {
   uniform vec2 brushing_mousePos;
   uniform float brushing_radius;
 
-  #ifdef NON_INSTANCED_MODEL
   in vec2 brushingTargets;
-  #else
-  in vec2 instanceBrushingTargets;
-  #endif
 
   out float brushing_isVisible;
 
@@ -139,11 +135,7 @@ var __exports__ = (() => {
     } 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) {
@@ -206,15 +198,8 @@ var __exports__ = (() => {
         attributeManager.add({
           brushingTargets: {
             size: 2,
-            accessor: "getBrushingTarget",
-            shaderAttributes: {
-              brushingTargets: {
-                divisor: 0
-              },
-              instanceBrushingTargets: {
-                divisor: 1
-              }
-            }
+            stepMode: "dynamic",
+            accessor: "getBrushingTarget"
           }
         });
       }
@@ -258,17 +243,9 @@ uniform ivec4 filter_categoryBitMask;
   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;
@@ -277,12 +254,7 @@ uniform ivec4 filter_categoryBitMask;
 
 
 #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;
@@ -324,7 +296,7 @@ float dataFilter_reduceValue(vec4 value) {
   }
 #endif
 
-#ifdef DATACATEGORY_ATTRIB
+#ifdef DATACATEGORY_TYPE
   void dataFilter_setCategoryValue(DATACATEGORY_TYPE category) {
     #if DATACATEGORY_CHANNELS == 1 // One 128-bit mask
     int dataFilter_masks = filter_categoryBitMask[int(category / 32.0)];
@@ -414,19 +386,19 @@ in float dataFilter_value;
     "vs:#main-start": glsl`
     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
     }
   `,
@@ -1263,15 +1235,8 @@ void main() {
             filterValues: {
               size: filterSize,
               type: fp642 ? "float64" : "float32",
-              accessor: "getFilterValue",
-              shaderAttributes: {
-                filterValues: {
-                  divisor: 0
-                },
-                instanceFilterValues: {
-                  divisor: 1
-                }
-              }
+              stepMode: "dynamic",
+              accessor: "getFilterValue"
             }
           });
         }
@@ -1279,16 +1244,9 @@ void main() {
           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))
             }
           });
         }
@@ -2929,19 +2887,9 @@ in float instanceOffsets;
   // src/fill-style/shader-module.ts
   var import_core9 = __toESM(require_core(), 1);
   var patternVs = glsl`
-#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;
@@ -2969,9 +2917,9 @@ const float FILL_UV_SCALE = 512.0 / 40000000.0;
   `,
     "vs:DECKGL_FILTER_COLOR": glsl`
     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": glsl`
@@ -3065,41 +3013,20 @@ const float FILL_UV_SCALE = 512.0 / 40000000.0;
         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"
           }
         });
       }
@@ -3230,11 +3157,7 @@ in vec2 clip_commonPosition;
   // src/collision-filter/shader-module.ts
   var import_core12 = __toESM(require_core(), 1);
   var vs3 = glsl`
-#ifdef NON_INSTANCED_MODEL
 in float collisionPriorities;
-#else
-in float instanceCollisionPriorities;
-#endif
 
 uniform sampler2D collision_texture;
 uniform bool collision_sort;
@@ -3285,11 +3208,7 @@ float collision_isVisible(vec2 texCoords, vec3 pickingColor) {
 `,
     "vs:DECKGL_FILTER_GL_POSITION": glsl`
   if (collision_sort) {
-    #ifdef NON_INSTANCED_MODEL
     float collisionPriority = collisionPriorities;
-    #else
-    float collisionPriority = instanceCollisionPriorities;
-    #endif
     position.z = -0.001 * collisionPriority * position.w; // Support range -1000 -> 1000
   }
 
@@ -3561,11 +3480,8 @@ float collision_isVisible(vec2 texCoords, vec3 pickingColor) {
       attributeManager.add({
         collisionPriorities: {
           size: 1,
-          accessor: "getCollisionPriority",
-          shaderAttributes: {
-            collisionPriorities: { divisor: 0 },
-            instanceCollisionPriorities: { divisor: 1 }
-          }
+          stepMode: "dynamic",
+          accessor: "getCollisionPriority"
         }
       });
     }

package/dist/fill-style/fill-style-extension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fill-style-extension.d.ts","sourceRoot":"","sources":["../../src/fill-style/fill-style-extension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAI7C,OAAO,KAAK,EACV,KAAK,EACL,YAAY,EACZ,YAAY,EACZ,QAAQ,EACR,gBAAgB,EAChB,aAAa,EACb,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAkBvB,MAAM,MAAM,uBAAuB,CAAC,KAAK,GAAG,GAAG,IAAI;IACjD;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,gFAAgF;IAChF,gBAAgB,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC;IAC1C,wFAAwF;IACxF,kBAAkB,CAAC,EACf,MAAM,GACN,MAAM,CACJ,MAAM,EACN;QACE,gDAAgD;QAChD,CAAC,EAAE,MAAM,CAAC;QACV,+CAA+C;QAC/C,CAAC,EAAE,MAAM,CAAC;QACV,2BAA2B;QAC3B,KAAK,EAAE,MAAM,CAAC;QACd,4BAA4B;QAC5B,MAAM,EAAE,MAAM,CAAC;KAChB,CACF,CAAC;IACN;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,4CAA4C;IAC5C,cAAc,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACjD;;OAEG;IACH,mBAAmB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC9C;;;OAGG;IACH,oBAAoB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CAC1D,CAAC;AAEF,KAAK,yBAAyB,GAAG;IAC/B;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,gHAAgH;AAChH,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,cAAc,CAAC,yBAAyB,CAAC;IACvF,MAAM,CAAC,YAAY,6CAAgB;IACnC,MAAM,CAAC,aAAa,SAAwB;gBAEhC,EAAC,OAAe,EAAC,GAAE,OAAO,CAAC,yBAAyB,CAAM;IAItE,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,uBAAuB,CAAC,GAAG,OAAO;IAIzD,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EAAE,SAAS,EAAE,IAAI,GAAG,GAAG;IAUtE,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI;IA0D5F,WAAW,CACT,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EACpC,EAAC,KAAK,EAAE,QAAQ,EAAC,EAAE,gBAAgB,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,EACnE,SAAS,EAAE,IAAI;IAWjB,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI;IAWvE,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC;IAKlD,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EAAE,IAAI,EAAE,MAAM;CAKnE"}
+{"version":3,"file":"fill-style-extension.d.ts","sourceRoot":"","sources":["../../src/fill-style/fill-style-extension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAI7C,OAAO,KAAK,EACV,KAAK,EACL,YAAY,EACZ,YAAY,EACZ,QAAQ,EACR,gBAAgB,EAChB,aAAa,EACb,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAkBvB,MAAM,MAAM,uBAAuB,CAAC,KAAK,GAAG,GAAG,IAAI;IACjD;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,gFAAgF;IAChF,gBAAgB,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC;IAC1C,wFAAwF;IACxF,kBAAkB,CAAC,EACf,MAAM,GACN,MAAM,CACJ,MAAM,EACN;QACE,gDAAgD;QAChD,CAAC,EAAE,MAAM,CAAC;QACV,+CAA+C;QAC/C,CAAC,EAAE,MAAM,CAAC;QACV,2BAA2B;QAC3B,KAAK,EAAE,MAAM,CAAC;QACd,4BAA4B;QAC5B,MAAM,EAAE,MAAM,CAAC;KAChB,CACF,CAAC;IACN;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,4CAA4C;IAC5C,cAAc,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACjD;;OAEG;IACH,mBAAmB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC9C;;;OAGG;IACH,oBAAoB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CAC1D,CAAC;AAEF,KAAK,yBAAyB,GAAG;IAC/B;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,gHAAgH;AAChH,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,cAAc,CAAC,yBAAyB,CAAC;IACvF,MAAM,CAAC,YAAY,6CAAgB;IACnC,MAAM,CAAC,aAAa,SAAwB;gBAEhC,EAAC,OAAe,EAAC,GAAE,OAAO,CAAC,yBAAyB,CAAM;IAItE,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,uBAAuB,CAAC,GAAG,OAAO;IAIzD,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EAAE,SAAS,EAAE,IAAI,GAAG,GAAG;IAUtE,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI;IAqC5F,WAAW,CACT,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EACpC,EAAC,KAAK,EAAE,QAAQ,EAAC,EAAE,gBAAgB,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,EACnE,SAAS,EAAE,IAAI;IAWjB,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI;IAWvE,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC;IAKlD,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EAAE,IAAI,EAAE,MAAM;CAKnE"}

package/dist/fill-style/fill-style-extension.js

@@ -41,41 +41,20 @@ export default class FillStyleExtension extends 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'
                 }
             });
         }

package/dist/fill-style/shader-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/fill-style/shader-module.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAEvD,OAAO,KAAK,EAAC,QAAQ,EAAkB,MAAM,eAAe,CAAC;AAE7D,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAyE3C,KAAK,uBAAuB,GACxB;IACE,QAAQ,EAAE,QAAQ,CAAC;IACnB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,GACD;IACE,kBAAkB,EAAE,OAAO,CAAC;CAC7B,CAAC;AAoCN,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,uBAAuB,CAOhE,CAAC"}
+{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/fill-style/shader-module.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAEvD,OAAO,KAAK,EAAC,QAAQ,EAAkB,MAAM,eAAe,CAAC;AAE7D,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AA+D3C,KAAK,uBAAuB,GACxB;IACE,QAAQ,EAAE,QAAQ,CAAC;IACnB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,GACD;IACE,kBAAkB,EAAE,OAAO,CAAC;CAC7B,CAAC;AAoCN,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,uBAAuB,CAOhE,CAAC"}

package/dist/fill-style/shader-module.js

@@ -4,18 +4,9 @@ import { glsl } from "../utils/syntax-tags.js";
  * fill pattern shader module
  */
 const 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;
@@ -39,9 +30,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': `