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

package/dist/dist.dev.js

@@ -260,7 +260,7 @@ var __exports__ = (() => {
         throw new Error(type);
     }
   }
-  function injectShader(source, stage, inject, injectStandardStubs = false) {
+  function injectShader(source2, stage, inject, injectStandardStubs = false) {
     const isVertex = stage === "vertex";
     for (const key in inject) {
       const fragmentData = inject[key];
@@ -274,43 +274,43 @@ var __exports__ = (() => {
       switch (key) {
         case "vs:#decl":
           if (isVertex) {
-            source = source.replace(DECLARATION_INJECT_MARKER, fragmentString);
+            source2 = source2.replace(DECLARATION_INJECT_MARKER, fragmentString);
           }
           break;
         case "vs:#main-start":
           if (isVertex) {
-            source = source.replace(REGEX_START_OF_MAIN, (match) => match + fragmentString);
+            source2 = source2.replace(REGEX_START_OF_MAIN, (match) => match + fragmentString);
           }
           break;
         case "vs:#main-end":
           if (isVertex) {
-            source = source.replace(REGEX_END_OF_MAIN, (match) => fragmentString + match);
+            source2 = source2.replace(REGEX_END_OF_MAIN, (match) => fragmentString + match);
           }
           break;
         case "fs:#decl":
           if (!isVertex) {
-            source = source.replace(DECLARATION_INJECT_MARKER, fragmentString);
+            source2 = source2.replace(DECLARATION_INJECT_MARKER, fragmentString);
           }
           break;
         case "fs:#main-start":
           if (!isVertex) {
-            source = source.replace(REGEX_START_OF_MAIN, (match) => match + fragmentString);
+            source2 = source2.replace(REGEX_START_OF_MAIN, (match) => match + fragmentString);
           }
           break;
         case "fs:#main-end":
           if (!isVertex) {
-            source = source.replace(REGEX_END_OF_MAIN, (match) => fragmentString + match);
+            source2 = source2.replace(REGEX_END_OF_MAIN, (match) => fragmentString + match);
           }
           break;
         default:
-          source = source.replace(key, (match) => match + fragmentString);
+          source2 = source2.replace(key, (match) => match + fragmentString);
       }
     }
-    source = source.replace(DECLARATION_INJECT_MARKER, "");
+    source2 = source2.replace(DECLARATION_INJECT_MARKER, "");
     if (injectStandardStubs) {
-      source = source.replace(/\}\s*$/, (match) => match + MODULE_INJECTORS[stage]);
+      source2 = source2.replace(/\}\s*$/, (match) => match + MODULE_INJECTORS[stage]);
     }
-    return source;
+    return source2;
   }
   function combineInjects(injects) {
     const result = {};
@@ -476,18 +476,18 @@ ${inject[key]}` : inject[key];
   }
 
   // src/lib/shader-transpiler/transpile-glsl-shader.ts
-  function transpileGLSLShader(source, stage) {
-    const sourceGLSLVersion = Number(source.match(/^#version[ \t]+(\d+)/m)?.[1] || 100);
+  function transpileGLSLShader(source2, stage) {
+    const sourceGLSLVersion = Number(source2.match(/^#version[ \t]+(\d+)/m)?.[1] || 100);
     if (sourceGLSLVersion !== 300) {
       throw new Error("luma.gl v9 only supports GLSL 3.00 shader sources");
     }
     switch (stage) {
       case "vertex":
-        source = convertShader(source, ES300_VERTEX_REPLACEMENTS);
-        return source;
+        source2 = convertShader(source2, ES300_VERTEX_REPLACEMENTS);
+        return source2;
       case "fragment":
-        source = convertShader(source, ES300_FRAGMENT_REPLACEMENTS);
-        return source;
+        source2 = convertShader(source2, ES300_FRAGMENT_REPLACEMENTS);
+        return source2;
       default:
         throw new Error(stage);
     }
@@ -511,11 +511,11 @@ ${inject[key]}` : inject[key];
     // `varying` keyword replaced with `in`
     [makeVariableTextRegExp("varying"), "in $1"]
   ];
-  function convertShader(source, replacements) {
+  function convertShader(source2, replacements) {
     for (const [pattern, replacement] of replacements) {
-      source = source.replace(pattern, replacement);
+      source2 = source2.replace(pattern, replacement);
     }
-    return source;
+    return source2;
   }
   function makeVariableTextRegExp(qualifier) {
     return new RegExp(`\\b${qualifier}[ \\t]+(\\w+[ \\t]+\\w+(\\[\\w+\\])?;)`, "g");
@@ -577,11 +577,11 @@ ${inject[key]}` : inject[key];
   }
 
   // src/lib/glsl-utils/get-shader-info.ts
-  function getShaderInfo(source, defaultName) {
+  function getShaderInfo(source2, defaultName) {
     return {
-      name: getShaderName(source, defaultName),
+      name: getShaderName(source2, defaultName),
       language: "glsl",
-      version: getShaderVersion(source)
+      version: getShaderVersion(source2)
     };
   }
   function getShaderName(shader, defaultName = "unnamed") {
@@ -589,9 +589,9 @@ ${inject[key]}` : inject[key];
     const match = SHADER_NAME_REGEXP.exec(shader);
     return match ? match[1] : defaultName;
   }
-  function getShaderVersion(source) {
+  function getShaderVersion(source2) {
     let version = 100;
-    const words = source.match(/[^\s]+/g);
+    const words = source2.match(/[^\s]+/g);
     if (words && words.length >= 2 && words[0] === "#version") {
       const parsedVersion = parseInt(words[1], 10);
       if (Number.isFinite(parsedVersion)) {
@@ -649,7 +649,7 @@ ${DECLARATION_INJECT_MARKER}
   function assembleShaderWGSL(platformInfo, options) {
     const {
       // id,
-      source,
+      source: source2,
       stage,
       modules,
       // defines = {},
@@ -657,8 +657,8 @@ ${DECLARATION_INJECT_MARKER}
       inject = {},
       log: log2
     } = options;
-    assert(typeof source === "string", "shader source must be a string");
-    const coreSource = source;
+    assert(typeof source2 === "string", "shader source must be a string");
+    const coreSource = source2;
     let assembledSource = "";
     const hookFunctionMap = normalizeShaderHooks(hookFunctions);
     const hookInjections = {};
@@ -714,7 +714,7 @@ ${DECLARATION_INJECT_MARKER}
   function assembleShaderGLSL(platformInfo, options) {
     const {
       id,
-      source,
+      source: source2,
       stage,
       language = "glsl",
       modules,
@@ -724,11 +724,11 @@ ${DECLARATION_INJECT_MARKER}
       prologue = true,
       log: log2
     } = options;
-    assert(typeof source === "string", "shader source must be a string");
-    const sourceVersion = language === "glsl" ? getShaderInfo(source).version : -1;
+    assert(typeof source2 === "string", "shader source must be a string");
+    const sourceVersion = language === "glsl" ? getShaderInfo(source2).version : -1;
     const targetVersion = platformInfo.shaderLanguageVersion;
     const sourceVersionDirective = sourceVersion === 100 ? "#version 100" : "#version 300 es";
-    const sourceLines = source.split("\n");
+    const sourceLines = source2.split("\n");
     const coreSource = sourceLines.slice(1).join("\n");
     const allDefines = {};
     modules.forEach((module) => {
@@ -743,7 +743,7 @@ ${DECLARATION_INJECT_MARKER}
         assembledSource = prologue ? `${sourceVersionDirective}
 
 // ----- PROLOGUE -------------------------
-${getShaderNameDefine({ id, source, stage })}
+${getShaderNameDefine({ id, source: source2, stage })}
 ${`#define SHADER_TYPE_${stage.toUpperCase()}`}
 
 ${getPlatformShaderDefines(platformInfo)}
@@ -822,8 +822,8 @@ ${getApplicationDefines(allDefines)}
     };
   }
   function getShaderNameDefine(options) {
-    const { id, source, stage } = options;
-    const injectShaderName = id && source.indexOf("SHADER_NAME") === -1;
+    const { id, source: source2, stage } = options;
+    const injectShaderName = id && source2.indexOf("SHADER_NAME") === -1;
     return injectShaderName ? `
 #define SHADER_NAME ${id}_${stage}` : "";
   }
@@ -857,23 +857,23 @@ ${getApplicationDefines(allDefines)}
       throw new Error("Shader module must have a name");
     }
     const moduleName = module.name.toUpperCase().replace(/[^0-9a-z]/gi, "_");
-    let source = `// ----- MODULE ${module.name} ---------------
+    let source2 = `// ----- MODULE ${module.name} ---------------
 
 `;
     if (stage !== "wgsl") {
-      source += `#define MODULE_${moduleName}
+      source2 += `#define MODULE_${moduleName}
 `;
     }
-    source += `${moduleSource}
+    source2 += `${moduleSource}
 `;
-    return source;
+    return source2;
   }
 
   // src/lib/preprocessor/preprocessor.ts
   var IFDEF_REGEXP = /^\s*\#\s*ifdef\s*([a-zA-Z_]+)\s*$/;
   var ENDIF_REGEXP = /^\s*\#\s*endif\s*$/;
-  function preprocess(source, options) {
-    const lines = source.split("\n");
+  function preprocess(source2, options) {
+    const lines = source2.split("\n");
     const output = [];
     let conditional = true;
     let currentDefine = null;
@@ -943,14 +943,14 @@ ${getApplicationDefines(allDefines)}
     assembleWGSLShader(props) {
       const modules = this._getModuleList(props.modules);
       const hookFunctions = this._hookFunctions;
-      const { source, getUniforms: getUniforms9 } = assembleWGSLShader({
+      const { source: source2, getUniforms: getUniforms9 } = assembleWGSLShader({
         ...props,
         // @ts-expect-error
         source: props.source,
         modules,
         hookFunctions
       });
-      const preprocessedSource = props.platformInfo.shaderLanguage === "wgsl" ? preprocess(source) : source;
+      const preprocessedSource = props.platformInfo.shaderLanguage === "wgsl" ? preprocess(source2) : source2;
       return { source: preprocessedSource, getUniforms: getUniforms9, modules };
     }
     /**
@@ -2510,12 +2510,12 @@ void main() {
     }
   };
   var WgslScanner = class {
-    constructor(source) {
+    constructor(source2) {
       this._tokens = [];
       this._start = 0;
       this._current = 0;
       this._line = 1;
-      this._source = source !== null && source !== void 0 ? source : "";
+      this._source = source2 !== null && source2 !== void 0 ? source2 : "";
     }
     /// Scan all tokens from the source.
     scanTokens() {
@@ -4626,11 +4626,11 @@ void main() {
   });
 
   // src/lib/wgsl/get-shader-layout-wgsl.ts
-  function getShaderLayoutFromWGSL(source) {
+  function getShaderLayoutFromWGSL(source2) {
     const shaderLayout = { attributes: [], bindings: [] };
     let parsedWGSL;
     try {
-      parsedWGSL = parseWGSL(source);
+      parsedWGSL = parseWGSL(source2);
     } catch (error) {
       import_core.log.error(error.message)();
       return shaderLayout;
@@ -4670,9 +4670,9 @@ void main() {
   function getType(type) {
     return type.format ? `${type.name}<${type.format.name}>` : type.name;
   }
-  function parseWGSL(source) {
+  function parseWGSL(source2) {
     try {
-      return new WgslReflect(source);
+      return new WgslReflect(source2);
     } catch (error) {
       if (error instanceof Error) {
         throw error;
@@ -8041,11 +8041,31 @@ vec4 pbr_filterColor(vec4 colorUnused)
     }
   };
 
-  // src/modules/postprocessing/image-adjust-filters/brightnesscontrast.ts
+  // src/passes/postprocessing/image-adjust-filters/brightnesscontrast.ts
+  var source = (
+    /* wgsl */
+    `struct brightnessContrastUniforms {
+  float brightness;
+  float contrast;
+};
+
+// 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> {
+  color.rgb += brightnessContrast.brightness;
+  if (brightnessContrast.contrast > 0.0) {
+    color.rgb = (color.rgb - 0.5) / (1.0 - brightnessContrast.contrast) + 0.5;
+  } else {
+    color.rgb = (color.rgb - 0.5) * (1.0 + brightnessContrast.contrast) + 0.5;
+  }
+  return color;
+}
+`
+  );
   var fs4 = (
     /* glsl */
-    `
-uniform brightnessContrastUniforms {
+    `uniform brightnessContrastUniforms {
   float brightness;
   float contrast;
 } brightnessContrast;
@@ -8077,11 +8097,12 @@ vec4 brightnessContrast_filterColor(vec4 color, vec2 texSize, vec2 texCoords) {
       brightness: { format: "f32", value: 0, min: -1, max: 1 },
       contrast: { format: "f32", value: 0, min: -1, max: 1 }
     },
-    fs: fs4,
-    passes: [{ filter: true }]
+    passes: [{ filter: true }],
+    source,
+    fs: fs4
   };
 
-  // src/modules/postprocessing/image-adjust-filters/denoise.ts
+  // src/passes/postprocessing/image-adjust-filters/denoise.ts
   var fs5 = (
     /* glsl */
     `uniform denoiseUniforms {
@@ -8123,7 +8144,7 @@ vec4 denoise_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
     passes: [{ sampler: true }, { sampler: true }]
   };
 
-  // src/modules/postprocessing/image-adjust-filters/huesaturation.ts
+  // src/passes/postprocessing/image-adjust-filters/huesaturation.ts
   var fs6 = (
     /* glsl */
     `uniform hueSaturationUniforms {
@@ -8175,7 +8196,7 @@ vec4 hueSaturation_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
     passes: [{ filter: true }]
   };
 
-  // src/modules/postprocessing/image-adjust-filters/noise.ts
+  // src/passes/postprocessing/image-adjust-filters/noise.ts
   var fs7 = (
     /* glsl */
     `uniform noiseUniforms {
@@ -8213,7 +8234,7 @@ vec4 noise_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
     passes: [{ filter: true }]
   };
 
-  // src/modules/postprocessing/image-adjust-filters/sepia.ts
+  // src/passes/postprocessing/image-adjust-filters/sepia.ts
   var fs8 = (
     /* glsl */
     `uniform sepiaUniforms {
@@ -8252,7 +8273,7 @@ vec4 sepia_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
     passes: [{ filter: true }]
   };
 
-  // src/modules/postprocessing/image-adjust-filters/vibrance.ts
+  // src/passes/postprocessing/image-adjust-filters/vibrance.ts
   var fs9 = (
     /* glsl */
     `uniform vibranceUniforms {
@@ -8283,7 +8304,7 @@ vec4 vibrance_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
     passes: [{ filter: true }]
   };
 
-  // src/modules/postprocessing/image-adjust-filters/vignette.ts
+  // src/passes/postprocessing/image-adjust-filters/vignette.ts
   var fs10 = (
     /* glsl */
     `uniform vignetteUniforms {
@@ -8318,7 +8339,7 @@ vec4 vignette_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
     fs: fs10
   };
 
-  // src/modules/postprocessing/image-blur-filters/tiltshift.ts
+  // src/passes/postprocessing/image-blur-filters/tiltshift.ts
   var fs11 = (
     /* glsl */
     `uniform tiltShiftUniforms {
@@ -8383,16 +8404,16 @@ vec4 tiltShift_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
       gradientRadius: { value: 200, min: 0, max: 400 },
       start: { value: [0, 0] },
       end: { value: [1, 1] },
-      invert: { value: false, private: true }
+      invert: { value: 0, private: true }
     },
     passes: [
-      { sampler: true, uniforms: { invert: false } },
-      { sampler: true, uniforms: { invert: true } }
+      { sampler: true, uniforms: { invert: 0 } },
+      { sampler: true, uniforms: { invert: 1 } }
     ],
     fs: fs11
   };
 
-  // src/modules/postprocessing/image-blur-filters/triangleblur.ts
+  // src/passes/postprocessing/image-blur-filters/triangleblur.ts
   var fs12 = (
     /* glsl */
     `uniform triangleBlurUniforms {
@@ -8450,7 +8471,7 @@ vec4 triangleBlur_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
     ]
   };
 
-  // src/modules/postprocessing/image-blur-filters/zoomblur.ts
+  // src/passes/postprocessing/image-blur-filters/zoomblur.ts
   var fs13 = `
 uniform zoomBlurUniforms {
   vec2 center;
@@ -8502,7 +8523,7 @@ vec4 zoomBlur_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
     passes: [{ sampler: true }]
   };
 
-  // src/modules/postprocessing/image-fun-filters/colorhalftone.ts
+  // src/passes/postprocessing/image-fun-filters/colorhalftone.ts
   var fs14 = (
     /* glsl */
     `uniform colorHalftoneUniforms {
@@ -8559,7 +8580,7 @@ vec4 colorHalftone_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
     passes: [{ filter: true }]
   };
 
-  // src/modules/postprocessing/image-fun-filters/dotscreen.ts
+  // src/passes/postprocessing/image-fun-filters/dotscreen.ts
   var fs15 = (
     /* glsl */
     `uniform dotScreenUniforms {
@@ -8604,7 +8625,7 @@ vec4 dotScreen_filterColor(vec4 color, vec2 texSize, vec2 texCoord) {
     passes: [{ filter: true }]
   };
 
-  // src/modules/postprocessing/image-fun-filters/edgework.ts
+  // src/passes/postprocessing/image-fun-filters/edgework.ts
   var fs16 = (
     /* glsl */
     `uniform edgeWorkUniforms {
@@ -8687,7 +8708,7 @@ vec4 edgeWork_sampleColor2(sampler2D source, vec2 texSize, vec2 texCoord) {
     ]
   };
 
-  // src/modules/postprocessing/image-fun-filters/hexagonalpixelate.ts
+  // src/passes/postprocessing/image-fun-filters/hexagonalpixelate.ts
   var fs17 = (
     /* glsl */
     `uniform hexagonalPixelateUniforms {
@@ -8750,7 +8771,7 @@ vec4 hexagonalPixelate_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord
     passes: [{ sampler: true }]
   };
 
-  // src/modules/postprocessing/image-fun-filters/ink.ts
+  // src/passes/postprocessing/image-fun-filters/ink.ts
   var fs18 = (
     /* glsl */
     `uniform inkUniforms {
@@ -8796,7 +8817,7 @@ vec4 ink_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
     passes: [{ sampler: true }]
   };
 
-  // src/modules/postprocessing/image-fun-filters/magnify.ts
+  // src/passes/postprocessing/image-fun-filters/magnify.ts
   var fs19 = (
     /* glsl */
     `uniform magnifyUniforms {
@@ -8842,7 +8863,7 @@ vec4 magnify_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
     passes: [{ sampler: true }]
   };
 
-  // src/modules/postprocessing/image-warp-filters/warp.ts
+  // src/passes/postprocessing/image-warp-filters/warp.ts
   var fs20 = (
     /* glsl */
     `vec4 warp_sampleColor(sampler2D source, vec2 texSize, vec2 coord) {
@@ -8863,7 +8884,7 @@ vec4 magnify_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
     fs: fs20
   };
 
-  // src/modules/postprocessing/image-warp-filters/bulgepinch.ts
+  // src/passes/postprocessing/image-warp-filters/bulgepinch.ts
   var fs21 = (
     /* glsl */
     `uniform bulgePinchUniforms {
@@ -8914,7 +8935,7 @@ vec4 bulgePinch_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
     passes: [{ sampler: true }]
   };
 
-  // src/modules/postprocessing/image-warp-filters/swirl.ts
+  // src/passes/postprocessing/image-warp-filters/swirl.ts
   var fs22 = (
     /* glsl */
     `uniform swirlUniforms {
@@ -8967,7 +8988,7 @@ vec4 swirl_sampleColor(sampler2D source, vec2 texSize, vec2 texCoord) {
     passes: [{ sampler: true }]
   };
 
-  // src/modules/postprocessing/fxaa/fxaa.ts
+  // src/passes/postprocessing/fxaa/fxaa.ts
   var fs23 = `
 #define FXAA_QUALITY_PRESET 29