@luma.gl/shadertools 9.1.0-alpha.15 → 9.1.0-alpha.16

package/dist/index.cjs

@@ -172,20 +172,20 @@ var MODULE_INJECTORS_VS = (
 var MODULE_INJECTORS_FS = (
   /* glsl */
   `#ifdef MODULE_MATERIAL
-  gl_FragColor = material_filterColor(gl_FragColor);
+  fragColor = material_filterColor(fragColor);
 #endif
 
 #ifdef MODULE_LIGHTING
-  gl_FragColor = lighting_filterColor(gl_FragColor);
+  fragColor = lighting_filterColor(fragColor);
 #endif
 
 #ifdef MODULE_FOG
-  gl_FragColor = fog_filterColor(gl_FragColor);
+  fragColor = fog_filterColor(fragColor);
 #endif
 
 #ifdef MODULE_PICKING
-  gl_FragColor = picking_filterHighlightColor(gl_FragColor);
-  gl_FragColor = picking_filterPickingColor(gl_FragColor);
+  fragColor = picking_filterHighlightColor(fragColor);
+  fragColor = picking_filterPickingColor(fragColor);
 #endif
 
 #ifdef MODULE_LOGDEPTH
@@ -303,7 +303,7 @@ function initializeShaderModule(module2) {
   }
   initializeShaderModules(module2.dependencies || []);
   const {
-    uniformPropTypes = {},
+    propTypes = {},
     deprecations = [],
     // defines = {},
     inject = {}
@@ -312,8 +312,8 @@ function initializeShaderModule(module2) {
     normalizedInjections: normalizeInjections(inject),
     parsedDeprecations: parseDeprecationDefinitions(deprecations)
   };
-  if (uniformPropTypes) {
-    instance.propValidators = makePropValidators(uniformPropTypes);
+  if (propTypes) {
+    instance.propValidators = makePropValidators(propTypes);
   }
   module2.instance = instance;
 }
@@ -321,7 +321,7 @@ function getShaderModuleUniforms(module2, props, oldUniforms) {
   var _a;
   initializeShaderModule(module2);
   const uniforms = oldUniforms || { ...module2.defaultUniforms };
-  if (module2.getUniforms) {
+  if (props && module2.getUniforms) {
     return module2.getUniforms(props, uniforms);
   }
   return getValidatedProperties(props, (_a = module2.instance) == null ? void 0 : _a.propValidators, module2.name);
@@ -2900,7 +2900,7 @@ var source = (
 // Binding 0:1 is reserved for shader passes
 @binding(1) @group(0) var<uniform> brightnessContrast : brightnessContrastUniforms;
 
-fn brightnessContrast_filterColor(color: vec4<f32>, texSize: vec2<f32>, texCoords: vec2<f32>) -> vec4<f32> {
+fn brightnessContrast_filterColor_ext(color: vec4<f32>, texSize: vec2<f32>, texCoords: vec2<f32>) -> vec4<f32> {
   color.rgb += brightnessContrast.brightness;
   if (brightnessContrast.contrast > 0.0) {
     color.rgb = (color.rgb - 0.5) / (1.0 - brightnessContrast.contrast) + 0.5;
@@ -2928,7 +2928,7 @@ vec4 brightnessContrast_filterColor(vec4 color) {
   return color;
 }
 
-vec4 brightnessContrast_filterColor(vec4 color, vec2 texSize, vec2 texCoords) {
+vec4 brightnessContrast_filterColor_ext(vec4 color, vec2 texSize, vec2 texCoord) {
   return brightnessContrast_filterColor(color);
 }
 `
@@ -2941,7 +2941,11 @@ var brightnessContrast = {
     brightness: "f32",
     contrast: "f32"
   },
-  uniformPropTypes: {
+  defaultUniforms: {
+    brightness: 0,
+    contrast: 0
+  },
+  propTypes: {
     brightness: { format: "f32", value: 0, min: -1, max: 1 },
     contrast: { format: "f32", value: 0, min: -1, max: 1 }
   },
@@ -2984,7 +2988,7 @@ var denoise = {
   uniformTypes: {
     strength: "f32"
   },
-  uniformPropTypes: {
+  propTypes: {
     strength: { format: "f32", value: 0.5, min: 0, max: 1 }
     // strength: {..., adjust: (strength: number): number => 0.53 + 200 * Math.pow(1 - strength, 4) // TODO - JS preprocessing
   },
@@ -3023,7 +3027,7 @@ vec4 hueSaturation_filterColor(vec4 color) {
   return color;
 }
 
-vec4 hueSaturation_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
+vec4 hueSaturation_filterColor_ext(vec4 color, vec2 texSize, vec2 texCoord) {
   return hueSaturation_filterColor(color);
 }
 `
@@ -3037,7 +3041,7 @@ var hueSaturation = {
     hue: "f32",
     saturation: "f32"
   },
-  uniformPropTypes: {
+  propTypes: {
     hue: { value: 0, min: -1, max: 1 },
     saturation: { value: 0, min: -1, max: 1 }
   },
@@ -3055,17 +3059,13 @@ float rand(vec2 co) {
   return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);
 }
 
-vec4 noise_filterColor(vec4 color, vec2 texCoord) {
+vec4 noise_filterColor_ext(vec4 color, vec2 texSize, vec2 texCoord) {
   float diff = (rand(texCoord) - 0.5) * noise.amount;
   color.r += diff;
   color.g += diff;
   color.b += diff;
   return color;
 }
-
-vec4 noise_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
-  return noise_filterColor(color, texCoord);
-}
 `
 );
 var noise = {
@@ -3075,7 +3075,7 @@ var noise = {
   uniformTypes: {
     amount: "f32"
   },
-  uniformPropTypes: {
+  propTypes: {
     amount: { value: 0.5, min: 0, max: 1 }
   },
   fs: fs7,
@@ -3102,7 +3102,7 @@ vec4 sepia_filterColor(vec4 color) {
   return color;
 }
 
-vec4 sepia_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
+vec4 sepia_filterColor_ext(vec4 color, vec2 texSize, vec2 texCoord) {
   return sepia_filterColor(color);
 }
 `
@@ -3114,7 +3114,7 @@ var sepia = {
   uniformTypes: {
     amount: "f32"
   },
-  uniformPropTypes: {
+  propTypes: {
     amount: { value: 0.5, min: 0, max: 1 }
   },
   fs: fs8,
@@ -3136,7 +3136,7 @@ vec4 vibrance_filterColor(vec4 color) {
   return color;
 }
 
-vec4 vibrance_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
+vec4 vibrance_filterColor_ext(vec4 color, vec2 texSize, vec2 texCoord) {
   return vibrance_filterColor(color);
 }
 `
@@ -3145,7 +3145,7 @@ var vibrance = {
   props: {},
   uniforms: {},
   name: "vibrance",
-  uniformPropTypes: {
+  propTypes: {
     amount: { value: 0, min: -1, max: 1 }
   },
   fs: fs9,
@@ -3160,15 +3160,11 @@ var fs10 = (
   float amount;
 } vignette;
 
-vec4 vignette_filterColor(vec4 color, vec2 texCoord) {
+vec4 vignette_filterColor_ext(vec4 color, vec2 texSize, vec2 texCoord) {
   float dist = distance(texCoord, vec2(0.5, 0.5));
   float ratio = smoothstep(0.8, vignette.radius * 0.799, dist * (vignette.amount + vignette.radius));
   return color.rgba * ratio + (1.0 - ratio)*vec4(0.0, 0.0, 0.0, 1.0);
 }
-
-vec4 vignette_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
-  return vignette_filterColor(color, texCoord);
-}
 `
 );
 var vignette = {
@@ -3179,7 +3175,11 @@ var vignette = {
     radius: "f32",
     amount: "f32"
   },
-  uniformPropTypes: {
+  defaultUniforms: {
+    radius: 0.5,
+    amount: 0.5
+  },
+  propTypes: {
     radius: { value: 0.5, min: 0, max: 1 },
     amount: { value: 0.5, min: 0, max: 1 }
   },
@@ -3247,7 +3247,7 @@ var tiltShift = {
     end: "vec2<f32>",
     invert: "i32"
   },
-  uniformPropTypes: {
+  propTypes: {
     blurRadius: { value: 15, min: 0, max: 50 },
     gradientRadius: { value: 200, min: 0, max: 400 },
     start: { value: [0, 0] },
@@ -3307,7 +3307,7 @@ var triangleBlur = {
     radius: "f32",
     delta: "vec2<f32>"
   },
-  uniformPropTypes: {
+  propTypes: {
     radius: { value: 20, min: 0, softMax: 100 },
     delta: { value: [1, 0], private: true }
   },
@@ -3362,7 +3362,7 @@ var zoomBlur = {
     center: "vec2<f32>",
     strength: "f32"
   },
-  uniformPropTypes: {
+  propTypes: {
     center: { value: [0.5, 0.5] },
     strength: { value: 0.3, min: 0, softMax: 1 }
   },
@@ -3390,7 +3390,7 @@ float pattern(float angle, float scale, vec2 texSize, vec2 texCoord) {
   return (sin(point.x) * sin(point.y)) * 4.0;
 }
 
-vec4 colorHalftone_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
+vec4 colorHalftone_filterColor_ext(vec4 color, vec2 texSize, vec2 texCoord) {
   float scale = 3.1514 / colorHalftone.size;
   vec3 cmy = 1.0 - color.rgb;
   float k = min(cmy.x, min(cmy.y, cmy.z));
@@ -3419,7 +3419,7 @@ var colorHalftone = {
     angle: "f32",
     size: "f32"
   },
-  uniformPropTypes: {
+  propTypes: {
     center: { value: [0.5, 0.5] },
     angle: { value: 1.1, softMin: 0, softMax: Math.PI / 2 },
     size: { value: 4, min: 1, softMin: 3, softMax: 20 }
@@ -3449,7 +3449,7 @@ float pattern(vec2 texSize, vec2 texCoord) {
   return (sin(point.x) * sin(point.y)) * 4.0;
 }
 
-vec4 dotScreen_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
+vec4 dotScreen_filterColor_ext(vec4 color, vec2 texSize, vec2 texCoord) {
   float average = (color.r + color.g + color.b) / 3.0;
   return vec4(vec3(average * 10.0 - 5.0 + pattern(texSize, texCoord)), color.a);
 }
@@ -3464,7 +3464,7 @@ var dotScreen = {
     angle: "f32",
     size: "f32"
   },
-  uniformPropTypes: {
+  propTypes: {
     center: { value: [0.5, 0.5] },
     angle: { value: 1.1, softMin: 0, softMax: Math.PI / 2 },
     size: { value: 3, min: 1, softMin: 3, softMax: 20 }
@@ -3538,7 +3538,7 @@ var edgeWork = {
   name: "edgeWork",
   dependencies: [random],
   fs: fs16,
-  uniformPropTypes: {
+  propTypes: {
     radius: { value: 2, min: 1, softMax: 50 },
     delta: { value: [1, 0], private: true }
   },
@@ -3546,12 +3546,12 @@ var edgeWork = {
     {
       // @ts-expect-error
       sampler: "edgeWork_sampleColor1",
-      uniformPropTypes: { delta: [1, 0] }
+      propTypes: { delta: [1, 0] }
     },
     {
       // @ts-expect-error
       sampler: "edgeWork_sampleColor2",
-      uniformPropTypes: { delta: [0, 1] }
+      propTypes: { delta: [0, 1] }
     }
   ]
 };
@@ -3611,7 +3611,7 @@ var hexagonalPixelate = {
     center: "vec2<f32>",
     scale: "f32"
   },
-  uniformPropTypes: {
+  propTypes: {
     center: { value: [0.5, 0.5], hint: "screenspace" },
     scale: { value: 10, min: 1, softMin: 5, softMax: 50 }
   },
@@ -3659,7 +3659,7 @@ var ink = {
   uniformTypes: {
     strength: "f32"
   },
-  uniformPropTypes: {
+  propTypes: {
     strength: { value: 0.25, min: 0, softMax: 1 }
   },
   passes: [{ sampler: true }]
@@ -3699,7 +3699,7 @@ var magnify = {
     borderWidthPixels: "f32",
     borderColor: "vec4<f32>"
   },
-  uniformPropTypes: {
+  propTypes: {
     // range 0 to 1
     screenXY: { value: [0, 0] },
     radiusPixels: 200,
@@ -3775,7 +3775,7 @@ var bulgePinch = {
     radius: "f32",
     strength: "f32"
   },
-  uniformPropTypes: {
+  propTypes: {
     center: { value: [0.5, 0.5] },
     radius: { value: 200, min: 1, softMax: 600 },
     strength: { value: 0.5, min: -1, max: 1 }
@@ -3828,7 +3828,7 @@ var swirl = {
     radius: "f32",
     angle: "f32"
   },
-  uniformPropTypes: {
+  propTypes: {
     center: { value: [0.5, 0.5] },
     radius: { value: 200, min: 1, softMax: 600 },
     angle: { value: 3, softMin: -25, softMax: 25 }
@@ -4420,7 +4420,7 @@ vec4 fxaa_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
 `;
 var fxaa = {
   name: "fxaa",
-  uniformPropTypes: {},
+  propTypes: {},
   fs: fs23,
   passes: [{ sampler: true }],
   getUniforms: (props) => props