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

package/dist/dist.dev.js

@@ -203,20 +203,20 @@ var __exports__ = (() => {
   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
@@ -334,7 +334,7 @@ ${inject[key]}` : inject[key];
     }
     initializeShaderModules(module.dependencies || []);
     const {
-      uniformPropTypes = {},
+      propTypes = {},
       deprecations = [],
       // defines = {},
       inject = {}
@@ -343,15 +343,15 @@ ${inject[key]}` : inject[key];
       normalizedInjections: normalizeInjections(inject),
       parsedDeprecations: parseDeprecationDefinitions(deprecations)
     };
-    if (uniformPropTypes) {
-      instance.propValidators = makePropValidators(uniformPropTypes);
+    if (propTypes) {
+      instance.propValidators = makePropValidators(propTypes);
     }
     module.instance = instance;
   }
   function getShaderModuleUniforms(module, props, oldUniforms) {
     initializeShaderModule(module);
     const uniforms = oldUniforms || { ...module.defaultUniforms };
-    if (module.getUniforms) {
+    if (props && module.getUniforms) {
       return module.getUniforms(props, uniforms);
     }
     return getValidatedProperties(props, module.instance?.propValidators, module.name);
@@ -8052,7 +8052,7 @@ vec4 pbr_filterColor(vec4 colorUnused)
 // 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;
@@ -8080,7 +8080,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);
 }
 `
@@ -8093,7 +8093,11 @@ vec4 brightnessContrast_filterColor(vec4 color, vec2 texSize, vec2 texCoords) {
       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 }
     },
@@ -8136,7 +8140,7 @@ vec4 denoise_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
     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
     },
@@ -8175,7 +8179,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);
 }
 `
@@ -8189,7 +8193,7 @@ vec4 hueSaturation_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
       hue: "f32",
       saturation: "f32"
     },
-    uniformPropTypes: {
+    propTypes: {
       hue: { value: 0, min: -1, max: 1 },
       saturation: { value: 0, min: -1, max: 1 }
     },
@@ -8207,17 +8211,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 = {
@@ -8227,7 +8227,7 @@ vec4 noise_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
     uniformTypes: {
       amount: "f32"
     },
-    uniformPropTypes: {
+    propTypes: {
       amount: { value: 0.5, min: 0, max: 1 }
     },
     fs: fs7,
@@ -8254,7 +8254,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);
 }
 `
@@ -8266,7 +8266,7 @@ vec4 sepia_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
     uniformTypes: {
       amount: "f32"
     },
-    uniformPropTypes: {
+    propTypes: {
       amount: { value: 0.5, min: 0, max: 1 }
     },
     fs: fs8,
@@ -8288,7 +8288,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);
 }
 `
@@ -8297,7 +8297,7 @@ vec4 vibrance_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
     props: {},
     uniforms: {},
     name: "vibrance",
-    uniformPropTypes: {
+    propTypes: {
       amount: { value: 0, min: -1, max: 1 }
     },
     fs: fs9,
@@ -8312,15 +8312,11 @@ vec4 vibrance_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
   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 = {
@@ -8331,7 +8327,11 @@ vec4 vignette_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
       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 }
     },
@@ -8399,7 +8399,7 @@ vec4 tiltShift_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
       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] },
@@ -8459,7 +8459,7 @@ vec4 triangleBlur_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
       radius: "f32",
       delta: "vec2<f32>"
     },
-    uniformPropTypes: {
+    propTypes: {
       radius: { value: 20, min: 0, softMax: 100 },
       delta: { value: [1, 0], private: true }
     },
@@ -8514,7 +8514,7 @@ vec4 zoomBlur_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
       center: "vec2<f32>",
       strength: "f32"
     },
-    uniformPropTypes: {
+    propTypes: {
       center: { value: [0.5, 0.5] },
       strength: { value: 0.3, min: 0, softMax: 1 }
     },
@@ -8542,7 +8542,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));
@@ -8571,7 +8571,7 @@ vec4 colorHalftone_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
       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 }
@@ -8601,7 +8601,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);
 }
@@ -8616,7 +8616,7 @@ vec4 dotScreen_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
       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 }
@@ -8690,7 +8690,7 @@ vec4 edgeWork_sampleColor2(sampler2D source, vec2 texSize, vec2 texCoord) {
     name: "edgeWork",
     dependencies: [random],
     fs: fs16,
-    uniformPropTypes: {
+    propTypes: {
       radius: { value: 2, min: 1, softMax: 50 },
       delta: { value: [1, 0], private: true }
     },
@@ -8698,12 +8698,12 @@ vec4 edgeWork_sampleColor2(sampler2D source, vec2 texSize, vec2 texCoord) {
       {
         // @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] }
       }
     ]
   };
@@ -8763,7 +8763,7 @@ vec4 hexagonalPixelate_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord
       center: "vec2<f32>",
       scale: "f32"
     },
-    uniformPropTypes: {
+    propTypes: {
       center: { value: [0.5, 0.5], hint: "screenspace" },
       scale: { value: 10, min: 1, softMin: 5, softMax: 50 }
     },
@@ -8811,7 +8811,7 @@ vec4 ink_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
     uniformTypes: {
       strength: "f32"
     },
-    uniformPropTypes: {
+    propTypes: {
       strength: { value: 0.25, min: 0, softMax: 1 }
     },
     passes: [{ sampler: true }]
@@ -8851,7 +8851,7 @@ vec4 magnify_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
       borderWidthPixels: "f32",
       borderColor: "vec4<f32>"
     },
-    uniformPropTypes: {
+    propTypes: {
       // range 0 to 1
       screenXY: { value: [0, 0] },
       radiusPixels: 200,
@@ -8927,7 +8927,7 @@ vec4 bulgePinch_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
       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 }
@@ -8980,7 +8980,7 @@ vec4 swirl_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
       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 }
@@ -9572,7 +9572,7 @@ vec4 fxaa_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
 `;
   var fxaa = {
     name: "fxaa",
-    uniformPropTypes: {},
+    propTypes: {},
     fs: fs23,
     passes: [{ sampler: true }],
     getUniforms: (props) => props

package/dist/dist.min.js

@@ -8,20 +8,20 @@
   logdepth_adjustPosition(gl_Position);
 #endif
 `,yn=`#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
@@ -30,7 +30,7 @@
 `;var bi={vertex:bn,fragment:yn},wn=/void\s+main\s*\([^)]*\)\s*\{\n?/,Ln=/}\n?[^{}]*$/,ft=[],me="__LUMA_INJECT_DECLARATIONS__";function Pn(t){let e={vertex:{},fragment:{}};for(let n in t){let r=t[n],i=yi(n);typeof r=="string"&&(r={order:0,injection:r}),e[i][n]=r}return e}function yi(t){let e=t.slice(0,2);switch(e){case"vs":return"vertex";case"fs":return"fragment";default:throw new Error(e)}}function ge(t,e,n,r=!1){let i=e==="vertex";for(let o in n){let a=n[o];a.sort((u,_)=>u.order-_.order),ft.length=a.length;for(let u=0,_=a.length;u<_;++u)ft[u]=a[u].injection;let c=`${ft.join(`
 `)}
 `;switch(o){case"vs:#decl":i&&(t=t.replace(me,c));break;case"vs:#main-start":i&&(t=t.replace(wn,u=>u+c));break;case"vs:#main-end":i&&(t=t.replace(Ln,u=>c+u));break;case"fs:#decl":i||(t=t.replace(me,c));break;case"fs:#main-start":i||(t=t.replace(wn,u=>u+c));break;case"fs:#main-end":i||(t=t.replace(Ln,u=>c+u));break;default:t=t.replace(o,u=>u+c)}}return t=t.replace(me,""),r&&(t=t.replace(/\}\s*$/,o=>o+bi[e])),t}function Sn(t){let e={};return W(Array.isArray(t)&&t.length>1),t.forEach(n=>{for(let r in n)e[r]=e[r]?`${e[r]}
-${n[r]}`:n[r]}),e}function Y(t){t.map(e=>Me(e))}function Me(t){if(t.instance)return;Y(t.dependencies||[]);let{uniformPropTypes:e={},deprecations:n=[],inject:r={}}=t,i={normalizedInjections:Pn(r),parsedDeprecations:wi(n)};e&&(i.propValidators=vn(e)),t.instance=i}function kn(t,e,n){Me(t);let r=n||{...t.defaultUniforms};return t.getUniforms?t.getUniforms(e,r):An(e,t.instance?.propValidators,t.name)}function xe(t,e,n){t.deprecations?.forEach(r=>{r.regex?.test(e)&&(r.deprecated?n.deprecated(r.old,r.new)():n.removed(r.old,r.new)())})}function wi(t){return t.forEach(e=>{switch(e.type){case"function":e.regex=new RegExp(`\\b${e.old}\\(`);break;default:e.regex=new RegExp(`${e.type} ${e.old};`)}}),t}function ve(t){Y(t);let e={},n={};Ae({modules:t,level:0,moduleMap:e,moduleDepth:n});let r=Object.keys(n).sort((i,o)=>n[o]-n[i]).map(i=>e[i]);return Y(r),r}function Ae(t){let{modules:e,level:n,moduleMap:r,moduleDepth:i}=t;if(n>=5)throw new Error("Possible loop in shader dependency graph");for(let o of e)r[o.name]=o,(i[o.name]===void 0||i[o.name]<n)&&(i[o.name]=n);for(let o of e)o.dependencies&&Ae({modules:o.dependencies,level:n+1,moduleMap:r,moduleDepth:i})}function Li(t){Y(t);let e={},n={};return Ae({modules:t,level:0,moduleMap:e,moduleDepth:n}),t=Object.keys(n).sort((r,i)=>n[i]-n[r]).map(r=>e[r]),Y(t),t}function Tn(t){return Li(t)}function En(t){switch(t?.gpu.toLowerCase()){case"apple":return`#define APPLE_GPU
+${n[r]}`:n[r]}),e}function Y(t){t.map(e=>Me(e))}function Me(t){if(t.instance)return;Y(t.dependencies||[]);let{propTypes:e={},deprecations:n=[],inject:r={}}=t,i={normalizedInjections:Pn(r),parsedDeprecations:wi(n)};e&&(i.propValidators=vn(e)),t.instance=i}function kn(t,e,n){Me(t);let r=n||{...t.defaultUniforms};return e&&t.getUniforms?t.getUniforms(e,r):An(e,t.instance?.propValidators,t.name)}function xe(t,e,n){t.deprecations?.forEach(r=>{r.regex?.test(e)&&(r.deprecated?n.deprecated(r.old,r.new)():n.removed(r.old,r.new)())})}function wi(t){return t.forEach(e=>{switch(e.type){case"function":e.regex=new RegExp(`\\b${e.old}\\(`);break;default:e.regex=new RegExp(`${e.type} ${e.old};`)}}),t}function ve(t){Y(t);let e={},n={};Ae({modules:t,level:0,moduleMap:e,moduleDepth:n});let r=Object.keys(n).sort((i,o)=>n[o]-n[i]).map(i=>e[i]);return Y(r),r}function Ae(t){let{modules:e,level:n,moduleMap:r,moduleDepth:i}=t;if(n>=5)throw new Error("Possible loop in shader dependency graph");for(let o of e)r[o.name]=o,(i[o.name]===void 0||i[o.name]<n)&&(i[o.name]=n);for(let o of e)o.dependencies&&Ae({modules:o.dependencies,level:n+1,moduleMap:r,moduleDepth:i})}function Li(t){Y(t);let e={},n={};return Ae({modules:t,level:0,moduleMap:e,moduleDepth:n}),t=Object.keys(n).sort((r,i)=>n[i]-n[r]).map(r=>e[r]),Y(t),t}function Tn(t){return Li(t)}function En(t){switch(t?.gpu.toLowerCase()){case"apple":return`#define APPLE_GPU
 // Apple optimizes away the calculation necessary for emulated fp64
 #define LUMA_FP64_CODE_ELIMINATION_WORKAROUND 1
 #define LUMA_FP32_TAN_PRECISION_WORKAROUND 1
@@ -1241,7 +1241,7 @@ vec4 pbr_filterColor(vec4 colorUnused)
 // 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;
@@ -1265,10 +1265,10 @@ 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);
 }
-`,Mr={props:{},uniforms:{},name:"brightnessContrast",uniformTypes:{brightness:"f32",contrast:"f32"},uniformPropTypes:{brightness:{format:"f32",value:0,min:-1,max:1},contrast:{format:"f32",value:0,min:-1,max:1}},passes:[{filter:!0}],source:bo,fs:yo};var wo=`uniform denoiseUniforms {
+`,Mr={props:{},uniforms:{},name:"brightnessContrast",uniformTypes:{brightness:"f32",contrast:"f32"},defaultUniforms:{brightness:0,contrast:0},propTypes:{brightness:{format:"f32",value:0,min:-1,max:1},contrast:{format:"f32",value:0,min:-1,max:1}},passes:[{filter:!0}],source:bo,fs:yo};var wo=`uniform denoiseUniforms {
   float strength;
 } noise;
 
@@ -1290,7 +1290,7 @@ vec4 denoise_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
 
   return color / total;
 }
-`,Cr={props:{},uniforms:{},name:"denoise",uniformTypes:{strength:"f32"},uniformPropTypes:{strength:{format:"f32",value:.5,min:0,max:1}},fs:wo,passes:[{sampler:!0},{sampler:!0}]};var Lo=`uniform hueSaturationUniforms {
+`,Cr={props:{},uniforms:{},name:"denoise",uniformTypes:{strength:"f32"},propTypes:{strength:{format:"f32",value:.5,min:0,max:1}},fs:wo,passes:[{sampler:!0},{sampler:!0}]};var Lo=`uniform hueSaturationUniforms {
   float hue;
   float saturation;
 } hueSaturation;
@@ -1318,10 +1318,10 @@ 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);
 }
-`,Rr={props:{},uniforms:{},name:"hueSaturation",fs:Lo,uniformTypes:{hue:"f32",saturation:"f32"},uniformPropTypes:{hue:{value:0,min:-1,max:1},saturation:{value:0,min:-1,max:1}},passes:[{filter:!0}]};var Po=`uniform noiseUniforms {
+`,Rr={props:{},uniforms:{},name:"hueSaturation",fs:Lo,uniformTypes:{hue:"f32",saturation:"f32"},propTypes:{hue:{value:0,min:-1,max:1},saturation:{value:0,min:-1,max:1}},passes:[{filter:!0}]};var Po=`uniform noiseUniforms {
   float amount;
 } noise;
 
@@ -1329,18 +1329,14 @@ 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);
-}
-`,Or={props:{},uniforms:{},name:"noise",uniformTypes:{amount:"f32"},uniformPropTypes:{amount:{value:.5,min:0,max:1}},fs:Po,passes:[{filter:!0}]};var So=`uniform sepiaUniforms {
+`,Or={props:{},uniforms:{},name:"noise",uniformTypes:{amount:"f32"},propTypes:{amount:{value:.5,min:0,max:1}},fs:Po,passes:[{filter:!0}]};var So=`uniform sepiaUniforms {
   float amount;
 } sepia;
 
@@ -1357,10 +1353,10 @@ 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);
 }
-`,Ur={props:{},uniforms:{},name:"sepia",uniformTypes:{amount:"f32"},uniformPropTypes:{amount:{value:.5,min:0,max:1}},fs:So,passes:[{filter:!0}]};var ko=`uniform vibranceUniforms {
+`,Ur={props:{},uniforms:{},name:"sepia",uniformTypes:{amount:"f32"},propTypes:{amount:{value:.5,min:0,max:1}},fs:So,passes:[{filter:!0}]};var ko=`uniform vibranceUniforms {
   float amount;
 } vibrance;
 
@@ -1372,24 +1368,20 @@ 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);
 }
-`,zr={props:{},uniforms:{},name:"vibrance",uniformPropTypes:{amount:{value:0,min:-1,max:1}},fs:ko,passes:[{filter:!0}]};var To=`uniform vignetteUniforms {
+`,zr={props:{},uniforms:{},name:"vibrance",propTypes:{amount:{value:0,min:-1,max:1}},fs:ko,passes:[{filter:!0}]};var To=`uniform vignetteUniforms {
   float radius;
   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);
-}
-`,Dr={props:{},uniforms:{},name:"vignette",uniformTypes:{radius:"f32",amount:"f32"},uniformPropTypes:{radius:{value:.5,min:0,max:1},amount:{value:.5,min:0,max:1}},passes:[{filter:!0}],fs:To};var Eo=`uniform tiltShiftUniforms {
+`,Dr={props:{},uniforms:{},name:"vignette",uniformTypes:{radius:"f32",amount:"f32"},defaultUniforms:{radius:.5,amount:.5},propTypes:{radius:{value:.5,min:0,max:1},amount:{value:.5,min:0,max:1}},passes:[{filter:!0}],fs:To};var Eo=`uniform tiltShiftUniforms {
   float blurRadius;
   float gradientRadius;
   vec2 start;
@@ -1432,7 +1424,7 @@ vec4 tiltShift_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
 
   return color;
 }
-`,Br={props:{},uniforms:{},name:"tiltShift",dependencies:[Q],uniformTypes:{blurRadius:"f32",gradientRadius:"f32",start:"vec2<f32>",end:"vec2<f32>",invert:"i32"},uniformPropTypes:{blurRadius:{value:15,min:0,max:50},gradientRadius:{value:200,min:0,max:400},start:{value:[0,0]},end:{value:[1,1]},invert:{value:0,private:!0}},passes:[{sampler:!0,uniforms:{invert:0}},{sampler:!0,uniforms:{invert:1}}],fs:Eo};var No=`uniform triangleBlurUniforms {
+`,Br={props:{},uniforms:{},name:"tiltShift",dependencies:[Q],uniformTypes:{blurRadius:"f32",gradientRadius:"f32",start:"vec2<f32>",end:"vec2<f32>",invert:"i32"},propTypes:{blurRadius:{value:15,min:0,max:50},gradientRadius:{value:200,min:0,max:400},start:{value:[0,0]},end:{value:[1,1]},invert:{value:0,private:!0}},passes:[{sampler:!0,uniforms:{invert:0}},{sampler:!0,uniforms:{invert:1}}],fs:Eo};var No=`uniform triangleBlurUniforms {
   float radius;
   vec2 delta;
 } triangleBlur;
@@ -1465,7 +1457,7 @@ vec4 triangleBlur_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
 
   return color;
 }
-`,Xr={props:{},uniforms:{},name:"triangleBlur",uniformTypes:{radius:"f32",delta:"vec2<f32>"},uniformPropTypes:{radius:{value:20,min:0,softMax:100},delta:{value:[1,0],private:!0}},fs:No,dependencies:[Q],passes:[{sampler:!0,uniforms:{delta:[1,0]}},{sampler:!0,uniforms:{delta:[0,1]}}]};var Io=`
+`,Xr={props:{},uniforms:{},name:"triangleBlur",uniformTypes:{radius:"f32",delta:"vec2<f32>"},propTypes:{radius:{value:20,min:0,softMax:100},delta:{value:[1,0],private:!0}},fs:No,dependencies:[Q],passes:[{sampler:!0,uniforms:{delta:[1,0]}},{sampler:!0,uniforms:{delta:[0,1]}}]};var Io=`
 uniform zoomBlurUniforms {
   vec2 center;
   float strength;
@@ -1498,7 +1490,7 @@ vec4 zoomBlur_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
 
   return color;
 }
-`,Yr={props:{},uniforms:{},name:"zoomBlur",uniformTypes:{center:"vec2<f32>",strength:"f32"},uniformPropTypes:{center:{value:[.5,.5]},strength:{value:.3,min:0,softMax:1}},fs:Io,dependencies:[Q],passes:[{sampler:!0}]};var Fo=`uniform colorHalftoneUniforms {
+`,Yr={props:{},uniforms:{},name:"zoomBlur",uniformTypes:{center:"vec2<f32>",strength:"f32"},propTypes:{center:{value:[.5,.5]},strength:{value:.3,min:0,softMax:1}},fs:Io,dependencies:[Q],passes:[{sampler:!0}]};var Fo=`uniform colorHalftoneUniforms {
   vec2 center;
   float angle;
   float size;
@@ -1514,7 +1506,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));
@@ -1532,7 +1524,7 @@ vec4 colorHalftone_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
   k = clamp(k * 10.0 - 5.0 + pattern(colorHalftone.angle + 0.78539, scale, texSize, texCoord), 0.0, 1.0);
   return vec4(1.0 - cmy - k, color.a);
 }
-`,Qr={props:{},uniforms:{},name:"colorHalftone",uniformTypes:{center:"vec2<f32>",angle:"f32",size:"f32"},uniformPropTypes:{center:{value:[.5,.5]},angle:{value:1.1,softMin:0,softMax:Math.PI/2},size:{value:4,min:1,softMin:3,softMax:20}},fs:Fo,passes:[{filter:!0}]};var Mo=`uniform dotScreenUniforms {
+`,Qr={props:{},uniforms:{},name:"colorHalftone",uniformTypes:{center:"vec2<f32>",angle:"f32",size:"f32"},propTypes:{center:{value:[.5,.5]},angle:{value:1.1,softMin:0,softMax:Math.PI/2},size:{value:4,min:1,softMin:3,softMax:20}},fs:Fo,passes:[{filter:!0}]};var Mo=`uniform dotScreenUniforms {
   vec2 center;
   float angle;
   float size;
@@ -1550,11 +1542,11 @@ 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);
 }
-`,Gr={props:{},uniforms:{},name:"dotScreen",uniformTypes:{center:"vec2<f32>",angle:"f32",size:"f32"},uniformPropTypes:{center:{value:[.5,.5]},angle:{value:1.1,softMin:0,softMax:Math.PI/2},size:{value:3,min:1,softMin:3,softMax:20}},fs:Mo,passes:[{filter:!0}]};var Co=`uniform edgeWorkUniforms {
+`,Gr={props:{},uniforms:{},name:"dotScreen",uniformTypes:{center:"vec2<f32>",angle:"f32",size:"f32"},propTypes:{center:{value:[.5,.5]},angle:{value:1.1,softMin:0,softMax:Math.PI/2},size:{value:3,min:1,softMin:3,softMax:20}},fs:Mo,passes:[{filter:!0}]};var Co=`uniform edgeWorkUniforms {
   float radius;
   vec2 delta;
 } edgeWork;
@@ -1608,7 +1600,7 @@ vec4 edgeWork_sampleColor2(sampler2D source, vec2 texSize, vec2 texCoord) {
   float c = clamp(10000.0 * (color.y / total.y - color.x / total.x) + 0.5, 0.0, 1.0);
   return vec4(c, c, c, 1.0);
 }
-`,qr={props:{},uniforms:{},name:"edgeWork",dependencies:[Q],fs:Co,uniformPropTypes:{radius:{value:2,min:1,softMax:50},delta:{value:[1,0],private:!0}},passes:[{sampler:"edgeWork_sampleColor1",uniformPropTypes:{delta:[1,0]}},{sampler:"edgeWork_sampleColor2",uniformPropTypes:{delta:[0,1]}}]};var Ro=`uniform hexagonalPixelateUniforms {
+`,qr={props:{},uniforms:{},name:"edgeWork",dependencies:[Q],fs:Co,propTypes:{radius:{value:2,min:1,softMax:50},delta:{value:[1,0],private:!0}},passes:[{sampler:"edgeWork_sampleColor1",propTypes:{delta:[1,0]}},{sampler:"edgeWork_sampleColor2",propTypes:{delta:[0,1]}}]};var Ro=`uniform hexagonalPixelateUniforms {
   vec2 center;
   float scale;
 } hexagonalPixelate;
@@ -1650,7 +1642,7 @@ vec4 hexagonalPixelate_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord
 
   return texture(source, choice + hexagonalPixelate.center);
 }
-`,Hr={props:{},uniforms:{},name:"hexagonalPixelate",uniformTypes:{center:"vec2<f32>",scale:"f32"},uniformPropTypes:{center:{value:[.5,.5],hint:"screenspace"},scale:{value:10,min:1,softMin:5,softMax:50}},fs:Ro,passes:[{sampler:!0}]};var Oo=`uniform inkUniforms {
+`,Hr={props:{},uniforms:{},name:"hexagonalPixelate",uniformTypes:{center:"vec2<f32>",scale:"f32"},propTypes:{center:{value:[.5,.5],hint:"screenspace"},scale:{value:10,min:1,softMin:5,softMax:50}},fs:Ro,passes:[{sampler:!0}]};var Oo=`uniform inkUniforms {
   float strength;
 } ink;
 
@@ -1677,7 +1669,7 @@ vec4 ink_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
   float power = ink.strength * ink.strength * ink.strength * ink.strength * ink.strength;
   return vec4(color.rgb - dot(edge, edge) * power * 100000.0, color.a);
 }
-`,Vr={props:{},uniforms:{},name:"ink",fs:Oo,uniformTypes:{strength:"f32"},uniformPropTypes:{strength:{value:.25,min:0,softMax:1}},passes:[{sampler:!0}]};var Uo=`uniform magnifyUniforms {
+`,Vr={props:{},uniforms:{},name:"ink",fs:Oo,uniformTypes:{strength:"f32"},propTypes:{strength:{value:.25,min:0,softMax:1}},passes:[{sampler:!0}]};var Uo=`uniform magnifyUniforms {
   vec2 screenXY;
   float radiusPixels;
   float zoom;
@@ -1697,7 +1689,7 @@ vec4 magnify_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
   }
   return texture(source, texCoord);
 }
-`,Wr={name:"magnify",uniformTypes:{screenXY:"vec2<f32>",radiusPixels:"f32",zoom:"f32",borderWidthPixels:"f32",borderColor:"vec4<f32>"},uniformPropTypes:{screenXY:{value:[0,0]},radiusPixels:200,zoom:2,borderWidthPixels:0,borderColor:{value:[255,255,255,255]}},fs:Uo,passes:[{sampler:!0}]};var zo=`vec4 warp_sampleColor(sampler2D source, vec2 texSize, vec2 coord) {
+`,Wr={name:"magnify",uniformTypes:{screenXY:"vec2<f32>",radiusPixels:"f32",zoom:"f32",borderWidthPixels:"f32",borderColor:"vec4<f32>"},propTypes:{screenXY:{value:[0,0]},radiusPixels:200,zoom:2,borderWidthPixels:0,borderColor:{value:[255,255,255,255]}},fs:Uo,passes:[{sampler:!0}]};var zo=`vec4 warp_sampleColor(sampler2D source, vec2 texSize, vec2 coord) {
   vec4 color = texture(source, coord / texSize);
   vec2 clampedCoord = clamp(coord, vec2(0.0), texSize);
   if (coord != clampedCoord) {
@@ -1734,7 +1726,7 @@ vec4 bulgePinch_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
 
   return warp_sampleColor(source, texSize, coord);
 }
-`,jr={props:{},uniforms:{},name:"bulgePinch",dependencies:[_e],fs:Do,uniformTypes:{center:"vec2<f32>",radius:"f32",strength:"f32"},uniformPropTypes:{center:{value:[.5,.5]},radius:{value:200,min:1,softMax:600},strength:{value:.5,min:-1,max:1}},passes:[{sampler:!0}]};var Bo=`uniform swirlUniforms {
+`,jr={props:{},uniforms:{},name:"bulgePinch",dependencies:[_e],fs:Do,uniformTypes:{center:"vec2<f32>",radius:"f32",strength:"f32"},propTypes:{center:{value:[.5,.5]},radius:{value:200,min:1,softMax:600},strength:{value:.5,min:-1,max:1}},passes:[{sampler:!0}]};var Bo=`uniform swirlUniforms {
   float radius;
   float angle;
   vec2 center;
@@ -1763,7 +1755,7 @@ vec4 swirl_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
 
   return warp_sampleColor(source, texSize, coord);
 }
-`,$r={props:{},uniforms:{},name:"swirl",dependencies:[_e],fs:Bo,uniformTypes:{center:"vec2<f32>",radius:"f32",angle:"f32"},uniformPropTypes:{center:{value:[.5,.5]},radius:{value:200,min:1,softMax:600},angle:{value:3,softMin:-25,softMax:25}},passes:[{sampler:!0}]};var Xo=`
+`,$r={props:{},uniforms:{},name:"swirl",dependencies:[_e],fs:Bo,uniformTypes:{center:"vec2<f32>",radius:"f32",angle:"f32"},propTypes:{center:{value:[.5,.5]},radius:{value:200,min:1,softMax:600},angle:{value:3,softMin:-25,softMax:25}},passes:[{sampler:!0}]};var Xo=`
 #define FXAA_QUALITY_PRESET 29
 
 #if (FXAA_QUALITY_PRESET == 10)
@@ -2343,7 +2335,7 @@ vec4 fxaa_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
         fxaa_QualityEdgeThresholdMin
     );
 }
-`,Kr={name:"fxaa",uniformPropTypes:{},fs:Xo,passes:[{sampler:!0}],getUniforms:t=>t};var Zr=`uniform float ONE;
+`,Kr={name:"fxaa",propTypes:{},fs:Xo,passes:[{sampler:!0}],getUniforms:t=>t};var Zr=`uniform float ONE;
 
 /*
 About LUMA_FP64_CODE_ELIMINATION_WORKAROUND