@deck.gl/extensions 9.3.0-alpha.3 → 9.3.0-alpha.5

package/dist/fp64/project64.glsl.d.ts

@@ -1,3 +1,3 @@
-declare const _default: "\nconst vec2 WORLD_SCALE_FP64 = vec2(81.4873275756836, 0.0000032873668232014097);\n\nuniform project64Uniforms {\n  vec2 scale;\n  mat4 viewProjectionMatrix;\n  mat4 viewProjectionMatrix64Low;\n} project64;\n\n// longitude: lnglat_fp64.xy; latitude: lnglat_fp64.zw\nvoid mercatorProject_fp64(vec4 lnglat_fp64, out vec2 out_val[2]) {\n\n#if defined(NVIDIA_FP64_WORKAROUND)\n  out_val[0] = sum_fp64(radians_fp64(lnglat_fp64.xy), PI_FP64 * ONE);\n#else\n  out_val[0] = sum_fp64(radians_fp64(lnglat_fp64.xy), PI_FP64);\n#endif\n  out_val[1] = sum_fp64(PI_FP64,\n    log_fp64(tan_fp64(sum_fp64(PI_4_FP64, radians_fp64(lnglat_fp64.zw) / 2.0))));\n  return;\n}\n\nvoid project_position_fp64(vec4 position_fp64, out vec2 out_val[2]) {\n  vec2 pos_fp64[2];\n  mercatorProject_fp64(position_fp64, pos_fp64);\n  out_val[0] = mul_fp64(pos_fp64[0], WORLD_SCALE_FP64);\n  out_val[1] = mul_fp64(pos_fp64[1], WORLD_SCALE_FP64);\n\n  return;\n}\n\nvoid project_position_fp64(vec2 position, vec2 position64xyLow, out vec2 out_val[2]) {\n  vec4 position64xy = vec4(\n    position.x, position64xyLow.x,\n    position.y, position64xyLow.y);\n\n  project_position_fp64(position64xy, out_val);\n}\n\nvec4 project_common_position_to_clipspace_fp64(vec2 vertex_pos_modelspace[4]) {\n  vec2 vertex_pos_clipspace[4];\n  vec2 viewProjectionMatrixFP64[16];\n  for (int i = 0; i < 4; i++) {\n    for (int j = 0; j < 4; j++) {\n      viewProjectionMatrixFP64[4 * i + j] = vec2(\n        project64.viewProjectionMatrix[j][i],\n        project64.viewProjectionMatrix64Low[j][i]\n      );\n    }   \n  }\n  mat4_vec4_mul_fp64(viewProjectionMatrixFP64, vertex_pos_modelspace,\n    vertex_pos_clipspace);\n  return vec4(\n    vertex_pos_clipspace[0].x,\n    vertex_pos_clipspace[1].x,\n    vertex_pos_clipspace[2].x,\n    vertex_pos_clipspace[3].x\n    );\n}\n\nvec4 project_position_to_clipspace(\n  vec3 position, vec3 position64xyLow, vec3 offset, out vec4 commonPosition\n) {\n  // This is the local offset to the instance position\n  vec2 offset64[4];\n  vec4_fp64(vec4(offset, 0.0), offset64);\n\n  float z = project_size(position.z);\n\n  // Apply web mercator projection (depends on coordinate system imn use)\n  vec2 projectedPosition64xy[2];\n  project_position_fp64(position.xy, position64xyLow.xy, projectedPosition64xy);\n\n  vec2 commonPosition64[4];\n  commonPosition64[0] = sum_fp64(offset64[0], projectedPosition64xy[0]);\n  commonPosition64[1] = sum_fp64(offset64[1], projectedPosition64xy[1]);\n  commonPosition64[2] = sum_fp64(offset64[2], vec2(z, 0.0));\n  commonPosition64[3] = vec2(1.0, 0.0);\n\n  commonPosition = vec4(projectedPosition64xy[0].x, projectedPosition64xy[1].x, z, 1.0);\n\n  return project_common_position_to_clipspace_fp64(commonPosition64);\n}\n\nvec4 project_position_to_clipspace(\n  vec3 position, vec3 position64xyLow, vec3 offset\n) {\n  vec4 commonPosition;\n  return project_position_to_clipspace(\n    position, position64xyLow, offset, commonPosition\n  );\n}\n";
+declare const _default: "\nconst vec2 WORLD_SCALE_FP64 = vec2(81.4873275756836, 0.0000032873668232014097);\n\nlayout(std140) uniform project64Uniforms {\n  vec2 scale;\n  mat4 viewProjectionMatrix;\n  mat4 viewProjectionMatrix64Low;\n} project64;\n\n// longitude: lnglat_fp64.xy; latitude: lnglat_fp64.zw\nvoid mercatorProject_fp64(vec4 lnglat_fp64, out vec2 out_val[2]) {\n\n#if defined(NVIDIA_FP64_WORKAROUND)\n  out_val[0] = sum_fp64(radians_fp64(lnglat_fp64.xy), PI_FP64 * ONE);\n#else\n  out_val[0] = sum_fp64(radians_fp64(lnglat_fp64.xy), PI_FP64);\n#endif\n  out_val[1] = sum_fp64(PI_FP64,\n    log_fp64(tan_fp64(sum_fp64(PI_4_FP64, radians_fp64(lnglat_fp64.zw) / 2.0))));\n  return;\n}\n\nvoid project_position_fp64(vec4 position_fp64, out vec2 out_val[2]) {\n  vec2 pos_fp64[2];\n  mercatorProject_fp64(position_fp64, pos_fp64);\n  out_val[0] = mul_fp64(pos_fp64[0], WORLD_SCALE_FP64);\n  out_val[1] = mul_fp64(pos_fp64[1], WORLD_SCALE_FP64);\n\n  return;\n}\n\nvoid project_position_fp64(vec2 position, vec2 position64xyLow, out vec2 out_val[2]) {\n  vec4 position64xy = vec4(\n    position.x, position64xyLow.x,\n    position.y, position64xyLow.y);\n\n  project_position_fp64(position64xy, out_val);\n}\n\nvec4 project_common_position_to_clipspace_fp64(vec2 vertex_pos_modelspace[4]) {\n  vec2 vertex_pos_clipspace[4];\n  vec2 viewProjectionMatrixFP64[16];\n  for (int i = 0; i < 4; i++) {\n    for (int j = 0; j < 4; j++) {\n      viewProjectionMatrixFP64[4 * i + j] = vec2(\n        project64.viewProjectionMatrix[j][i],\n        project64.viewProjectionMatrix64Low[j][i]\n      );\n    }   \n  }\n  mat4_vec4_mul_fp64(viewProjectionMatrixFP64, vertex_pos_modelspace,\n    vertex_pos_clipspace);\n  return vec4(\n    vertex_pos_clipspace[0].x,\n    vertex_pos_clipspace[1].x,\n    vertex_pos_clipspace[2].x,\n    vertex_pos_clipspace[3].x\n    );\n}\n\nvec4 project_position_to_clipspace(\n  vec3 position, vec3 position64xyLow, vec3 offset, out vec4 commonPosition\n) {\n  // This is the local offset to the instance position\n  vec2 offset64[4];\n  vec4_fp64(vec4(offset, 0.0), offset64);\n\n  float z = project_size(position.z);\n\n  // Apply web mercator projection (depends on coordinate system imn use)\n  vec2 projectedPosition64xy[2];\n  project_position_fp64(position.xy, position64xyLow.xy, projectedPosition64xy);\n\n  vec2 commonPosition64[4];\n  commonPosition64[0] = sum_fp64(offset64[0], projectedPosition64xy[0]);\n  commonPosition64[1] = sum_fp64(offset64[1], projectedPosition64xy[1]);\n  commonPosition64[2] = sum_fp64(offset64[2], vec2(z, 0.0));\n  commonPosition64[3] = vec2(1.0, 0.0);\n\n  commonPosition = vec4(projectedPosition64xy[0].x, projectedPosition64xy[1].x, z, 1.0);\n\n  return project_common_position_to_clipspace_fp64(commonPosition64);\n}\n\nvec4 project_position_to_clipspace(\n  vec3 position, vec3 position64xyLow, vec3 offset\n) {\n  vec4 commonPosition;\n  return project_position_to_clipspace(\n    position, position64xyLow, offset, commonPosition\n  );\n}\n";
 export default _default;
 //# sourceMappingURL=project64.glsl.d.ts.map

package/dist/fp64/project64.glsl.js

@@ -3,7 +3,7 @@
 // Copyright (c) vis.gl contributors
 export default `\
 const vec2 WORLD_SCALE_FP64 = vec2(81.4873275756836, 0.0000032873668232014097);
-uniform project64Uniforms {
+layout(std140) uniform project64Uniforms {
 vec2 scale;
 mat4 viewProjectionMatrix;
 mat4 viewProjectionMatrix64Low;

package/dist/index.cjs

@@ -40,7 +40,7 @@ var import_core2 = require("@deck.gl/core");
 var import_core = require("@deck.gl/core");
 var uniformBlock = (
   /* glsl */
-  `uniform brushingUniforms {
+  `layout(std140) uniform brushingUniforms {
   bool enabled;
   highp int target;
   vec2 mousePos;
@@ -220,24 +220,18 @@ var import_core3 = require("@deck.gl/core");
 // dist/data-filter/shader-module.js
 var uniformBlock2 = (
   /* glsl */
-  `uniform dataFilterUniforms {
+  `layout(std140) uniform dataFilterUniforms {
   bool useSoftMargin;
   bool enabled;
   bool transformSize;
   bool transformColor;
-#ifdef DATAFILTER_TYPE
-  DATAFILTER_TYPE min;
-  DATAFILTER_TYPE softMin;
-  DATAFILTER_TYPE softMax;
-  DATAFILTER_TYPE max;
-#ifdef DATAFILTER_DOUBLE
-  DATAFILTER_TYPE min64High;
-  DATAFILTER_TYPE max64High;
-#endif
-#endif
-#ifdef DATACATEGORY_TYPE
+  vec4 min;
+  vec4 softMin;
+  vec4 softMax;
+  vec4 max;
+  vec4 min64High;
+  vec4 max64High;
   highp uvec4 categoryBitMask;
-#endif
 } dataFilter;
 `
 );
@@ -257,6 +251,86 @@ var vertex2 = (
 
 out float dataFilter_value;
 
+#ifdef DATAFILTER_TYPE
+  float dataFilter_getMin(float _) {
+    return dataFilter.min.x;
+  }
+  vec2 dataFilter_getMin(vec2 _) {
+    return dataFilter.min.xy;
+  }
+  vec3 dataFilter_getMin(vec3 _) {
+    return dataFilter.min.xyz;
+  }
+  vec4 dataFilter_getMin(vec4 _) {
+    return dataFilter.min;
+  }
+
+  float dataFilter_getSoftMin(float _) {
+    return dataFilter.softMin.x;
+  }
+  vec2 dataFilter_getSoftMin(vec2 _) {
+    return dataFilter.softMin.xy;
+  }
+  vec3 dataFilter_getSoftMin(vec3 _) {
+    return dataFilter.softMin.xyz;
+  }
+  vec4 dataFilter_getSoftMin(vec4 _) {
+    return dataFilter.softMin;
+  }
+
+  float dataFilter_getSoftMax(float _) {
+    return dataFilter.softMax.x;
+  }
+  vec2 dataFilter_getSoftMax(vec2 _) {
+    return dataFilter.softMax.xy;
+  }
+  vec3 dataFilter_getSoftMax(vec3 _) {
+    return dataFilter.softMax.xyz;
+  }
+  vec4 dataFilter_getSoftMax(vec4 _) {
+    return dataFilter.softMax;
+  }
+
+  float dataFilter_getMax(float _) {
+    return dataFilter.max.x;
+  }
+  vec2 dataFilter_getMax(vec2 _) {
+    return dataFilter.max.xy;
+  }
+  vec3 dataFilter_getMax(vec3 _) {
+    return dataFilter.max.xyz;
+  }
+  vec4 dataFilter_getMax(vec4 _) {
+    return dataFilter.max;
+  }
+
+  float dataFilter_getMin64High(float _) {
+    return dataFilter.min64High.x;
+  }
+  vec2 dataFilter_getMin64High(vec2 _) {
+    return dataFilter.min64High.xy;
+  }
+  vec3 dataFilter_getMin64High(vec3 _) {
+    return dataFilter.min64High.xyz;
+  }
+  vec4 dataFilter_getMin64High(vec4 _) {
+    return dataFilter.min64High;
+  }
+
+  float dataFilter_getMax64High(float _) {
+    return dataFilter.max64High.x;
+  }
+  vec2 dataFilter_getMax64High(vec2 _) {
+    return dataFilter.max64High.xy;
+  }
+  vec3 dataFilter_getMax64High(vec3 _) {
+    return dataFilter.max64High.xyz;
+  }
+  vec4 dataFilter_getMax64High(vec4 _) {
+    return dataFilter.max64High;
+  }
+#endif
+
 float dataFilter_reduceValue(float value) {
   return value;
 }
@@ -272,23 +346,27 @@ float dataFilter_reduceValue(vec4 value) {
 
 #ifdef DATAFILTER_TYPE
   void dataFilter_setValue(DATAFILTER_TYPE valueFromMin, DATAFILTER_TYPE valueFromMax) {
+    DATAFILTER_TYPE dataFilter_min = dataFilter_getMin(valueFromMin);
+    DATAFILTER_TYPE dataFilter_softMin = dataFilter_getSoftMin(valueFromMin);
+    DATAFILTER_TYPE dataFilter_softMax = dataFilter_getSoftMax(valueFromMin);
+    DATAFILTER_TYPE dataFilter_max = dataFilter_getMax(valueFromMin);
     if (dataFilter.useSoftMargin) {
       // smoothstep results are undefined if edge0 \u2265 edge1
       // Fallback to ignore filterSoftRange if it is truncated by filterRange
       DATAFILTER_TYPE leftInRange = mix(
-        smoothstep(dataFilter.min, dataFilter.softMin, valueFromMin),
-        step(dataFilter.min, valueFromMin),
-        step(dataFilter.softMin, dataFilter.min)
+        smoothstep(dataFilter_min, dataFilter_softMin, valueFromMin),
+        step(dataFilter_min, valueFromMin),
+        step(dataFilter_softMin, dataFilter_min)
       );
       DATAFILTER_TYPE rightInRange = mix(
-        1.0 - smoothstep(dataFilter.softMax, dataFilter.max, valueFromMax),
-        step(valueFromMax, dataFilter.max),
-        step(dataFilter.max, dataFilter.softMax)
+        1.0 - smoothstep(dataFilter_softMax, dataFilter_max, valueFromMax),
+        step(valueFromMax, dataFilter_max),
+        step(dataFilter_max, dataFilter_softMax)
       );
       dataFilter_value = dataFilter_reduceValue(leftInRange * rightInRange);
     } else {
       dataFilter_value = dataFilter_reduceValue(
-        step(dataFilter.min, valueFromMin) * step(valueFromMax, dataFilter.max)
+        step(dataFilter_min, valueFromMin) * step(valueFromMax, dataFilter_max)
       );
     }
   }
@@ -314,9 +392,9 @@ float dataFilter_reduceValue(vec4 value) {
     dataFilter_bits &= 1u;
 
     #if DATACATEGORY_CHANNELS == 1
-    if(dataFilter_bits == 0u) dataFilter_value = 0.0;
+    if (dataFilter_bits == 0u) dataFilter_value = 0.0;
     #else
-    if(any(equal(dataFilter_bits, DATACATEGORY_TYPE(0u)))) dataFilter_value = 0.0;
+    if (any(equal(dataFilter_bits, DATACATEGORY_TYPE(0u)))) dataFilter_value = 0.0;
     #endif
   }
 #endif
@@ -342,17 +420,23 @@ function getUniforms(opts) {
   }
   const { filterRange = [-1, 1], filterEnabled = true, filterTransformSize = true, filterTransformColor = true, categoryBitMask } = opts;
   const filterSoftRange = opts.filterSoftRange || filterRange;
+  const padRange = (value) => {
+    if (Array.isArray(value)) {
+      return [value[0] || 0, value[1] || 0, value[2] || 0, value[3] || 0];
+    }
+    return [value, 0, 0, 0];
+  };
   return {
     ...Number.isFinite(filterRange[0]) ? {
-      min: filterRange[0],
-      softMin: filterSoftRange[0],
-      softMax: filterSoftRange[1],
-      max: filterRange[1]
+      min: padRange(filterRange[0]),
+      softMin: padRange(filterSoftRange[0]),
+      softMax: padRange(filterSoftRange[1]),
+      max: padRange(filterRange[1])
     } : {
-      min: filterRange.map((r) => r[0]),
-      softMin: filterSoftRange.map((r) => r[0]),
-      softMax: filterSoftRange.map((r) => r[1]),
-      max: filterRange.map((r) => r[1])
+      min: padRange(filterRange.map((r) => r[0])),
+      softMin: padRange(filterSoftRange.map((r) => r[0])),
+      softMax: padRange(filterSoftRange.map((r) => r[1])),
+      max: padRange(filterRange.map((r) => r[1]))
     },
     enabled: filterEnabled,
     useSoftMargin: Boolean(opts.filterSoftRange),
@@ -366,25 +450,14 @@ function getUniforms64(opts) {
     return {};
   }
   const uniforms = getUniforms(opts);
-  if (Number.isFinite(uniforms.min)) {
-    const min64High = Math.fround(uniforms.min);
-    uniforms.min -= min64High;
-    uniforms.softMin -= min64High;
-    uniforms.min64High = min64High;
-    const max64High = Math.fround(uniforms.max);
-    uniforms.max -= max64High;
-    uniforms.softMax -= max64High;
-    uniforms.max64High = max64High;
-  } else {
-    const min64High = uniforms.min.map(Math.fround);
-    uniforms.min = uniforms.min.map((x, i) => x - min64High[i]);
-    uniforms.softMin = uniforms.softMin.map((x, i) => x - min64High[i]);
-    uniforms.min64High = min64High;
-    const max64High = uniforms.max.map(Math.fround);
-    uniforms.max = uniforms.max.map((x, i) => x - max64High[i]);
-    uniforms.softMax = uniforms.softMax.map((x, i) => x - max64High[i]);
-    uniforms.max64High = max64High;
-  }
+  const min64High = uniforms.min.map(Math.fround);
+  uniforms.min = uniforms.min.map((x, i) => x - min64High[i]);
+  uniforms.softMin = uniforms.softMin.map((x, i) => x - min64High[i]);
+  uniforms.min64High = min64High;
+  const max64High = uniforms.max.map(Math.fround);
+  uniforms.max = uniforms.max.map((x, i) => x - max64High[i]);
+  uniforms.softMax = uniforms.softMax.map((x, i) => x - max64High[i]);
+  uniforms.max64High = max64High;
   return uniforms;
 }
 var inject2 = {
@@ -396,8 +469,8 @@ var inject2 = {
       #ifdef DATAFILTER_TYPE
         #ifdef DATAFILTER_DOUBLE
           dataFilter_setValue(
-            filterValues - dataFilter.min64High + filterValues64Low,
-            filterValues - dataFilter.max64High + filterValues64Low
+            filterValues - dataFilter_getMin64High(filterValues) + filterValues64Low,
+            filterValues - dataFilter_getMax64High(filterValues) + filterValues64Low
           );
         #else
           dataFilter_setValue(filterValues, filterValues);
@@ -437,27 +510,19 @@ var inject2 = {
   )
 };
 function uniformTypesFromOptions(opts) {
-  const { categorySize, filterSize, fp64: fp642 } = opts;
   const uniformTypes = {
     useSoftMargin: "i32",
     enabled: "i32",
     transformSize: "i32",
-    transformColor: "i32"
+    transformColor: "i32",
+    min: "vec4<f32>",
+    softMin: "vec4<f32>",
+    softMax: "vec4<f32>",
+    max: "vec4<f32>",
+    min64High: "vec4<f32>",
+    max64High: "vec4<f32>",
+    categoryBitMask: "vec4<u32>"
   };
-  if (filterSize) {
-    const uniformFormat = filterSize === 1 ? "f32" : `vec${filterSize}<f32>`;
-    uniformTypes.min = uniformFormat;
-    uniformTypes.softMin = uniformFormat;
-    uniformTypes.softMax = uniformFormat;
-    uniformTypes.max = uniformFormat;
-    if (fp642) {
-      uniformTypes.min64High = uniformFormat;
-      uniformTypes.max64High = uniformFormat;
-    }
-  }
-  if (categorySize) {
-    uniformTypes.categoryBitMask = "vec4<i32>";
-  }
   return uniformTypes;
 }
 var dataFilter = {
@@ -828,7 +893,7 @@ var import_core4 = require("@deck.gl/core");
 
 // dist/fp64/project64.glsl.js
 var project64_glsl_default = `const vec2 WORLD_SCALE_FP64 = vec2(81.4873275756836, 0.0000032873668232014097);
-uniform project64Uniforms {
+layout(std140) uniform project64Uniforms {
 vec2 scale;
 mat4 viewProjectionMatrix;
 mat4 viewProjectionMatrix64Low;
@@ -986,7 +1051,7 @@ vDashOffset = 0.0;
 #endif
 `,
     "fs:#decl": `
-uniform pathStyleUniforms {
+layout(std140) uniform pathStyleUniforms {
 float dashAlignMode;
 bool dashGapPickable;
 } pathStyle;
@@ -1169,7 +1234,7 @@ var import_core9 = require("@deck.gl/core");
 var import_core8 = require("@deck.gl/core");
 var uniformBlock3 = (
   /* glsl */
-  `uniform fillUniforms {
+  `layout(std140) uniform fillUniforms {
   vec2 patternTextureSize;
   bool patternEnabled;
   bool patternMask;
@@ -1395,7 +1460,7 @@ var defaultProps5 = {
 var shaderFunction = (
   /* glsl */
   `
-uniform clipUniforms {
+layout(std140) uniform clipUniforms {
   vec4 bounds;
 } clip;
 
@@ -1520,7 +1585,7 @@ in float collisionPriorities;
 
 uniform sampler2D collision_texture;
 
-uniform collisionUniforms {
+layout(std140) uniform collisionUniforms {
   bool sort;
   bool enabled;
 } collision;
@@ -1892,7 +1957,7 @@ var import_core21 = require("@deck.gl/core");
 var import_core16 = require("@deck.gl/core");
 var uniformBlock4 = (
   /* glsl */
-  `uniform maskUniforms {
+  `layout(std140) uniform maskUniforms {
   vec4 bounds;
   highp int channel;
   bool enabled;
@@ -2448,7 +2513,7 @@ var uniformBlock5 = (
   // eslint-disable-next-line prefer-template
   TERRAIN_MODE_CONSTANTS + /* glsl */
   `
-uniform terrainUniforms {
+layout(std140) uniform terrainUniforms {
   float mode;
   vec4 bounds;
 } terrain;
@@ -2576,7 +2641,7 @@ if ((terrain.mode == TERRAIN_MODE_USE_COVER) || (terrain.mode == TERRAIN_MODE_US
 };
 
 // dist/terrain/utils.js
-var import_constants = require("@luma.gl/constants");
+var import_constants = require("@luma.gl/webgl/constants");
 function createRenderTarget(device, opts) {
   return device.createFramebuffer({
     id: opts.id,