@luma.gl/engine 9.1.0-alpha.9 → 9.1.0-beta.11

package/dist/passes/shader-pass-renderer.d.ts

@@ -0,0 +1,63 @@
+import { Device, RenderPass, Texture } from '@luma.gl/core';
+import type { ShaderPass } from '@luma.gl/shadertools';
+import { ShaderInputs } from "../shader-inputs.js";
+import { AsyncTexture } from "../async-texture/async-texture.js";
+import { ClipSpace } from "../models/clip-space.js";
+import { SwapFramebuffers } from "../compute/swap.js";
+import { BackgroundTextureModel } from "../models/billboard-texture-model.js";
+type ShaderSubPass = NonNullable<ShaderPass['passes']>[0];
+/** Props for ShaderPassRenderer */
+export type ShaderPassRendererProps = {
+    /** List of ShaderPasses to apply to the sourceTexture */
+    shaderPasses: ShaderPass[];
+    /** Optional typed ShaderInputs object for setting uniforms */
+    shaderInputs: ShaderInputs;
+};
+/** A pass that renders a given texture into screen space */
+export declare class ShaderPassRenderer {
+    device: Device;
+    shaderInputs: ShaderInputs;
+    passRenderers: PassRenderer[];
+    swapFramebuffers: SwapFramebuffers;
+    /** For rendering to the screen */
+    clipSpace: ClipSpace;
+    textureModel: BackgroundTextureModel;
+    constructor(device: Device, props: ShaderPassRendererProps);
+    /** Destroys resources created by this ShaderPassRenderer */
+    destroy(): void;
+    resize(width: number, height: number): void;
+    renderToScreen(options: {
+        sourceTexture: AsyncTexture;
+        uniforms: any;
+        bindings: any;
+    }): boolean;
+    /** Runs the shaderPasses in sequence on the sourceTexture and returns a texture with the results.
+     * @returns null if the the sourceTexture has not yet been loaded
+     */
+    renderToTexture(options: {
+        sourceTexture: AsyncTexture;
+        uniforms: any;
+        bindings: any;
+    }): Texture | null;
+}
+/** renders one ShaderPass */
+declare class PassRenderer {
+    shaderPass: ShaderPass;
+    subPassRenderers: SubPassRenderer[];
+    constructor(device: Device, shaderPass: ShaderPass, props?: {});
+    destroy(): void;
+}
+/** Renders one subpass of a ShaderPass */
+declare class SubPassRenderer {
+    model: ClipSpace;
+    shaderPass: ShaderPass;
+    subPass: ShaderSubPass;
+    constructor(device: Device, shaderPass: ShaderPass, subPass: ShaderSubPass);
+    destroy(): void;
+    render(options: {
+        renderPass: RenderPass;
+        bindings: any;
+    }): void;
+}
+export {};
+//# sourceMappingURL=shader-pass-renderer.d.ts.map

package/dist/passes/shader-pass-renderer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shader-pass-renderer.d.ts","sourceRoot":"","sources":["../../src/passes/shader-pass-renderer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAC1D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAErD,OAAO,EAAC,YAAY,EAAC,4BAAyB;AAC9C,OAAO,EAAC,YAAY,EAAC,0CAAuC;AAC5D,OAAO,EAAC,SAAS,EAAC,gCAA6B;AAC/C,OAAO,EAAC,gBAAgB,EAAC,2BAAwB;AACjD,OAAO,EAAC,sBAAsB,EAAC,6CAA0C;AAIzE,KAAK,aAAa,GAAG,WAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE1D,mCAAmC;AACnC,MAAM,MAAM,uBAAuB,GAAG;IACpC,yDAAyD;IACzD,YAAY,EAAE,UAAU,EAAE,CAAC;IAC3B,8DAA8D;IAC9D,YAAY,EAAE,YAAY,CAAC;CAC5B,CAAC;AAEF,4DAA4D;AAC5D,qBAAa,kBAAkB;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,kCAAkC;IAClC,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,sBAAsB,CAAC;gBAEzB,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,uBAAuB;IAoD1D,4DAA4D;IAC5D,OAAO;IAQP,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAK3C,cAAc,CAAC,OAAO,EAAE;QAAC,aAAa,EAAE,YAAY,CAAC;QAAC,QAAQ,EAAE,GAAG,CAAC;QAAC,QAAQ,EAAE,GAAG,CAAA;KAAC,GAAG,OAAO;IAe7F;;OAEG;IACH,eAAe,CAAC,OAAO,EAAE;QACvB,aAAa,EAAE,YAAY,CAAC;QAC5B,QAAQ,EAAE,GAAG,CAAC;QACd,QAAQ,EAAE,GAAG,CAAC;KACf,GAAG,OAAO,GAAG,IAAI;CAuDnB;AAED,6BAA6B;AAC7B,cAAM,YAAY;IAChB,UAAU,EAAE,UAAU,CAAC;IACvB,gBAAgB,EAAE,eAAe,EAAE,CAAC;gBAExB,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,KAAK;IAa9D,OAAO;CAKR;AAED,0CAA0C;AAC1C,cAAM,eAAe;IACnB,KAAK,EAAE,SAAS,CAAC;IACjB,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,EAAE,aAAa,CAAC;gBAEX,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa;IAuB1E,OAAO;IAIP,MAAM,CAAC,OAAO,EAAE;QAAC,UAAU,EAAE,UAAU,CAAC;QAAC,QAAQ,EAAE,GAAG,CAAA;KAAC,GAAG,IAAI;CAa/D"}

package/dist/passes/shader-pass-renderer.js

@@ -0,0 +1,197 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+import { initializeShaderModule } from '@luma.gl/shadertools';
+import { ShaderInputs } from "../shader-inputs.js";
+import { ClipSpace } from "../models/clip-space.js";
+import { SwapFramebuffers } from "../compute/swap.js";
+import { BackgroundTextureModel } from "../models/billboard-texture-model.js";
+import { getFragmentShaderForRenderPass } from "./get-fragment-shader.js";
+/** A pass that renders a given texture into screen space */
+export class ShaderPassRenderer {
+    device;
+    shaderInputs;
+    passRenderers;
+    swapFramebuffers;
+    /** For rendering to the screen */
+    clipSpace;
+    textureModel;
+    constructor(device, props) {
+        this.device = device;
+        props.shaderPasses.map(shaderPass => initializeShaderModule(shaderPass));
+        const modules = props.shaderPasses.reduce((object, shaderPass) => ({ ...object, [shaderPass.name]: shaderPass }), {});
+        this.shaderInputs = props.shaderInputs || new ShaderInputs(modules);
+        const size = device.getCanvasContext().getPixelSize();
+        this.swapFramebuffers = new SwapFramebuffers(device, {
+            colorAttachments: ['rgba8unorm'],
+            width: size[0],
+            height: size[1]
+        });
+        this.textureModel = new BackgroundTextureModel(device, {
+            backgroundTexture: this.swapFramebuffers.current.colorAttachments[0].texture
+        });
+        this.clipSpace = new ClipSpace(device, {
+            source: /* wgsl */ `\
+  @group(0) @binding(0) var sourceTexture: texture_2d<f32>;
+  @group(0) @binding(1) var sourceTextureSampler: sampler;
+
+@fragment
+fn fragmentMain(inputs: FragmentInputs) -> @location(0) vec4<f32> {
+	let texCoord: vec2<f32> = inputs.coordinate;
+	return textureSample(sourceTexture, sourceTextureSampler, texCoord);
+}
+`,
+            fs: /* glsl */ `\
+#version 300 es
+
+uniform sampler2D sourceTexture;
+in vec2 uv;
+in vec2 coordinate;
+out vec4 fragColor;
+
+void main() {
+  vec2 texCoord = coordinate;
+  fragColor = texture(sourceTexture, coordinate);
+}
+`
+        });
+        this.passRenderers = props.shaderPasses.map(shaderPass => new PassRenderer(device, shaderPass));
+    }
+    /** Destroys resources created by this ShaderPassRenderer */
+    destroy() {
+        for (const subPassRenderer of this.passRenderers) {
+            subPassRenderer.destroy();
+        }
+        this.swapFramebuffers.destroy();
+        this.clipSpace.destroy();
+    }
+    resize(width, height) {
+        this.swapFramebuffers.resize({ width, height });
+        // this.props.passes.forEach(pass => pass.resize(width, height));
+    }
+    renderToScreen(options) {
+        // Run the shader passes and generate an output texture
+        const outputTexture = this.renderToTexture(options);
+        if (!outputTexture) {
+            // source texture not yet loaded
+            return false;
+        }
+        const renderPass = this.device.beginRenderPass({ clearColor: [0, 0, 0, 1], clearDepth: 1 });
+        this.clipSpace.setBindings({ sourceTexture: outputTexture });
+        this.clipSpace.draw(renderPass);
+        renderPass.end();
+        return true;
+    }
+    /** Runs the shaderPasses in sequence on the sourceTexture and returns a texture with the results.
+     * @returns null if the the sourceTexture has not yet been loaded
+     */
+    renderToTexture(options) {
+        const { sourceTexture } = options;
+        if (!sourceTexture.isReady) {
+            return null;
+        }
+        this.textureModel.destroy();
+        this.textureModel = new BackgroundTextureModel(this.device, {
+            backgroundTexture: sourceTexture
+        });
+        // Clear the current texture before we begin
+        const clearTexturePass = this.device.beginRenderPass({
+            framebuffer: this.swapFramebuffers.current,
+            clearColor: [0, 0, 0, 1]
+        });
+        this.textureModel.draw(clearTexturePass);
+        clearTexturePass.end();
+        // const commandEncoder = this.device.createCommandEncoder();
+        // commandEncoder.copyTextureToTexture({
+        //   sourceTexture: sourceTexture.texture,
+        //   destinationTexture: this.swapFramebuffers.current.colorAttachments[0].texture
+        // });
+        // commandEncoder.finish();
+        let first = true;
+        for (const passRenderer of this.passRenderers) {
+            for (const subPassRenderer of passRenderer.subPassRenderers) {
+                if (!first) {
+                    this.swapFramebuffers.swap();
+                }
+                first = false;
+                const swapBufferTexture = this.swapFramebuffers.current.colorAttachments[0].texture;
+                const bindings = {
+                    sourceTexture: swapBufferTexture
+                    // texSize: [sourceTextures.width, sourceTextures.height]
+                };
+                const renderPass = this.device.beginRenderPass({
+                    framebuffer: this.swapFramebuffers.next,
+                    clearColor: [0, 0, 0, 1],
+                    clearDepth: 1
+                });
+                subPassRenderer.render({ renderPass, bindings });
+                renderPass.end();
+            }
+        }
+        this.swapFramebuffers.swap();
+        const outputTexture = this.swapFramebuffers.current.colorAttachments[0].texture;
+        return outputTexture;
+    }
+}
+/** renders one ShaderPass */
+class PassRenderer {
+    shaderPass;
+    subPassRenderers;
+    constructor(device, shaderPass, props = {}) {
+        this.shaderPass = shaderPass;
+        // const id = `${shaderPass.name}-pass`;
+        const subPasses = shaderPass.passes || [];
+        // normalizePasses(gl, module, id, props);
+        this.subPassRenderers = subPasses.map(subPass => {
+            // const idn = `${id}-${subPasses.length + 1}`;
+            return new SubPassRenderer(device, shaderPass, subPass);
+        });
+    }
+    destroy() {
+        for (const subPassRenderer of this.subPassRenderers) {
+            subPassRenderer.destroy();
+        }
+    }
+}
+/** Renders one subpass of a ShaderPass */
+class SubPassRenderer {
+    model;
+    shaderPass;
+    subPass;
+    constructor(device, shaderPass, subPass) {
+        this.shaderPass = shaderPass;
+        this.subPass = subPass;
+        const action = subPass.action || (subPass.filter && 'filter') || (subPass.sampler && 'sample') || 'filter';
+        const fs = getFragmentShaderForRenderPass({
+            shaderPass,
+            action,
+            shadingLanguage: device.info.shadingLanguage
+        });
+        this.model = new ClipSpace(device, {
+            id: `${shaderPass.name}-subpass`,
+            source: fs,
+            fs,
+            modules: [shaderPass],
+            parameters: {
+                depthWriteEnabled: false,
+                depthCompare: 'always'
+            }
+        });
+    }
+    destroy() {
+        this.model.destroy();
+    }
+    render(options) {
+        const { renderPass, bindings } = options;
+        this.model.shaderInputs.setProps({
+            [this.shaderPass.name]: this.shaderPass.uniforms || {}
+        });
+        this.model.shaderInputs.setProps({
+            [this.shaderPass.name]: this.subPass.uniforms || {}
+        });
+        // this.model.setBindings(this.subPass.bindings || {});
+        this.model.setBindings(bindings || {});
+        this.model.draw(renderPass);
+    }
+}
+//# sourceMappingURL=shader-pass-renderer.js.map

package/dist/passes/shader-pass-renderer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shader-pass-renderer.js","sourceRoot":"","sources":["../../src/passes/shader-pass-renderer.ts"],"names":[],"mappings":"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"}

package/dist/scenegraph/group-node.js

@@ -85,3 +85,4 @@ export class GroupNode extends ScenegraphNode {
         }
     }
 }
+//# sourceMappingURL=group-node.js.map

package/dist/scenegraph/group-node.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"group-node.js","sourceRoot":"","sources":["../../src/scenegraph/group-node.ts"],"names":[],"mappings":"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"}

package/dist/scenegraph/model-node.js

@@ -36,3 +36,4 @@ export class ModelNode extends ScenegraphNode {
         return this.model.draw(renderPass);
     }
 }
+//# sourceMappingURL=model-node.js.map

package/dist/scenegraph/model-node.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"model-node.js","sourceRoot":"","sources":["../../src/scenegraph/model-node.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAC,cAAc,EAAsB,6BAA0B;AAStE,MAAM,OAAO,SAAU,SAAQ,cAAc;IAClC,KAAK,CAAQ;IACtB,MAAM,GAAgC,IAAI,CAAC;IAC3C,gBAAgB,CAAQ;IAExB,8EAA8E;IAC9E,yBAAyB;IACzB,wBAAwB;IACxB,sBAAsB;IAEtB,YAAY,KAAqB;QAC/B,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,0CAA0C;QAC1C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,IAAI,EAAE,CAAC;QACrD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAEQ,OAAO;QACd,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACrB,mBAAmB;YACnB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QACpB,CAAC;QACD,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9D,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;IAC7B,CAAC;IAEQ,SAAS;QAChB,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,uBAAuB;IACvB,IAAI,CAAC,UAAsB;QACzB,yDAAyD;QACzD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC;CACF"}

package/dist/scenegraph/scenegraph-node.js

@@ -154,3 +154,4 @@ export class ScenegraphNode {
         Object.assign(this.props, props);
     }
 }
+//# sourceMappingURL=scenegraph-node.js.map

package/dist/scenegraph/scenegraph-node.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scenegraph-node.js","sourceRoot":"","sources":["../../src/scenegraph/scenegraph-node.ts"],"names":[],"mappings":"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"}

package/dist/shader-inputs.d.ts

@@ -1,18 +1,5 @@
-import type { UniformValue, Texture, Sampler } from '@luma.gl/core';
+import type { Binding, UniformValue } from '@luma.gl/core';
 import { ShaderModule } from '@luma.gl/shadertools';
-type BindingValue = Buffer | Texture | Sampler;
-/** Minimal ShaderModule subset, we don't need shader code etc */
-export type ShaderModuleInputs<PropsT extends Record<string, unknown> = Record<string, unknown>, UniformsT extends Record<string, UniformValue> = Record<string, UniformValue>, BindingsT extends Record<string, BindingValue> = Record<string, BindingValue>> = {
-    defaultUniforms?: UniformsT;
-    getUniforms?: (props?: any, oldProps?: any) => Record<string, BindingValue | UniformValue>;
-    /** Not used. Used to access props type */
-    props?: PropsT;
-    bindings?: Record<keyof BindingsT, {
-        location: number;
-        type: 'texture' | 'sampler' | 'uniforms';
-    }>;
-    uniformTypes?: any;
-};
 /**
  * ShaderInputs holds uniform and binding values for one or more shader modules,
  * - It can generate binary data for any uniform buffer
@@ -26,19 +13,19 @@ export declare class ShaderInputs<ShaderPropsT extends Partial<Record<string, Re
      * @todo should should this include the resolved dependencies?
      */
     modules: Readonly<{
-        [P in keyof ShaderPropsT]: ShaderModuleInputs<ShaderPropsT[P]>;
+        [P in keyof ShaderPropsT]: ShaderModule<ShaderPropsT[P]>;
     }>;
     /** Stores the uniform values for each module */
     moduleUniforms: Record<keyof ShaderPropsT, Record<string, UniformValue>>;
     /** Stores the uniform bindings for each module  */
-    moduleBindings: Record<keyof ShaderPropsT, Record<string, Texture | Sampler>>;
+    moduleBindings: Record<keyof ShaderPropsT, Record<string, Binding>>;
     /** Tracks if uniforms have changed */
     /**
      * Create a new UniformStore instance
      * @param modules
      */
     constructor(modules: {
-        [P in keyof ShaderPropsT]?: ShaderModuleInputs<ShaderPropsT[P]>;
+        [P in keyof ShaderPropsT]?: ShaderModule<ShaderPropsT[P], any>;
     });
     /** Destroy */
     destroy(): void;
@@ -48,17 +35,17 @@ export declare class ShaderInputs<ShaderPropsT extends Partial<Record<string, Re
     setProps(props: Partial<{
         [P in keyof ShaderPropsT]?: Partial<ShaderPropsT[P]>;
     }>): void;
-    /** Merges all bindings for the shader (from the various modules) */
     /**
      * Return the map of modules
      * @todo should should this include the resolved dependencies?
      */
     getModules(): ShaderModule[];
     /** Get all uniform values for all modules */
-    getUniformValues(): Record<keyof ShaderPropsT, Record<string, UniformValue>>;
+    getUniformValues(): Partial<Record<keyof ShaderPropsT, Record<string, UniformValue>>>;
     /** Merges all bindings for the shader (from the various modules) */
-    getBindings(): Record<string, Texture | Sampler>;
+    getBindingValues(): Record<string, Binding>;
+    /** Return a debug table that can be used for console.table() or log.table() */
     getDebugTable(): Record<string, Record<string, unknown>>;
+    _addModule(module: ShaderModule): void;
 }
-export {};
 //# sourceMappingURL=shader-inputs.d.ts.map

package/dist/shader-inputs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader-inputs.d.ts","sourceRoot":"","sources":["../src/shader-inputs.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAE,OAAO,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAGlE,OAAO,EAA8B,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAG/E,KAAK,YAAY,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC;AAE/C,iEAAiE;AACjE,MAAM,MAAM,kBAAkB,CAC5B,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChE,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,EAC7E,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,IAC3E;IACF,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,WAAW,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,GAAG,KAAK,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,YAAY,CAAC,CAAC;IAE3F,0CAA0C;IAC1C,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,QAAQ,CAAC,EAAE,MAAM,CACf,MAAM,SAAS,EACf;QACE,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,UAAU,CAAC;KAC1C,CACF,CAAC;IAEF,YAAY,CAAC,EAAE,GAAG,CAAC;CACpB,CAAC;AAEF;;;;;;GAMG;AACH,qBAAa,YAAY,CACvB,YAAY,SAAS,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAC7E,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CACxC;IAED;;;OAGG;IAEH,OAAO,EAAE,QAAQ,CAAC;SAAE,CAAC,IAAI,MAAM,YAAY,GAAG,kBAAkB,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;KAAC,CAAC,CAAC;IAEpF,gDAAgD;IAChD,cAAc,EAAE,MAAM,CAAC,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IACzE,mDAAmD;IACnD,cAAc,EAAE,MAAM,CAAC,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC;IAC9E,sCAAsC;IAGtC;;;OAGG;gBAES,OAAO,EAAE;SAAE,CAAC,IAAI,MAAM,YAAY,CAAC,CAAC,EAAE,kBAAkB,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;KAAC;IA4BtF,cAAc;IACd,OAAO,IAAI,IAAI;IAEf;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;SAAE,CAAC,IAAI,MAAM,YAAY,CAAC,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;KAAC,CAAC,GAAG,IAAI;IAyBtF,oEAAoE;IAKpE;;;OAGG;IACH,UAAU,IAAI,YAAY,EAAE;IAI5B,6CAA6C;IAC7C,gBAAgB,IAAI,MAAM,CAAC,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAI5E,oEAAoE;IACpE,WAAW,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC;IAQhD,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAYzD"}
+{"version":3,"file":"shader-inputs.d.ts","sourceRoot":"","sources":["../src/shader-inputs.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,OAAO,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAGzD,OAAO,EAA8B,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAG/E;;;;;;GAMG;AACH,qBAAa,YAAY,CACvB,YAAY,SAAS,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAC7E,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CACxC;IAED;;;OAGG;IAEH,OAAO,EAAE,QAAQ,CAAC;SAAE,CAAC,IAAI,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;KAAC,CAAC,CAAC;IAE9E,gDAAgD;IAChD,cAAc,EAAE,MAAM,CAAC,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IACzE,mDAAmD;IACnD,cAAc,EAAE,MAAM,CAAC,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACpE,sCAAsC;IAGtC;;;OAGG;gBAES,OAAO,EAAE;SAAE,CAAC,IAAI,MAAM,YAAY,CAAC,CAAC,EAAE,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;KAAC;IA2BrF,cAAc;IACd,OAAO,IAAI,IAAI;IAEf;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;SAAE,CAAC,IAAI,MAAM,YAAY,CAAC,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;KAAC,CAAC,GAAG,IAAI;IAyBtF;;;OAGG;IACH,UAAU,IAAI,YAAY,EAAE;IAI5B,6CAA6C;IAC7C,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IAIrF,oEAAoE;IACpE,gBAAgB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAU3C,+EAA+E;IAC/E,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAaxD,UAAU,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;CAMvC"}

package/dist/shader-inputs.js

@@ -45,10 +45,10 @@ export class ShaderInputs {
         this.moduleBindings = {};
         // Initialize the modules
         for (const [name, module] of Object.entries(modules)) {
-            const moduleName = name;
-            // Get default uniforms from module
-            this.moduleUniforms[moduleName] = module.defaultUniforms || {};
-            this.moduleBindings[moduleName] = {};
+            this._addModule(module);
+            if (module.name && name !== module.name) {
+                log.warn(`Module name: ${name} vs ${module.name}`)();
+            }
         }
     }
     /** Destroy */
@@ -68,8 +68,7 @@ export class ShaderInputs {
             }
             const oldUniforms = this.moduleUniforms[moduleName];
             const oldBindings = this.moduleBindings[moduleName];
-            let uniformsAndBindings = module.getUniforms?.(moduleProps, this.moduleUniforms[moduleName]);
-            uniformsAndBindings ||= { ...this.moduleUniforms[moduleName], ...moduleProps };
+            const uniformsAndBindings = module.getUniforms?.(moduleProps, oldUniforms) || moduleProps;
             const { uniforms, bindings } = splitUniformsAndBindings(uniformsAndBindings);
             this.moduleUniforms[moduleName] = { ...oldUniforms, ...uniforms };
             this.moduleBindings[moduleName] = { ...oldBindings, ...bindings };
@@ -77,10 +76,6 @@ export class ShaderInputs {
             // console.log(`setProps(${String(moduleName)}`, moduleName, this.moduleUniforms[moduleName])
         }
     }
-    /** Merges all bindings for the shader (from the various modules) */
-    // getUniformBlocks(): Record<string, Texture | Sampler> {
-    //   return this.moduleUniforms;
-    // }
     /**
      * Return the map of modules
      * @todo should should this include the resolved dependencies?
@@ -93,13 +88,15 @@ export class ShaderInputs {
         return this.moduleUniforms;
     }
     /** Merges all bindings for the shader (from the various modules) */
-    getBindings() {
+    getBindingValues() {
         const bindings = {};
         for (const moduleBindings of Object.values(this.moduleBindings)) {
             Object.assign(bindings, moduleBindings);
         }
         return bindings;
     }
+    // INTERNAL
+    /** Return a debug table that can be used for console.table() or log.table() */
     getDebugTable() {
         const table = {};
         for (const [moduleName, module] of Object.entries(this.moduleUniforms)) {
@@ -112,4 +109,11 @@ export class ShaderInputs {
         }
         return table;
     }
+    _addModule(module) {
+        const moduleName = module.name;
+        // Get default uniforms from module
+        this.moduleUniforms[moduleName] = module.defaultUniforms || {};
+        this.moduleBindings[moduleName] = {};
+    }
 }
+//# sourceMappingURL=shader-inputs.js.map

package/dist/shader-inputs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shader-inputs.js","sourceRoot":"","sources":["../src/shader-inputs.ts"],"names":[],"mappings":"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"}

package/dist/utils/deep-equal.js

@@ -48,3 +48,4 @@ export function deepEqual(a, b, depth) {
     }
     return false;
 }
+//# sourceMappingURL=deep-equal.js.map

package/dist/utils/deep-equal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deep-equal.js","sourceRoot":"","sources":["../../src/utils/deep-equal.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC;;;;;;GAMG;AACH,+BAA+B;AAC/B,MAAM,UAAU,SAAS,CAAC,CAAM,EAAE,CAAM,EAAE,KAAa;IACrD,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACZ,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QACvB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QACrB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC;YAC/C,OAAO,KAAK,CAAC;QACf,CAAC;QACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAClC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC;gBACtC,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QACrB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QACnD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC7B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC7B,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE,CAAC;YAClC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC3B,OAAO,KAAK,CAAC;YACf,CAAC;YACD,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC;gBAC1C,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/utils/uid.js

@@ -12,3 +12,4 @@ export function uid(id = 'id') {
     const count = uidCounters[id]++;
     return `${id}-${count}`;
 }
+//# sourceMappingURL=uid.js.map

package/dist/utils/uid.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"uid.js","sourceRoot":"","sources":["../../src/utils/uid.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,MAAM,WAAW,GAA2B,EAAE,CAAC;AAE/C;;;;IAII;AACJ,MAAM,UAAU,GAAG,CAAC,KAAa,IAAI;IACnC,WAAW,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,KAAK,GAAG,WAAW,CAAC,EAAE,CAAC,EAAE,CAAC;IAChC,OAAO,GAAG,EAAE,IAAI,KAAK,EAAE,CAAC;AAC1B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/engine",
-  "version": "9.1.0-alpha.9",
+  "version": "9.1.0-beta.11",
   "description": "3D Engine Components for luma.gl",
   "type": "module",
   "license": "MIT",
@@ -40,14 +40,14 @@
     "prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
   },
   "peerDependencies": {
-    "@luma.gl/core": "^9.0.0-beta"
+    "@luma.gl/core": "^9.1.0-beta.1",
+    "@luma.gl/shadertools": "^9.1.0-beta.1"
   },
   "dependencies": {
-    "@luma.gl/shadertools": "9.1.0-alpha.9",
-    "@math.gl/core": "^4.0.0",
-    "@math.gl/types": "^4.0.0",
+    "@math.gl/core": "^4.1.0",
+    "@math.gl/types": "^4.1.0",
     "@probe.gl/log": "^4.0.8",
     "@probe.gl/stats": "^4.0.8"
   },
-  "gitHead": "ff05b21269181dbb782ba7c8c1546900288ee6a1"
+  "gitHead": "aab3748ab83360e6ee611f9b4a2d805e5f17fb01"
 }

package/src/animation-loop/animation-loop.ts

@@ -3,7 +3,10 @@
 // Copyright (c) vis.gl contributors
 
 import {luma, Device} from '@luma.gl/core';
-import {requestAnimationFrame, cancelAnimationFrame} from './request-animation-frame';
+import {
+  requestAnimationFramePolyfill,
+  cancelAnimationFramePolyfill
+} from './request-animation-frame';
 import {Timeline} from '../animation/timeline';
 import {AnimationProps} from './animation-props';
 import {Stats, Stat} from '@probe.gl/stats';
@@ -77,6 +80,7 @@ export class AnimationLoop {
   _nextFramePromise: Promise<AnimationLoop> | null = null;
   _resolveNextFrame: ((animationLoop: AnimationLoop) => void) | null = null;
   _cpuStartTime: number = 0;
+  _error: Error | null = null;
 
   // _gpuTimeQuery: Query | null = null;
 
@@ -123,6 +127,23 @@ export class AnimationLoop {
     this.destroy();
   }
 
+  setError(error: Error): void {
+    this.props.onError(error);
+    this._error = Error();
+    const canvas = this.device?.canvasContext?.canvas;
+    if (canvas instanceof HTMLCanvasElement) {
+      const errorDiv = document.createElement('h1');
+      errorDiv.innerHTML = error.message;
+      errorDiv.style.position = 'absolute';
+      errorDiv.style.top = '20%'; // left: 50%; transform: translate(-50%, -50%);';
+      errorDiv.style.left = '10px';
+      errorDiv.style.color = 'black';
+      errorDiv.style.backgroundColor = 'red';
+      document.body.appendChild(errorDiv);
+      // canvas.style.position = 'absolute';
+    }
+  }
+
   /** Flags this animation loop as needing redraw */
   setNeedsRedraw(reason: string): this {
     this.needsRedraw = this.needsRedraw || reason;
@@ -189,7 +210,7 @@ export class AnimationLoop {
     if (this._running) {
       // call callback
       // If stop is called immediately, we can end up in a state where props haven't been initialized...
-      if (this.animationProps) {
+      if (this.animationProps && !this._error) {
         this.props.onFinalize(this.animationProps);
       }
 
@@ -203,7 +224,7 @@ export class AnimationLoop {
 
   /** Explicitly draw a frame */
   redraw(): this {
-    if (this.device?.isLost) {
+    if (this.device?.isLost || this._error) {
       return this;
     }
 
@@ -302,7 +323,7 @@ export class AnimationLoop {
     // if (this.display && this.display.requestAnimationFrame) {
     //   this._animationFrameId = this.display.requestAnimationFrame(this._animationFrame.bind(this));
     // }
-    this._animationFrameId = requestAnimationFrame(this._animationFrame.bind(this));
+    this._animationFrameId = requestAnimationFramePolyfill(this._animationFrame.bind(this));
   }
 
   _cancelAnimationFrame(): void {
@@ -313,10 +334,10 @@ export class AnimationLoop {
     // VR display has a separate animation frame to sync with headset
     // TODO WebVR API discontinued, replaced by WebXR: https://immersive-web.github.io/webxr/
     // See https://developer.mozilla.org/en-US/docs/Web/API/VRDisplay/requestAnimationFrame
-    // if (this.display && this.display.cancelAnimationFrame) {
+    // if (this.display && this.display.cancelAnimationFramePolyfill) {
     //   this.display.cancelAnimationFrame(this._animationFrameId);
     // }
-    cancelAnimationFrame(this._animationFrameId);
+    cancelAnimationFramePolyfill(this._animationFrameId);
     this._animationFrameId = null;
   }
 

package/src/animation-loop/make-animation-loop.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {luma} from '@luma.gl/core';
+import {luma, Adapter} from '@luma.gl/core';
 import {AnimationLoopTemplate} from './animation-loop-template';
 import {AnimationLoop, AnimationLoopProps} from './animation-loop';
 import type {AnimationProps} from './animation-props';
@@ -10,7 +10,10 @@ import type {AnimationProps} from './animation-props';
 export type MakeAnimationLoopProps = Omit<
   AnimationLoopProps,
   'onCreateDevice' | 'onInitialize' | 'onRedraw' | 'onFinalize'
->;
+> & {
+  /** List of adapters to use when creating the device */
+  adapters?: Adapter[];
+};
 
 /** Instantiates and runs the render loop */
 export function makeAnimationLoop(
@@ -19,7 +22,9 @@ export function makeAnimationLoop(
 ): AnimationLoop {
   let renderLoop: AnimationLoopTemplate | null = null;
 
-  const device = props?.device || luma.createDevice({id: 'animation-loop'});
+  const device =
+    props?.device ||
+    luma.createDevice({id: 'animation-loop', adapters: props?.adapters, createCanvasContext: true});
 
   // Create an animation loop;
   const animationLoop = new AnimationLoop({