@luma.gl/shadertools 9.1.0-alpha.1 → 9.1.0-alpha.10

package/src/modules/postprocessing/image-warp-filters/warp.ts

@@ -3,9 +3,8 @@
 // Copyright (c) vis.gl contributors
 
 import {ShaderPass} from '../../../lib/shader-module/shader-pass';
-import {glsl} from '../../../lib/glsl-utils/highlight';
 
-const fs = glsl`\
+const fs = /* glsl */ `\
 vec4 warp_sampleColor(sampler2D source, vec2 texSize, vec2 coord) {
   vec4 color = texture(source, coord / texSize);
   vec2 clampedCoord = clamp(coord, vec2(0.0), texSize);
@@ -20,6 +19,8 @@ vec4 warp_sampleColor(sampler2D source, vec2 texSize, vec2 coord) {
 
 export type WarpProps = {};
 
+export type WarpUniforms = WarpProps;
+
 export const warp = {
   name: 'warp',
   passes: [],

package/src/modules-webgl1/geometry/geometry.ts

@@ -1,8 +1,7 @@
 // import {ShaderModule} from '../../types';
-import {glsl} from '../../lib/glsl-utils/highlight';
 
 // TODO - reuse normal from geometry module
-const vs = glsl`\
+const vs = /* glsl */ `\
 varying vec4 geometry_vPosition;
 varying vec3 geometry_vNormal;
 
@@ -19,7 +18,7 @@ void geometry_setPosition(vec3 position) {
 }
 `;
 
-const fs = glsl`\
+const fs = /* glsl */ `\
 varying vec4 geometry_vPosition;
 varying vec3 geometry_vNormal;
 

package/src/modules-webgl1/lighting/dirlight/dirlight.ts

@@ -3,7 +3,6 @@
 // Copyright (c) vis.gl contributors
 
 import {ShaderModule} from '../../../lib/shader-module/shader-module';
-import {glsl} from '../../../lib/glsl-utils/highlight';
 import type {NumberArray} from '../../../types';
 import {project} from '../../project/project';
 
@@ -26,7 +25,7 @@ function getUniforms(opts: DirlightOptions = DEFAULT_MODULE_OPTIONS): Record<str
   return uniforms;
 }
 
-const fs = glsl`\
+const fs = /* glsl */ `\
 uniform vec3 dirlight_uLightDirection;
 
 /*

package/src/modules-webgl1/lighting/lights/lights-glsl.ts

@@ -2,9 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {glsl} from '../../../lib/glsl-utils/highlight';
-
-export const lightingShader = glsl`\
+export const lightingShader = /* glsl */ `\
 #if (defined(SHADER_TYPE_FRAGMENT) && defined(LIGHTING_FRAGMENT)) || (defined(SHADER_TYPE_VERTEX) && defined(LIGHTING_VERTEX))
 
 struct AmbientLight {

package/src/modules-webgl1/lighting/pbr/pbr-fragment-glsl.ts

@@ -10,9 +10,8 @@
 //
 
 // TODO - better do the checks outside of shader
-import {glsl} from '../../../lib/glsl-utils/highlight';
 
-export const fs = glsl`\
+export const fs = /* glsl */ `\
 precision highp float;
 
 uniform bool pbr_uUnlit;

package/src/modules-webgl1/lighting/pbr/pbr-vertex-glsl.ts

@@ -2,9 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {glsl} from '../../../lib/glsl-utils/highlight';
-
-export const vs = glsl`\
+export const vs = /* glsl */ `\
 uniform mat4 u_MVPMatrix;
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_NormalMatrix;

package/src/modules-webgl1/lighting/phong-lighting/phong-lighting-glsl.ts

@@ -2,9 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {glsl} from '../../../lib/glsl-utils/highlight';
-
-export const lightingShader = glsl`\
+export const lightingShader = /* glsl */ `\
 
 uniform float lighting_uAmbient;
 uniform float lighting_uDiffuse;

package/src/modules-webgl1/math/fp64/fp64-arithmetic-glsl.ts

@@ -2,9 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {glsl} from '../../../lib/glsl-utils/highlight';
-
-export const fp64arithmeticShader = glsl`\
+export const fp64arithmeticShader = /* glsl */ `\
 uniform float ONE;
 
 /*

package/src/modules-webgl1/math/fp64/fp64-functions-glsl.ts

@@ -2,9 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {glsl} from '../../../lib/glsl-utils/highlight';
-
-export const fp64functionShader = glsl`\
+export const fp64functionShader = /* glsl */ `\
 const vec2 E_FP64 = vec2(2.7182817459106445e+00, 8.254840366817007e-08);
 const vec2 LOG2_FP64 = vec2(0.6931471824645996e+00, -1.9046542121259336e-09);
 const vec2 PI_FP64 = vec2(3.1415927410125732, -8.742278012618954e-8);

package/src/modules-webgl1/project/project.ts

@@ -3,7 +3,6 @@
 // Copyright (c) vis.gl contributors
 
 import {Matrix4} from '@math.gl/core';
-import {glsl} from '../../lib/glsl-utils/highlight';
 import {ShaderModule} from '../../lib/shader-module/shader-module';
 
 type ProjectionProps = {
@@ -51,7 +50,7 @@ function getUniforms(opts: ProjectionProps = DEFAULT_MODULE_OPTIONS, prevUniform
   return uniforms;
 }
 
-const common = glsl`\
+const common = /* glsl */ `\
 varying vec4 project_vPositionWorld;
 varying vec3 project_vNormalWorld;
 

package/dist/lib/glsl-utils/highlight.d.ts

@@ -1,6 +0,0 @@
-/**
- * Marks GLSL shaders for syntax highlighting: glsl`...`
- * Install https://marketplace.visualstudio.com/items?itemName=boyswan.glsl-literal
- */
-export declare const glsl: (x: TemplateStringsArray) => string;
-//# sourceMappingURL=highlight.d.ts.map

package/dist/lib/glsl-utils/highlight.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"highlight.d.ts","sourceRoot":"","sources":["../../../src/lib/glsl-utils/highlight.ts"],"names":[],"mappings":"AAMA;;;GAGG;AACH,eAAO,MAAM,IAAI,MAAO,oBAAoB,WAAW,CAAC"}

package/dist/lib/glsl-utils/highlight.js

@@ -1,9 +0,0 @@
-// luma.gl
-// SPDX-License-Identifier: MIT
-// Copyright (c) vis.gl contributors
-// SHADER HELPERS
-/**
- * Marks GLSL shaders for syntax highlighting: glsl`...`
- * Install https://marketplace.visualstudio.com/items?itemName=boyswan.glsl-literal
- */
-export const glsl = (x) => `${x}`;

package/dist/lib/shader-assembly/resolve-modules.d.ts

@@ -1,40 +0,0 @@
-import type { ShaderModule } from "../shader-module/shader-module.js";
-import { ShaderModuleInstance } from "../shader-module/shader-module-instance.js";
-/**
- * Instantiate shader modules and esolve any dependencies
- */
-export declare function resolveModules(modules: (ShaderModule | ShaderModuleInstance)[]): ShaderModuleInstance[];
-/**
- * Takes a list of shader module names and returns a new list of
- * shader module names that includes all dependencies, sorted so
- * that modules that are dependencies of other modules come first.
- *
- * If the shader glsl code from the returned modules is concatenated
- * in the reverse order, it is guaranteed that all functions be resolved and
- * that all function and variable definitions come before use.
- *
- * @param modules - Array of modules (inline modules or module names)
- * @return - Array of modules
- */
-declare function getShaderDependencies(modules: ShaderModuleInstance[]): ShaderModuleInstance[];
-/**
- * Recursively checks module dependencies to calculate dependency level of each module.
- *
- * @param options.modules - Array of modules
- * @param options.level - Current level
- * @param options.moduleMap -
- * @param options.moduleDepth - Current level
- * @return - Map of module name to its level
- */
-export declare function getDependencyGraph(options: {
-    modules: ShaderModuleInstance[];
-    level: number;
-    moduleMap: Record<string, ShaderModuleInstance>;
-    moduleDepth: Record<string, number>;
-}): void;
-export declare const TEST_EXPORTS: {
-    getShaderDependencies: typeof getShaderDependencies;
-    getDependencyGraph: typeof getDependencyGraph;
-};
-export {};
-//# sourceMappingURL=resolve-modules.d.ts.map

package/dist/lib/shader-assembly/resolve-modules.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"resolve-modules.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-assembly/resolve-modules.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAC,0CAAuC;AACjE,OAAO,EAAC,oBAAoB,EAAC,mDAAgD;AAE7E;;GAEG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,CAAC,YAAY,GAAG,oBAAoB,CAAC,EAAE,GAC/C,oBAAoB,EAAE,CAGxB;AAED;;;;;;;;;;;GAWG;AACH,iBAAS,qBAAqB,CAAC,OAAO,EAAE,oBAAoB,EAAE,GAAG,oBAAoB,EAAE,CAStF;AAED;;;;;;;;GAQG;AAEH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IAC1C,OAAO,EAAE,oBAAoB,EAAE,CAAC;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IAChD,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC,QAoBA;AAED,eAAO,MAAM,YAAY;;;CAGxB,CAAC"}

package/dist/lib/shader-module/normalize-shader-module.d.ts

@@ -1,3 +0,0 @@
-import { ShaderModule } from "./shader-module.js";
-export declare function normalizeShaderModule(module: ShaderModule): ShaderModule;
-//# sourceMappingURL=normalize-shader-module.d.ts.map

package/dist/lib/shader-module/normalize-shader-module.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"normalize-shader-module.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-module/normalize-shader-module.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAC,2BAAwB;AAG7C,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,YAAY,GAAG,YAAY,CASxE"}

package/dist/lib/shader-module/normalize-shader-module.js

@@ -1,14 +0,0 @@
-// luma.gl
-// SPDX-License-Identifier: MIT
-// Copyright (c) vis.gl contributors
-import { ShaderModuleInstance } from "./shader-module-instance.js";
-export function normalizeShaderModule(module) {
-    if (!module.normalized) {
-        module.normalized = true;
-        if (module.uniformPropTypes && !module.getUniforms) {
-            const shaderModule = new ShaderModuleInstance(module);
-            module.getUniforms = shaderModule.getUniforms.bind(shaderModule);
-        }
-    }
-    return module;
-}

package/dist/lib/shader-module/shader-module-instance.d.ts

@@ -1,28 +0,0 @@
-import { PropValidator } from "../filters/prop-types.js";
-import { ShaderModule, ShaderModuleDeprecation } from "./shader-module.js";
-import { ShaderInjection } from "../shader-assembly/shader-injections.js";
-/** An initialized ShaderModule, ready to use with `assembleShaders()` */
-export declare class ShaderModuleInstance {
-    name: string;
-    vs?: string;
-    fs?: string;
-    getModuleUniforms: Function;
-    dependencies: ShaderModuleInstance[];
-    deprecations: ShaderModuleDeprecation[];
-    defines: Record<string, string | number>;
-    injections: {
-        vertex: Record<string, ShaderInjection>;
-        fragment: Record<string, ShaderInjection>;
-    };
-    uniforms: Record<string, PropValidator>;
-    uniformTypes: Record<string, PropValidator>;
-    static instantiateModules(modules: (ShaderModule | ShaderModuleInstance)[]): ShaderModuleInstance[];
-    constructor(props: ShaderModule);
-    getModuleSource(stage: 'vertex' | 'fragment'): string;
-    getUniforms(userProps: Record<string, any>, uniforms: Record<string, any>): Record<string, any>;
-    getDefines(): Record<string, string | number>;
-    checkDeprecations(shaderSource: string, log: any): void;
-    _parseDeprecationDefinitions(deprecations: ShaderModuleDeprecation[]): ShaderModuleDeprecation[];
-    _defaultGetUniforms(opts?: Record<string, any>): Record<string, any>;
-}
-//# sourceMappingURL=shader-module-instance.d.ts.map

package/dist/lib/shader-module/shader-module-instance.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"shader-module-instance.d.ts","sourceRoot":"","sources":["../../../src/lib/shader-module/shader-module-instance.ts"],"names":[],"mappings":"AAKA,OAAO,EAA6C,aAAa,EAAC,iCAA8B;AAChG,OAAO,EAAC,YAAY,EAAE,uBAAuB,EAAC,2BAAwB;AACtE,OAAO,EAAC,eAAe,EAAsB,gDAA6C;AAI1F,yEAAyE;AACzE,qBAAa,oBAAoB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,iBAAiB,EAAE,QAAQ,CAAC;IAC5B,YAAY,EAAE,oBAAoB,EAAE,CAAC;IACrC,YAAY,EAAE,uBAAuB,EAAE,CAAC;IACxC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IACzC,UAAU,EAAE;QACV,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QACxC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;KAC3C,CAAC;IACF,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAM;IAC7C,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAM;IAEjD,MAAM,CAAC,kBAAkB,CACvB,OAAO,EAAE,CAAC,YAAY,GAAG,oBAAoB,CAAC,EAAE,GAC/C,oBAAoB,EAAE;gBA2Bb,KAAK,EAAE,YAAY;IA6B/B,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,UAAU,GAAG,MAAM;IAwBrD,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAQ/F,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IAK7C,iBAAiB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI;IAYvD,4BAA4B,CAAC,YAAY,EAAE,uBAAuB,EAAE;IAcpE,mBAAmB,CAAC,IAAI,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;CAkBzE"}

package/dist/lib/shader-module/shader-module-instance.js

@@ -1,126 +0,0 @@
-// luma.gl
-// SPDX-License-Identifier: MIT
-// Copyright (c) vis.gl contributors
-import { assert } from "../utils/assert.js";
-import { makePropValidators, getValidatedProperties } from "../filters/prop-types.js";
-import { normalizeInjections } from "../shader-assembly/shader-injections.js";
-let index = 1;
-/** An initialized ShaderModule, ready to use with `assembleShaders()` */
-export class ShaderModuleInstance {
-    name;
-    vs;
-    fs;
-    getModuleUniforms;
-    dependencies;
-    deprecations;
-    defines;
-    injections;
-    uniforms = {};
-    uniformTypes = {};
-    static instantiateModules(modules) {
-        return modules.map((module) => {
-            if (module instanceof ShaderModuleInstance) {
-                return module;
-            }
-            assert(typeof module !== 'string', `Shader module use by name is deprecated. Import shader module '${JSON.stringify(module)}' and use it directly.`);
-            if (!module.name) {
-                // eslint-disable-next-line no-console
-                console.warn('shader module has no name');
-                module.name = `shader-module-${index++}`;
-            }
-            const moduleObject = new ShaderModuleInstance(module);
-            moduleObject.dependencies = ShaderModuleInstance.instantiateModules(module.dependencies || []);
-            return moduleObject;
-        });
-    }
-    constructor(props) {
-        const { name, vs, fs, dependencies = [], uniformPropTypes = {}, getUniforms, deprecations = [], defines = {}, inject = {} } = props;
-        assert(typeof name === 'string');
-        this.name = name;
-        this.vs = vs;
-        this.fs = fs;
-        this.getModuleUniforms = getUniforms;
-        this.dependencies = ShaderModuleInstance.instantiateModules(dependencies);
-        this.deprecations = this._parseDeprecationDefinitions(deprecations);
-        this.defines = defines;
-        this.injections = normalizeInjections(inject);
-        if (uniformPropTypes) {
-            this.uniforms = makePropValidators(uniformPropTypes);
-        }
-    }
-    // Extracts the source code chunk for the specified shader type from the named shader module
-    getModuleSource(stage) {
-        let moduleSource;
-        switch (stage) {
-            case 'vertex':
-                moduleSource = this.vs || '';
-                break;
-            case 'fragment':
-                moduleSource = this.fs || '';
-                break;
-            default:
-                assert(false);
-        }
-        const moduleName = this.name.toUpperCase().replace(/[^0-9a-z]/gi, '_');
-        return `\
-// ----- MODULE ${this.name} ---------------
-
-#define MODULE_${moduleName}
-${moduleSource}\
-
-
-`;
-    }
-    getUniforms(userProps, uniforms) {
-        if (this.getModuleUniforms) {
-            return this.getModuleUniforms(userProps, uniforms);
-        }
-        // Build uniforms from the uniforms array
-        return getValidatedProperties(userProps, this.uniforms, this.name);
-    }
-    getDefines() {
-        return this.defines;
-    }
-    // Warn about deprecated uniforms or functions
-    checkDeprecations(shaderSource, log) {
-        this.deprecations.forEach(def => {
-            if (def.regex?.test(shaderSource)) {
-                if (def.deprecated) {
-                    log.deprecated(def.old, def.new)();
-                }
-                else {
-                    log.removed(def.old, def.new)();
-                }
-            }
-        });
-    }
-    _parseDeprecationDefinitions(deprecations) {
-        deprecations.forEach(def => {
-            switch (def.type) {
-                case 'function':
-                    def.regex = new RegExp(`\\b${def.old}\\(`);
-                    break;
-                default:
-                    def.regex = new RegExp(`${def.type} ${def.old};`);
-            }
-        });
-        return deprecations;
-    }
-    _defaultGetUniforms(opts = {}) {
-        const uniforms = {};
-        const propTypes = this.uniforms;
-        for (const key in propTypes) {
-            const propDef = propTypes[key];
-            if (key in opts && !propDef.private) {
-                if (propDef.validate) {
-                    assert(propDef.validate(opts[key], propDef), `${this.name}: invalid ${key}`);
-                }
-                uniforms[key] = opts[key];
-            }
-            else {
-                uniforms[key] = propDef.value;
-            }
-        }
-        return uniforms;
-    }
-}

package/src/lib/glsl-utils/highlight.ts

@@ -1,11 +0,0 @@
-// luma.gl
-// SPDX-License-Identifier: MIT
-// Copyright (c) vis.gl contributors
-
-// SHADER HELPERS
-
-/**
- * Marks GLSL shaders for syntax highlighting: glsl`...`
- * Install https://marketplace.visualstudio.com/items?itemName=boyswan.glsl-literal
- */
-export const glsl = (x: TemplateStringsArray) => `${x}`;

package/src/lib/shader-assembly/resolve-modules.ts

@@ -1,81 +0,0 @@
-// luma.gl
-// SPDX-License-Identifier: MIT
-// Copyright (c) vis.gl contributors
-
-import type {ShaderModule} from '../shader-module/shader-module';
-import {ShaderModuleInstance} from '../shader-module/shader-module-instance';
-
-/**
- * Instantiate shader modules and esolve any dependencies
- */
-export function resolveModules(
-  modules: (ShaderModule | ShaderModuleInstance)[]
-): ShaderModuleInstance[] {
-  const instances = ShaderModuleInstance.instantiateModules(modules);
-  return getShaderDependencies(instances);
-}
-
-/**
- * Takes a list of shader module names and returns a new list of
- * shader module names that includes all dependencies, sorted so
- * that modules that are dependencies of other modules come first.
- *
- * If the shader glsl code from the returned modules is concatenated
- * in the reverse order, it is guaranteed that all functions be resolved and
- * that all function and variable definitions come before use.
- *
- * @param modules - Array of modules (inline modules or module names)
- * @return - Array of modules
- */
-function getShaderDependencies(modules: ShaderModuleInstance[]): ShaderModuleInstance[] {
-  const moduleMap: Record<string, ShaderModuleInstance> = {};
-  const moduleDepth: Record<string, number> = {};
-  getDependencyGraph({modules, level: 0, moduleMap, moduleDepth});
-
-  // Return a reverse sort so that dependencies come before the modules that use them
-  return Object.keys(moduleDepth)
-    .sort((a, b) => moduleDepth[b] - moduleDepth[a])
-    .map(name => moduleMap[name]);
-}
-
-/**
- * Recursively checks module dependencies to calculate dependency level of each module.
- *
- * @param options.modules - Array of modules
- * @param options.level - Current level
- * @param options.moduleMap -
- * @param options.moduleDepth - Current level
- * @return - Map of module name to its level
- */
-// Adds another level of dependencies to the result map
-export function getDependencyGraph(options: {
-  modules: ShaderModuleInstance[];
-  level: number;
-  moduleMap: Record<string, ShaderModuleInstance>;
-  moduleDepth: Record<string, number>;
-}) {
-  const {modules, level, moduleMap, moduleDepth} = options;
-  if (level >= 5) {
-    throw new Error('Possible loop in shader dependency graph');
-  }
-
-  // Update level on all current modules
-  for (const module of modules) {
-    moduleMap[module.name] = module;
-    if (moduleDepth[module.name] === undefined || moduleDepth[module.name] < level) {
-      moduleDepth[module.name] = level;
-    }
-  }
-
-  // Recurse
-  for (const module of modules) {
-    if (module.dependencies) {
-      getDependencyGraph({modules: module.dependencies, level: level + 1, moduleMap, moduleDepth});
-    }
-  }
-}
-
-export const TEST_EXPORTS = {
-  getShaderDependencies,
-  getDependencyGraph
-};

package/src/lib/shader-module/normalize-shader-module.ts

@@ -1,17 +0,0 @@
-// luma.gl
-// SPDX-License-Identifier: MIT
-// Copyright (c) vis.gl contributors
-
-import {ShaderModule} from './shader-module';
-import {ShaderModuleInstance} from './shader-module-instance';
-
-export function normalizeShaderModule(module: ShaderModule): ShaderModule {
-  if (!module.normalized) {
-    module.normalized = true;
-    if (module.uniformPropTypes && !module.getUniforms) {
-      const shaderModule = new ShaderModuleInstance(module);
-      module.getUniforms = shaderModule.getUniforms.bind(shaderModule);
-    }
-  }
-  return module;
-}