@luma.gl/engine 9.0.0-beta.5 → 9.0.0-beta.6

package/dist/index.d.ts

@@ -1,41 +1,42 @@
-export { Timeline } from './animation/timeline';
-export { KeyFrames } from './animation/key-frames';
-export type { AnimationProps } from './animation-loop/animation-props';
-export { AnimationLoopTemplate } from './animation-loop/animation-loop-template';
-export type { AnimationLoopProps } from './animation-loop/animation-loop';
-export { AnimationLoop } from './animation-loop/animation-loop';
-export type { MakeAnimationLoopProps } from './animation-loop/make-animation-loop';
-export { makeAnimationLoop } from './animation-loop/make-animation-loop';
-export type { ModelProps } from './model/model';
-export { Model } from './model/model';
-export type { BufferTransformProps } from './transform/buffer-transform';
-export { BufferTransform } from './transform/buffer-transform';
-export type { TextureTransformProps } from './transform/texture-transform';
-export { TextureTransform } from './transform/texture-transform';
-export { PipelineFactory } from './lib/pipeline-factory';
-export { ClipSpace } from './lib/clip-space';
-export { ScenegraphNode } from './scenegraph/scenegraph-node';
-export { GroupNode } from './scenegraph/group-node';
-export type { ModelNodeProps } from './scenegraph/model-node';
-export { ModelNode } from './scenegraph/model-node';
-export type { GeometryProps } from './geometry/geometry';
-export { Geometry } from './geometry/geometry';
-export type { GPUGeometryProps } from './geometry/gpu-geometry';
-export { GPUGeometry } from './geometry/gpu-geometry';
-export type { ConeGeometryProps } from './geometries/cone-geometry';
-export { ConeGeometry } from './geometries/cone-geometry';
-export type { CubeGeometryProps } from './geometries/cube-geometry';
-export { CubeGeometry } from './geometries/cube-geometry';
-export type { CylinderGeometryProps } from './geometries/cylinder-geometry';
-export { CylinderGeometry } from './geometries/cylinder-geometry';
-export type { IcoSphereGeometryProps } from './geometries/ico-sphere-geometry';
-export { IcoSphereGeometry } from './geometries/ico-sphere-geometry';
-export type { PlaneGeometryProps } from './geometries/plane-geometry';
-export { PlaneGeometry } from './geometries/plane-geometry';
-export type { SphereGeometryProps } from './geometries/sphere-geometry';
-export { SphereGeometry } from './geometries/sphere-geometry';
-export type { TruncatedConeGeometryProps } from './geometries/truncated-cone-geometry';
-export { TruncatedConeGeometry } from './geometries/truncated-cone-geometry';
-export type { ShaderModuleInputs } from './shader-inputs';
-export { ShaderInputs as _ShaderInputs } from './shader-inputs';
+export { Timeline } from "./animation/timeline.js";
+export { KeyFrames } from "./animation/key-frames.js";
+export type { AnimationProps } from "./animation-loop/animation-props.js";
+export { AnimationLoopTemplate } from "./animation-loop/animation-loop-template.js";
+export type { AnimationLoopProps } from "./animation-loop/animation-loop.js";
+export { AnimationLoop } from "./animation-loop/animation-loop.js";
+export type { MakeAnimationLoopProps } from "./animation-loop/make-animation-loop.js";
+export { makeAnimationLoop } from "./animation-loop/make-animation-loop.js";
+export type { ModelProps } from "./model/model.js";
+export { Model } from "./model/model.js";
+export type { BufferTransformProps } from "./transform/buffer-transform.js";
+export { BufferTransform } from "./transform/buffer-transform.js";
+export type { TextureTransformProps } from "./transform/texture-transform.js";
+export { TextureTransform } from "./transform/texture-transform.js";
+export { PipelineFactory } from "./lib/pipeline-factory.js";
+export { ShaderFactory } from "./lib/shader-factory.js";
+export { ClipSpace } from "./lib/clip-space.js";
+export { ScenegraphNode } from "./scenegraph/scenegraph-node.js";
+export { GroupNode } from "./scenegraph/group-node.js";
+export type { ModelNodeProps } from "./scenegraph/model-node.js";
+export { ModelNode } from "./scenegraph/model-node.js";
+export type { GeometryProps } from "./geometry/geometry.js";
+export { Geometry } from "./geometry/geometry.js";
+export type { GPUGeometryProps } from "./geometry/gpu-geometry.js";
+export { GPUGeometry } from "./geometry/gpu-geometry.js";
+export type { ConeGeometryProps } from "./geometries/cone-geometry.js";
+export { ConeGeometry } from "./geometries/cone-geometry.js";
+export type { CubeGeometryProps } from "./geometries/cube-geometry.js";
+export { CubeGeometry } from "./geometries/cube-geometry.js";
+export type { CylinderGeometryProps } from "./geometries/cylinder-geometry.js";
+export { CylinderGeometry } from "./geometries/cylinder-geometry.js";
+export type { IcoSphereGeometryProps } from "./geometries/ico-sphere-geometry.js";
+export { IcoSphereGeometry } from "./geometries/ico-sphere-geometry.js";
+export type { PlaneGeometryProps } from "./geometries/plane-geometry.js";
+export { PlaneGeometry } from "./geometries/plane-geometry.js";
+export type { SphereGeometryProps } from "./geometries/sphere-geometry.js";
+export { SphereGeometry } from "./geometries/sphere-geometry.js";
+export type { TruncatedConeGeometryProps } from "./geometries/truncated-cone-geometry.js";
+export { TruncatedConeGeometry } from "./geometries/truncated-cone-geometry.js";
+export type { ShaderModuleInputs } from "./shader-inputs.js";
+export { ShaderInputs as _ShaderInputs } from "./shader-inputs.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAC;AACjD,YAAY,EAAC,cAAc,EAAC,MAAM,kCAAkC,CAAC;AAErE,OAAO,EAAC,qBAAqB,EAAC,MAAM,0CAA0C,CAAC;AAE/E,YAAY,EAAC,kBAAkB,EAAC,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAC,aAAa,EAAC,MAAM,iCAAiC,CAAC;AAE9D,YAAY,EAAC,sBAAsB,EAAC,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAC,iBAAiB,EAAC,MAAM,sCAAsC,CAAC;AAEvE,YAAY,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAC,KAAK,EAAC,MAAM,eAAe,CAAC;AAGpC,YAAY,EAAC,oBAAoB,EAAC,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAC,eAAe,EAAC,MAAM,8BAA8B,CAAC;AAC7D,YAAY,EAAC,qBAAqB,EAAC,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAC,gBAAgB,EAAC,MAAM,+BAA+B,CAAC;AAE/D,OAAO,EAAC,eAAe,EAAC,MAAM,wBAAwB,CAAC;AAGvD,OAAO,EAAC,SAAS,EAAC,MAAM,kBAAkB,CAAC;AAG3C,OAAO,EAAC,cAAc,EAAC,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAC,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAClD,YAAY,EAAC,cAAc,EAAC,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAC,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAGlD,YAAY,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAC,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AAC7C,YAAY,EAAC,gBAAgB,EAAC,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAC,WAAW,EAAC,MAAM,yBAAyB,CAAC;AAGpD,YAAY,EAAC,iBAAiB,EAAC,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AACxD,YAAY,EAAC,iBAAiB,EAAC,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AACxD,YAAY,EAAC,qBAAqB,EAAC,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAC,gBAAgB,EAAC,MAAM,gCAAgC,CAAC;AAChE,YAAY,EAAC,sBAAsB,EAAC,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAC,iBAAiB,EAAC,MAAM,kCAAkC,CAAC;AACnE,YAAY,EAAC,kBAAkB,EAAC,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAC;AAC1D,YAAY,EAAC,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAC,cAAc,EAAC,MAAM,8BAA8B,CAAC;AAC5D,YAAY,EAAC,0BAA0B,EAAC,MAAM,sCAAsC,CAAC;AACrF,OAAO,EAAC,qBAAqB,EAAC,MAAM,sCAAsC,CAAC;AAG3E,YAAY,EAAC,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAC,YAAY,IAAI,aAAa,EAAC,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,QAAQ,EAAC,gCAA6B;AAC9C,OAAO,EAAC,SAAS,EAAC,kCAA+B;AACjD,YAAY,EAAC,cAAc,EAAC,4CAAyC;AAErE,OAAO,EAAC,qBAAqB,EAAC,oDAAiD;AAE/E,YAAY,EAAC,kBAAkB,EAAC,2CAAwC;AACxE,OAAO,EAAC,aAAa,EAAC,2CAAwC;AAE9D,YAAY,EAAC,sBAAsB,EAAC,gDAA6C;AACjF,OAAO,EAAC,iBAAiB,EAAC,gDAA6C;AAEvE,YAAY,EAAC,UAAU,EAAC,yBAAsB;AAC9C,OAAO,EAAC,KAAK,EAAC,yBAAsB;AAGpC,YAAY,EAAC,oBAAoB,EAAC,wCAAqC;AACvE,OAAO,EAAC,eAAe,EAAC,wCAAqC;AAC7D,YAAY,EAAC,qBAAqB,EAAC,yCAAsC;AACzE,OAAO,EAAC,gBAAgB,EAAC,yCAAsC;AAE/D,OAAO,EAAC,eAAe,EAAC,kCAA+B;AACvD,OAAO,EAAC,aAAa,EAAC,gCAA6B;AAGnD,OAAO,EAAC,SAAS,EAAC,4BAAyB;AAG3C,OAAO,EAAC,cAAc,EAAC,wCAAqC;AAC5D,OAAO,EAAC,SAAS,EAAC,mCAAgC;AAClD,YAAY,EAAC,cAAc,EAAC,mCAAgC;AAC5D,OAAO,EAAC,SAAS,EAAC,mCAAgC;AAGlD,YAAY,EAAC,aAAa,EAAC,+BAA4B;AACvD,OAAO,EAAC,QAAQ,EAAC,+BAA4B;AAC7C,YAAY,EAAC,gBAAgB,EAAC,mCAAgC;AAC9D,OAAO,EAAC,WAAW,EAAC,mCAAgC;AAGpD,YAAY,EAAC,iBAAiB,EAAC,sCAAmC;AAClE,OAAO,EAAC,YAAY,EAAC,sCAAmC;AACxD,YAAY,EAAC,iBAAiB,EAAC,sCAAmC;AAClE,OAAO,EAAC,YAAY,EAAC,sCAAmC;AACxD,YAAY,EAAC,qBAAqB,EAAC,0CAAuC;AAC1E,OAAO,EAAC,gBAAgB,EAAC,0CAAuC;AAChE,YAAY,EAAC,sBAAsB,EAAC,4CAAyC;AAC7E,OAAO,EAAC,iBAAiB,EAAC,4CAAyC;AACnE,YAAY,EAAC,kBAAkB,EAAC,uCAAoC;AACpE,OAAO,EAAC,aAAa,EAAC,uCAAoC;AAC1D,YAAY,EAAC,mBAAmB,EAAC,wCAAqC;AACtE,OAAO,EAAC,cAAc,EAAC,wCAAqC;AAC5D,YAAY,EAAC,0BAA0B,EAAC,gDAA6C;AACrF,OAAO,EAAC,qBAAqB,EAAC,gDAA6C;AAG3E,YAAY,EAAC,kBAAkB,EAAC,2BAAwB;AACxD,OAAO,EAAC,YAAY,IAAI,aAAa,EAAC,2BAAwB"}

package/dist/index.js

@@ -1,27 +1,28 @@
 // luma.gl Engine API
 // Animation
-export { Timeline } from './animation/timeline';
-export { KeyFrames } from './animation/key-frames';
-export { AnimationLoopTemplate } from './animation-loop/animation-loop-template';
-export { AnimationLoop } from './animation-loop/animation-loop';
-export { makeAnimationLoop } from './animation-loop/make-animation-loop';
-export { Model } from './model/model';
-export { BufferTransform } from './transform/buffer-transform';
-export { TextureTransform } from './transform/texture-transform';
-export { PipelineFactory } from './lib/pipeline-factory';
+export { Timeline } from "./animation/timeline.js";
+export { KeyFrames } from "./animation/key-frames.js";
+export { AnimationLoopTemplate } from "./animation-loop/animation-loop-template.js";
+export { AnimationLoop } from "./animation-loop/animation-loop.js";
+export { makeAnimationLoop } from "./animation-loop/make-animation-loop.js";
+export { Model } from "./model/model.js";
+export { BufferTransform } from "./transform/buffer-transform.js";
+export { TextureTransform } from "./transform/texture-transform.js";
+export { PipelineFactory } from "./lib/pipeline-factory.js";
+export { ShaderFactory } from "./lib/shader-factory.js";
 // Utils
-export { ClipSpace } from './lib/clip-space';
+export { ClipSpace } from "./lib/clip-space.js";
 // Scenegraph Core nodes
-export { ScenegraphNode } from './scenegraph/scenegraph-node';
-export { GroupNode } from './scenegraph/group-node';
-export { ModelNode } from './scenegraph/model-node';
-export { Geometry } from './geometry/geometry';
-export { GPUGeometry } from './geometry/gpu-geometry';
-export { ConeGeometry } from './geometries/cone-geometry';
-export { CubeGeometry } from './geometries/cube-geometry';
-export { CylinderGeometry } from './geometries/cylinder-geometry';
-export { IcoSphereGeometry } from './geometries/ico-sphere-geometry';
-export { PlaneGeometry } from './geometries/plane-geometry';
-export { SphereGeometry } from './geometries/sphere-geometry';
-export { TruncatedConeGeometry } from './geometries/truncated-cone-geometry';
-export { ShaderInputs as _ShaderInputs } from './shader-inputs';
+export { ScenegraphNode } from "./scenegraph/scenegraph-node.js";
+export { GroupNode } from "./scenegraph/group-node.js";
+export { ModelNode } from "./scenegraph/model-node.js";
+export { Geometry } from "./geometry/geometry.js";
+export { GPUGeometry } from "./geometry/gpu-geometry.js";
+export { ConeGeometry } from "./geometries/cone-geometry.js";
+export { CubeGeometry } from "./geometries/cube-geometry.js";
+export { CylinderGeometry } from "./geometries/cylinder-geometry.js";
+export { IcoSphereGeometry } from "./geometries/ico-sphere-geometry.js";
+export { PlaneGeometry } from "./geometries/plane-geometry.js";
+export { SphereGeometry } from "./geometries/sphere-geometry.js";
+export { TruncatedConeGeometry } from "./geometries/truncated-cone-geometry.js";
+export { ShaderInputs as _ShaderInputs } from "./shader-inputs.js";

package/dist/lib/clip-space.d.ts

@@ -1,5 +1,5 @@
 import { Device } from '@luma.gl/core';
-import { Model, ModelProps } from '../model/model';
+import { Model, ModelProps } from "../model/model.js";
 /**
  * A flat geometry that covers the "visible area" that the GPU renders.
  */

package/dist/lib/clip-space.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clip-space.d.ts","sourceRoot":"","sources":["../../src/lib/clip-space.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,MAAM,EAAO,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAC,KAAK,EAAE,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAwBjD;;GAEG;AACH,qBAAa,SAAU,SAAQ,KAAK;gBACtB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,GAAG,aAAa,GAAG,UAAU,CAAC;CAqBtF"}
+{"version":3,"file":"clip-space.d.ts","sourceRoot":"","sources":["../../src/lib/clip-space.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAO,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAC,KAAK,EAAE,UAAU,EAAC,0BAAuB;AAwBjD;;GAEG;AACH,qBAAa,SAAU,SAAQ,KAAK;gBACtB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,GAAG,aAAa,GAAG,UAAU,CAAC;CAkBtF"}

package/dist/lib/clip-space.js

@@ -1,7 +1,7 @@
 // ClipSpace
 import { glsl } from '@luma.gl/core';
-import { Model } from '../model/model';
-import { Geometry } from '../geometry/geometry';
+import { Model } from "../model/model.js";
+import { Geometry } from "../geometry/geometry.js";
 const CLIPSPACE_VERTEX_SHADER = glsl `\
 #version 300 es
 in vec2 aClipSpacePosition;
@@ -26,7 +26,7 @@ const POSITIONS = [-1, -1, 1, -1, -1, 1, 1, 1];
  */
 export class ClipSpace extends Model {
     constructor(device, opts) {
-        const TEX_COORDS = POSITIONS.map((coord) => (coord === -1 ? 0 : coord));
+        const TEX_COORDS = POSITIONS.map(coord => (coord === -1 ? 0 : coord));
         super(device, {
             ...opts,
             vs: CLIPSPACE_VERTEX_SHADER,

package/dist/lib/pipeline-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline-factory.d.ts","sourceRoot":"","sources":["../../src/lib/pipeline-factory.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,eAAe,CAAC;AACvD,OAAO,EAAC,MAAM,EAAE,cAAc,EAAC,MAAM,eAAe,CAAC;AAErD,MAAM,MAAM,oBAAoB,GAAG,mBAAmB,CAAC;AAEvD;;GAEG;AACH,qBAAa,eAAe;IAC1B,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAoC;IAEvF,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8B;IACtD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA8B;IACzD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAsC;IAErE,MAAM,CAAC,yBAAyB,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe;gBAMrD,MAAM,EAAE,MAAM;IAI1B,oBAAoB,CAAC,OAAO,EAAE,oBAAoB,GAAG,cAAc;IAkBnE,OAAO,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAYvC,qEAAqE;IACrE,OAAO,CAAC,mBAAmB;IAuB3B,OAAO,CAAC,QAAQ;CAMjB"}
+{"version":3,"file":"pipeline-factory.d.ts","sourceRoot":"","sources":["../../src/lib/pipeline-factory.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,eAAe,CAAC;AACvD,OAAO,EAAC,MAAM,EAAE,cAAc,EAAC,MAAM,eAAe,CAAC;AAErD,MAAM,MAAM,oBAAoB,GAAG,mBAAmB,CAAC;AAEvD;;GAEG;AACH,qBAAa,eAAe;IAC1B,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAoC;IAEvF,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8B;IACtD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA8B;IACzD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAsC;IAErE,MAAM,CAAC,yBAAyB,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe;gBAMrD,MAAM,EAAE,MAAM;IAI1B,oBAAoB,CAAC,OAAO,EAAE,oBAAoB,GAAG,cAAc;IAkBnE,OAAO,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAYvC,qEAAqE;IACrE,OAAO,CAAC,mBAAmB;IAuB3B,OAAO,CAAC,QAAQ;CAMjB"}

package/dist/lib/pipeline-factory.js

@@ -1,3 +1,6 @@
+// luma.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { RenderPipeline } from '@luma.gl/core';
 /**
  * Efficiently creates / caches pipelines

package/dist/lib/shader-factory.d.ts

@@ -0,0 +1,17 @@
+import { Device, Shader, ShaderProps } from '@luma.gl/core';
+/** Manages a cached pool of Shaders for reuse. */
+export declare class ShaderFactory {
+    static readonly defaultProps: Required<ShaderProps>;
+    readonly device: Device;
+    private readonly _cache;
+    /** Returns the default ShaderFactory for the given {@link Device}, creating one if necessary. */
+    static getDefaultShaderFactory(device: Device): ShaderFactory;
+    /** @internal */
+    constructor(device: Device);
+    /** Requests a {@link Shader} from the cache, creating a new Shader only if necessary. */
+    createShader(props: ShaderProps): Shader;
+    /** Releases a previously-requested {@link Shader}, destroying it if no users remain. */
+    release(shader: Shader): void;
+    private _hashShader;
+}
+//# sourceMappingURL=shader-factory.d.ts.map

package/dist/lib/shader-factory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shader-factory.d.ts","sourceRoot":"","sources":["../../src/lib/shader-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AAE1D,kDAAkD;AAClD,qBAAa,aAAa;IACxB,MAAM,CAAC,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC,WAAW,CAAC,CAA4B;IAE/E,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0D;IAEjF,iGAAiG;IACjG,MAAM,CAAC,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa;IAK7D,gBAAgB;gBACJ,MAAM,EAAE,MAAM;IAI1B,yFAAyF;IACzF,YAAY,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM;IAgBxC,wFAAwF;IACxF,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAY7B,OAAO,CAAC,WAAW;CAGpB"}

package/dist/lib/shader-factory.js

@@ -0,0 +1,44 @@
+import { Shader } from '@luma.gl/core';
+/** Manages a cached pool of Shaders for reuse. */
+export class ShaderFactory {
+    static defaultProps = { ...Shader.defaultProps };
+    device;
+    _cache = {};
+    /** Returns the default ShaderFactory for the given {@link Device}, creating one if necessary. */
+    static getDefaultShaderFactory(device) {
+        device._lumaData.defaultShaderFactory ||= new ShaderFactory(device);
+        return device._lumaData.defaultShaderFactory;
+    }
+    /** @internal */
+    constructor(device) {
+        this.device = device;
+    }
+    /** Requests a {@link Shader} from the cache, creating a new Shader only if necessary. */
+    createShader(props) {
+        const key = this._hashShader(props);
+        let cacheEntry = this._cache[key];
+        if (!cacheEntry) {
+            const shader = this.device.createShader({
+                ...props,
+                id: props.id ? `${props.id}-cached` : undefined
+            });
+            this._cache[key] = cacheEntry = { shader, useCount: 0 };
+        }
+        cacheEntry.useCount++;
+        return cacheEntry.shader;
+    }
+    /** Releases a previously-requested {@link Shader}, destroying it if no users remain. */
+    release(shader) {
+        const key = this._hashShader(shader);
+        const cacheEntry = this._cache[key];
+        cacheEntry.useCount--;
+        if (cacheEntry.useCount === 0) {
+            delete this._cache[key];
+            cacheEntry.shader.destroy();
+        }
+    }
+    // PRIVATE
+    _hashShader(value) {
+        return `${value.stage}:${value.source}`;
+    }
+}

package/dist/model/model.d.ts

@@ -1,13 +1,15 @@
-import type { TypedArray, RenderPipelineProps, RenderPipelineParameters } from '@luma.gl/core';
+import type { TypedArray } from '@luma.gl/core';
+import type { RenderPipelineProps, RenderPipelineParameters } from '@luma.gl/core';
 import type { BufferLayout, VertexArray, TransformFeedback } from '@luma.gl/core';
 import type { AttributeInfo, Binding, UniformValue, PrimitiveTopology } from '@luma.gl/core';
 import { Device, Buffer, RenderPipeline, RenderPass, UniformStore } from '@luma.gl/core';
 import type { ShaderModule, PlatformInfo } from '@luma.gl/shadertools';
 import { ShaderAssembler } from '@luma.gl/shadertools';
-import { ShaderInputs } from '../shader-inputs';
-import type { Geometry } from '../geometry/geometry';
-import { GPUGeometry } from '../geometry/gpu-geometry';
-import { PipelineFactory } from '../lib/pipeline-factory';
+import { ShaderInputs } from "../shader-inputs.js";
+import type { Geometry } from "../geometry/geometry.js";
+import { GPUGeometry } from "../geometry/gpu-geometry.js";
+import { PipelineFactory } from "../lib/pipeline-factory.js";
+import { ShaderFactory } from "../lib/shader-factory.js";
 export type ModelProps = Omit<RenderPipelineProps, 'vs' | 'fs'> & {
     source?: string;
     vs: {
@@ -24,8 +26,10 @@ export type ModelProps = Omit<RenderPipelineProps, 'vs' | 'fs'> & {
     defines?: Record<string, string | number | boolean>;
     /** Shader inputs, used to generated uniform buffers and bindings */
     shaderInputs?: ShaderInputs;
-    /** pipeline factory to use to create render pipelines. Defaults to default factory for the device */
+    /** Factory used to create a {@link RenderPipeline}. Defaults to {@link Device} default factory. */
     pipelineFactory?: PipelineFactory;
+    /** Factory used to create a {@link Shader}. Defaults to {@link Device} default factory. */
+    shaderFactory?: ShaderFactory;
     /** Shader assembler. Defaults to the ShaderAssembler.getShaderAssembler() */
     shaderAssembler?: ShaderAssembler;
     /** Parameters that are built into the pipeline */
@@ -41,11 +45,15 @@ export type ModelProps = Omit<RenderPipelineProps, 'vs' | 'fs'> & {
     attributes?: Record<string, Buffer>;
     /**   */
     constantAttributes?: Record<string, TypedArray>;
+    /** Some applications intentionally supply unused attributes */
+    ignoreUnknownAttributes?: boolean;
     /** @internal For use with {@link TransformFeedback}, WebGL only. */
     varyings?: string[];
     transformFeedback?: TransformFeedback;
     /** Mapped uniforms for shadertool modules */
     moduleSettings?: Record<string, Record<string, any>>;
+    /** Show shader source in browser? */
+    debugShaders?: 'never' | 'errors' | 'warnings' | 'always';
 };
 /**
  * v9 Model API
@@ -62,6 +70,7 @@ export declare class Model {
     readonly vs: string;
     readonly fs: string;
     readonly pipelineFactory: PipelineFactory;
+    readonly shaderFactory: ShaderFactory;
     userData: {
         [key: string]: any;
     };
@@ -103,6 +112,7 @@ export declare class Model {
     _gpuGeometry: GPUGeometry | null;
     private _getModuleUniforms;
     private props;
+    private _destroyed;
     constructor(device: Device, props: ModelProps);
     destroy(): void;
     predraw(): void;
@@ -126,7 +136,7 @@ export declare class Model {
     setTopology(topology: PrimitiveTopology): void;
     /**
      * Updates the buffer layout.
-     * @note Triggers a pipeline rebuild / pipeline cache fetch on WebGPU
+     * @note Triggers a pipeline rebuild / pipeline cache fetch
      */
     setBufferLayout(bufferLayout: BufferLayout[]): void;
     /**
@@ -179,7 +189,9 @@ export declare class Model {
      * Sets attributes (buffers)
      * @note Overrides any attributes previously set with the same name
      */
-    setAttributes(buffers: Record<string, Buffer>, _option?: 'ignore-unknown'): void;
+    setAttributes(buffers: Record<string, Buffer>, options?: {
+        ignoreUnknownAttributes?: boolean;
+    }): void;
     /**
      * Sets constant attributes
      * @note Overrides any attributes previously set with the same name

package/dist/model/model.d.ts.map

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

package/dist/model/model.js

@@ -1,14 +1,16 @@
-// luma.gl, MIT license
+// luma.gl
+// SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { Buffer, RenderPipeline, UniformStore, getTypedArrayFromDataType } from '@luma.gl/core';
+import { Buffer, RenderPipeline, UniformStore } from '@luma.gl/core';
 import { log, uid, deepEqual, splitUniformsAndBindings, isNumberArray } from '@luma.gl/core';
-import { getAttributeInfosFromLayouts } from '@luma.gl/core';
+import { getTypedArrayFromDataType, getAttributeInfosFromLayouts } from '@luma.gl/core';
 import { ShaderAssembler, getShaderLayoutFromWGSL } from '@luma.gl/shadertools';
-import { ShaderInputs } from '../shader-inputs';
-import { makeGPUGeometry } from '../geometry/gpu-geometry';
-import { PipelineFactory } from '../lib/pipeline-factory';
-import { getDebugTableForShaderLayout } from '../debug/debug-shader-layout';
-import { debugFramebuffer } from '../debug/debug-framebuffer';
+import { ShaderInputs } from "../shader-inputs.js";
+import { makeGPUGeometry } from "../geometry/gpu-geometry.js";
+import { PipelineFactory } from "../lib/pipeline-factory.js";
+import { ShaderFactory } from "../lib/shader-factory.js";
+import { getDebugTableForShaderLayout } from "../debug/debug-shader-layout.js";
+import { debugFramebuffer } from "../debug/debug-framebuffer.js";
 const LOG_DRAW_PRIORITY = 2;
 const LOG_DRAW_TIMEOUT = 10000;
 /**
@@ -38,14 +40,18 @@ export class Model {
         varyings: [],
         shaderInputs: undefined,
         pipelineFactory: undefined,
+        shaderFactory: undefined,
         transformFeedback: undefined,
-        shaderAssembler: ShaderAssembler.getDefaultShaderAssembler()
+        shaderAssembler: ShaderAssembler.getDefaultShaderAssembler(),
+        debugShaders: undefined,
+        ignoreUnknownAttributes: undefined
     };
     device;
     id;
     vs;
     fs;
     pipelineFactory;
+    shaderFactory;
     userData = {};
     // Fixed properties (change can trigger pipeline rebuild)
     /** The render pipeline GPU parameters, depth testing etc */
@@ -87,6 +93,7 @@ export class Model {
     _gpuGeometry = null;
     _getModuleUniforms;
     props;
+    _destroyed = false;
     constructor(device, props) {
         this.props = { ...Model.defaultProps, ...props };
         props = this.props;
@@ -133,6 +140,7 @@ export class Model {
         }
         this.pipelineFactory =
             props.pipelineFactory || PipelineFactory.getDefaultPipelineFactory(this.device);
+        this.shaderFactory = props.shaderFactory || ShaderFactory.getDefaultShaderFactory(this.device);
         // Create the pipeline
         // @note order is important
         this.pipeline = this._updatePipeline();
@@ -158,7 +166,9 @@ export class Model {
             this.setIndexBuffer(props.indexBuffer);
         }
         if (props.attributes) {
-            this.setAttributes(props.attributes);
+            this.setAttributes(props.attributes, {
+                ignoreUnknownAttributes: props.ignoreUnknownAttributes
+            });
         }
         if (props.constantAttributes) {
             this.setConstantAttributes(props.constantAttributes);
@@ -176,14 +186,17 @@ export class Model {
         if (props.transformFeedback) {
             this.transformFeedback = props.transformFeedback;
         }
-        // TODO - restore?
-        // this.setUniforms(this._getModuleUniforms()); // Get all default module uniforms
         // Catch any access to non-standard props
         Object.seal(this);
     }
     destroy() {
+        if (this._destroyed)
+            return;
         this.pipelineFactory.release(this.pipeline);
+        this.shaderFactory.release(this.pipeline.vs);
+        this.shaderFactory.release(this.pipeline.fs);
         this._uniformStore.destroy();
+        this._destroyed = true;
     }
     // Draw call
     predraw() {
@@ -200,9 +213,11 @@ export class Model {
             // Set pipeline state, we may be sharing a pipeline so we need to set all state on every draw
             // Any caching needs to be done inside the pipeline functions
             this.pipeline.setBindings(this.bindings);
-            this.pipeline.setUniforms(this.uniforms);
+            this.pipeline.setUniformsWebGL(this.uniforms);
             const { indexBuffer } = this.vertexArray;
-            const indexCount = indexBuffer ? indexBuffer.byteLength / (indexBuffer.indexType === 'uint32' ? 4 : 2) : undefined;
+            const indexCount = indexBuffer
+                ? indexBuffer.byteLength / (indexBuffer.indexType === 'uint32' ? 4 : 2)
+                : undefined;
             this.pipeline.draw({
                 renderPass,
                 vertexArray: this.vertexArray,
@@ -249,8 +264,8 @@ export class Model {
         // TODO - delete previous geometry?
         this.vertexCount = gpuGeometry.vertexCount;
         this.setIndexBuffer(gpuGeometry.indices);
-        this.setAttributes(gpuGeometry.attributes, 'ignore-unknown');
-        this.setAttributes(attributes);
+        this.setAttributes(gpuGeometry.attributes, { ignoreUnknownAttributes: true });
+        this.setAttributes(attributes, { ignoreUnknownAttributes: this.props.ignoreUnknownAttributes });
     }
     /**
      * Updates the primitive topology ('triangle-list', 'triangle-strip' etc).
@@ -264,7 +279,7 @@ export class Model {
     }
     /**
      * Updates the buffer layout.
-     * @note Triggers a pipeline rebuild / pipeline cache fetch on WebGPU
+     * @note Triggers a pipeline rebuild / pipeline cache fetch
      */
     setBufferLayout(bufferLayout) {
         this.bufferLayout = this._gpuGeometry
@@ -360,7 +375,7 @@ export class Model {
      * @returns self for chaining
      */
     setUniforms(uniforms) {
-        this.pipeline.setUniforms(uniforms);
+        this.pipeline.setUniformsWebGL(uniforms);
         Object.assign(this.uniforms, uniforms);
     }
     /**
@@ -380,7 +395,7 @@ export class Model {
      * Sets attributes (buffers)
      * @note Overrides any attributes previously set with the same name
      */
-    setAttributes(buffers, _option) {
+    setAttributes(buffers, options) {
         if (buffers.indices) {
             log.warn(`Model:${this.id} setAttributes() - indexBuffer should be set using setIndexBuffer()`)();
         }
@@ -400,7 +415,7 @@ export class Model {
                     set = true;
                 }
             }
-            if (!set && _option !== 'ignore-unknown') {
+            if (!set && (options?.ignoreUnknownAttributes || this.props.ignoreUnknownAttributes)) {
                 log.warn(`Model(${this.id}): Ignoring buffer "${buffer.id}" for unknown attribute "${bufferName}"`)();
             }
         }
@@ -417,7 +432,7 @@ export class Model {
         for (const [attributeName, value] of Object.entries(attributes)) {
             const attributeInfo = this._attributeInfos[attributeName];
             if (attributeInfo) {
-                this.vertexArray.setConstant(attributeInfo.location, value);
+                this.vertexArray.setConstantWebGL(attributeInfo.location, value);
             }
             else {
                 log.warn(`Model "${this.id}: Ignoring constant supplied for unknown attribute "${attributeName}"`)();
@@ -429,20 +444,26 @@ export class Model {
     }
     _updatePipeline() {
         if (this._pipelineNeedsUpdate) {
+            let prevShaderVs = null;
+            let prevShaderFs = null;
             if (this.pipeline) {
                 log.log(1, `Model ${this.id}: Recreating pipeline because "${this._pipelineNeedsUpdate}".`)();
+                prevShaderVs = this.pipeline.vs;
+                prevShaderFs = this.pipeline.fs;
             }
             this._pipelineNeedsUpdate = false;
-            const vs = this.device.createShader({
+            const vs = this.shaderFactory.createShader({
                 id: `${this.id}-vertex`,
                 stage: 'vertex',
-                source: this.vs
+                source: this.vs,
+                debug: this.props.debugShaders
             });
             const fs = this.fs
-                ? this.device.createShader({
+                ? this.shaderFactory.createShader({
                     id: `${this.id}-fragment`,
                     stage: 'fragment',
-                    source: this.fs
+                    source: this.fs,
+                    debug: this.props.debugShaders
                 })
                 : null;
             this.pipeline = this.pipelineFactory.createRenderPipeline({
@@ -454,6 +475,10 @@ export class Model {
                 fs
             });
             this._attributeInfos = getAttributeInfosFromLayouts(this.pipeline.shaderLayout, this.bufferLayout);
+            if (prevShaderVs)
+                this.shaderFactory.release(prevShaderVs);
+            if (prevShaderFs)
+                this.shaderFactory.release(prevShaderFs);
         }
         return this.pipeline;
     }
@@ -494,7 +519,7 @@ export class Model {
         const debugFramebuffers = log.get('framebuffer');
         this._drawCount++;
         // Update first 3 frames and then every 60 frames
-        if (!debugFramebuffers || ((this._drawCount++ > 3) && (this._drawCount % 60))) {
+        if (!debugFramebuffers || (this._drawCount++ > 3 && this._drawCount % 60)) {
             return;
         }
         // TODO - display framebuffer output in debug window
@@ -555,6 +580,7 @@ export function getPlatformInfo(device) {
         shaderLanguage: device.info.shadingLanguage,
         shaderLanguageVersion: device.info.shadingLanguageVersion,
         gpu: device.info.gpu,
+        // HACK - we pretend that the DeviceFeatures is a Set, it has a similar API
         features: device.features
     };
 }

package/dist/scenegraph/group-node.d.ts

@@ -1,5 +1,5 @@
 import { Matrix4 } from '@math.gl/core';
-import { ScenegraphNode, ScenegraphNodeProps } from './scenegraph-node';
+import { ScenegraphNode, ScenegraphNodeProps } from "./scenegraph-node.js";
 export type GroupNodeProps = ScenegraphNodeProps & {
     children?: ScenegraphNode[];
 };

package/dist/scenegraph/group-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"group-node.d.ts","sourceRoot":"","sources":["../../src/scenegraph/group-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAU,MAAM,eAAe,CAAC;AAE/C,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAC,MAAM,mBAAmB,CAAC;AAEtE,MAAM,MAAM,cAAc,GAAG,mBAAmB,GAAG;IACjD,QAAQ,CAAC,EAAE,cAAc,EAAE,CAAC;CAC7B,CAAA;AAED,qBAAa,SAAU,SAAQ,cAAc;IAC3C,QAAQ,EAAE,cAAc,EAAE,CAAC;gBAEf,QAAQ,EAAE,cAAc,EAAE;gBAC1B,KAAK,CAAC,EAAE,cAAc;IAazB,SAAS,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,GAAG,IAAI;IAkCxC,OAAO,IAAI,IAAI;IAOxB,GAAG,CAAC,GAAG,QAAQ,EAAE,CAAC,cAAc,GAAG,cAAc,EAAE,CAAC,EAAE,GAAG,IAAI;IAW7D,MAAM,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI;IASnC,SAAS,IAAI,IAAI;IAKjB,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE;QAAC,WAAW,EAAE,OAAO,CAAA;KAAC,KAAK,IAAI,EAAE,EAAC,WAA2B,EAAC;;KAAK;CAWtH"}
+{"version":3,"file":"group-node.d.ts","sourceRoot":"","sources":["../../src/scenegraph/group-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAU,MAAM,eAAe,CAAC;AAE/C,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAC,6BAA0B;AAEtE,MAAM,MAAM,cAAc,GAAG,mBAAmB,GAAG;IACjD,QAAQ,CAAC,EAAE,cAAc,EAAE,CAAC;CAC7B,CAAC;AAEF,qBAAa,SAAU,SAAQ,cAAc;IAC3C,QAAQ,EAAE,cAAc,EAAE,CAAC;gBAEf,QAAQ,EAAE,cAAc,EAAE;gBAC1B,KAAK,CAAC,EAAE,cAAc;IAazB,SAAS,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,GAAG,IAAI;IAmCxC,OAAO,IAAI,IAAI;IAOxB,GAAG,CAAC,GAAG,QAAQ,EAAE,CAAC,cAAc,GAAG,cAAc,EAAE,CAAC,EAAE,GAAG,IAAI;IAW7D,MAAM,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI;IASnC,SAAS,IAAI,IAAI;IAKjB,QAAQ,CACN,OAAO,EAAE,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE;QAAC,WAAW,EAAE,OAAO,CAAA;KAAC,KAAK,IAAI,EACxE,EAAC,WAA2B,EAAC;;KAAK;CAYrC"}