@luma.gl/engine 9.0.0-alpha.35 → 9.0.0-alpha.37

package/dist/index.d.ts

@@ -10,6 +10,7 @@ export type { ModelProps } from './model/model';
 export { Model } from './model/model';
 export { Transform } from './transform/transform';
 export { PipelineFactory } from './lib/pipeline-factory';
+export { ShaderModuleUniforms } from './shadertools/shader-module-uniforms';
 export { ClipSpace } from './lib/clip-space';
 export { ScenegraphNode } from './scenegraph/scenegraph-node';
 export { GroupNode } from './scenegraph/group-node';

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,8BAA8B,CAAC;AAEnE,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;AAEpC,OAAO,EAAC,SAAS,EAAC,MAAM,uBAAuB,CAAC;AAEhD,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,OAAO,EAAC,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAGlD,YAAY,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAC,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AAG7C,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"}
+{"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,8BAA8B,CAAC;AAEnE,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;AAEpC,OAAO,EAAC,SAAS,EAAC,MAAM,uBAAuB,CAAC;AAEhD,OAAO,EAAC,eAAe,EAAC,MAAM,wBAAwB,CAAC;AAGvD,OAAO,EAAC,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AAG1E,OAAO,EAAC,SAAS,EAAC,MAAM,kBAAkB,CAAC;AAG3C,OAAO,EAAC,cAAc,EAAC,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAC,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAC,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAGlD,YAAY,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAC,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AAG7C,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"}

package/dist/index.js

@@ -6,6 +6,7 @@ export { makeAnimationLoop } from "./animation-loop/make-animation-loop.js";
 export { Model } from "./model/model.js";
 export { Transform } from "./transform/transform.js";
 export { PipelineFactory } from "./lib/pipeline-factory.js";
+export { ShaderModuleUniforms } from "./shadertools/shader-module-uniforms.js";
 export { ClipSpace } from "./lib/clip-space.js";
 export { ScenegraphNode } from "./scenegraph/scenegraph-node.js";
 export { GroupNode } from "./scenegraph/group-node.js";

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["Timeline","KeyFrames","AnimationLoopTemplate","AnimationLoop","makeAnimationLoop","Model","Transform","PipelineFactory","ClipSpace","ScenegraphNode","GroupNode","ModelNode","Geometry","ConeGeometry","CubeGeometry","CylinderGeometry","IcoSphereGeometry","PlaneGeometry","SphereGeometry","TruncatedConeGeometry"],"sources":["../src/index.ts"],"sourcesContent":["// luma.gl Engine API\n\n// Animation\nexport {Timeline} from './animation/timeline';\nexport {KeyFrames} from './animation/key-frames';\nexport type {AnimationProps} from './animation-loop/animation-props';\n\nexport {AnimationLoopTemplate} from './animation-loop/render-loop';\n\nexport type {AnimationLoopProps} from './animation-loop/animation-loop';\nexport {AnimationLoop} from './animation-loop/animation-loop';\n\nexport type {MakeAnimationLoopProps} from './animation-loop/make-animation-loop';\nexport {makeAnimationLoop} from './animation-loop/make-animation-loop';\n\nexport type {ModelProps} from './model/model';\nexport {Model} from './model/model';\n\nexport {Transform} from './transform/transform';\n\nexport {PipelineFactory} from './lib/pipeline-factory';\n\n// Utils\nexport {ClipSpace} from './lib/clip-space';\n\n// Scenegraph Core nodes\nexport {ScenegraphNode} from './scenegraph/scenegraph-node';\nexport {GroupNode} from './scenegraph/group-node';\nexport {ModelNode} from './scenegraph/model-node';\n\n// Geometries\nexport type {GeometryProps} from './geometry/geometry';\nexport {Geometry} from './geometry/geometry';\n\n// Primitives\nexport type {ConeGeometryProps} from './geometries/cone-geometry';\nexport {ConeGeometry} from './geometries/cone-geometry';\nexport type {CubeGeometryProps} from './geometries/cube-geometry';\nexport {CubeGeometry} from './geometries/cube-geometry';\nexport type {CylinderGeometryProps} from './geometries/cylinder-geometry';\nexport {CylinderGeometry} from './geometries/cylinder-geometry';\nexport type {IcoSphereGeometryProps} from './geometries/ico-sphere-geometry';\nexport {IcoSphereGeometry} from './geometries/ico-sphere-geometry';\nexport type {PlaneGeometryProps} from './geometries/plane-geometry';\nexport {PlaneGeometry} from './geometries/plane-geometry';\nexport type {SphereGeometryProps} from './geometries/sphere-geometry';\nexport {SphereGeometry} from './geometries/sphere-geometry';\nexport type {TruncatedConeGeometryProps} from './geometries/truncated-cone-geometry';\nexport {TruncatedConeGeometry} from './geometries/truncated-cone-geometry';\n\n"],"mappings":"SAGQA,QAAQ;AAAA,SACRC,SAAS;AAAA,SAGTC,qBAAqB;AAAA,SAGrBC,aAAa;AAAA,SAGbC,iBAAiB;AAAA,SAGjBC,KAAK;AAAA,SAELC,SAAS;AAAA,SAETC,eAAe;AAAA,SAGfC,SAAS;AAAA,SAGTC,cAAc;AAAA,SACdC,SAAS;AAAA,SACTC,SAAS;AAAA,SAITC,QAAQ;AAAA,SAIRC,YAAY;AAAA,SAEZC,YAAY;AAAA,SAEZC,gBAAgB;AAAA,SAEhBC,iBAAiB;AAAA,SAEjBC,aAAa;AAAA,SAEbC,cAAc;AAAA,SAEdC,qBAAqB"}
+{"version":3,"file":"index.js","names":["Timeline","KeyFrames","AnimationLoopTemplate","AnimationLoop","makeAnimationLoop","Model","Transform","PipelineFactory","ShaderModuleUniforms","ClipSpace","ScenegraphNode","GroupNode","ModelNode","Geometry","ConeGeometry","CubeGeometry","CylinderGeometry","IcoSphereGeometry","PlaneGeometry","SphereGeometry","TruncatedConeGeometry"],"sources":["../src/index.ts"],"sourcesContent":["// luma.gl Engine API\n\n// Animation\nexport {Timeline} from './animation/timeline';\nexport {KeyFrames} from './animation/key-frames';\nexport type {AnimationProps} from './animation-loop/animation-props';\n\nexport {AnimationLoopTemplate} from './animation-loop/render-loop';\n\nexport type {AnimationLoopProps} from './animation-loop/animation-loop';\nexport {AnimationLoop} from './animation-loop/animation-loop';\n\nexport type {MakeAnimationLoopProps} from './animation-loop/make-animation-loop';\nexport {makeAnimationLoop} from './animation-loop/make-animation-loop';\n\nexport type {ModelProps} from './model/model';\nexport {Model} from './model/model';\n\nexport {Transform} from './transform/transform';\n\nexport {PipelineFactory} from './lib/pipeline-factory';\n\n// shadertools\nexport {ShaderModuleUniforms} from './shadertools/shader-module-uniforms';\n\n// Utils\nexport {ClipSpace} from './lib/clip-space';\n\n// Scenegraph Core nodes\nexport {ScenegraphNode} from './scenegraph/scenegraph-node';\nexport {GroupNode} from './scenegraph/group-node';\nexport {ModelNode} from './scenegraph/model-node';\n\n// Geometries\nexport type {GeometryProps} from './geometry/geometry';\nexport {Geometry} from './geometry/geometry';\n\n// Primitives\nexport type {ConeGeometryProps} from './geometries/cone-geometry';\nexport {ConeGeometry} from './geometries/cone-geometry';\nexport type {CubeGeometryProps} from './geometries/cube-geometry';\nexport {CubeGeometry} from './geometries/cube-geometry';\nexport type {CylinderGeometryProps} from './geometries/cylinder-geometry';\nexport {CylinderGeometry} from './geometries/cylinder-geometry';\nexport type {IcoSphereGeometryProps} from './geometries/ico-sphere-geometry';\nexport {IcoSphereGeometry} from './geometries/ico-sphere-geometry';\nexport type {PlaneGeometryProps} from './geometries/plane-geometry';\nexport {PlaneGeometry} from './geometries/plane-geometry';\nexport type {SphereGeometryProps} from './geometries/sphere-geometry';\nexport {SphereGeometry} from './geometries/sphere-geometry';\nexport type {TruncatedConeGeometryProps} from './geometries/truncated-cone-geometry';\nexport {TruncatedConeGeometry} from './geometries/truncated-cone-geometry';\n\n"],"mappings":"SAGQA,QAAQ;AAAA,SACRC,SAAS;AAAA,SAGTC,qBAAqB;AAAA,SAGrBC,aAAa;AAAA,SAGbC,iBAAiB;AAAA,SAGjBC,KAAK;AAAA,SAELC,SAAS;AAAA,SAETC,eAAe;AAAA,SAGfC,oBAAoB;AAAA,SAGpBC,SAAS;AAAA,SAGTC,cAAc;AAAA,SACdC,SAAS;AAAA,SACTC,SAAS;AAAA,SAITC,QAAQ;AAAA,SAIRC,YAAY;AAAA,SAEZC,YAAY;AAAA,SAEZC,gBAAgB;AAAA,SAEhBC,iBAAiB;AAAA,SAEjBC,aAAa;AAAA,SAEbC,cAAc;AAAA,SAEdC,qBAAqB"}

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

@@ -4,6 +4,6 @@ import { Model, ModelProps } from '../model/model';
  * A flat geometry that covers the "visible area" that the GPU renders.
  */
 export declare class ClipSpace extends Model {
-    constructor(device: Device | WebGLRenderingContext, opts?: ModelProps);
+    constructor(device: Device, opts?: ModelProps);
 }
 //# sourceMappingURL=clip-space.d.ts.map

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;AAE3C,OAAO,EAAC,KAAK,EAAE,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAuBjD;;GAEG;AACH,qBAAa,SAAU,SAAQ,KAAK;gBACtB,MAAM,EAAE,MAAM,GAAG,qBAAqB,EAAE,IAAI,CAAC,EAAE,UAAU;CAqBtE"}
+{"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;AAuBjD;;GAEG;AACH,qBAAa,SAAU,SAAQ,KAAK;gBACtB,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,UAAU;CAqB9C"}

package/dist/lib/clip-space.js

@@ -1,5 +1,4 @@
 import { glsl } from '@luma.gl/core';
-import { WebGLDevice } from '@luma.gl/webgl';
 import { Model } from "../model/model.js";
 import { Geometry } from "../geometry/geometry.js";
 const CLIPSPACE_VERTEX_SHADER = glsl`\
@@ -22,7 +21,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);
-    super(WebGLDevice.attach(device), {
+    super(device, {
       ...opts,
       vs: CLIPSPACE_VERTEX_SHADER,
       vertexCount: 4,

package/dist/lib/clip-space.js.map

@@ -1 +1 @@
-{"version":3,"file":"clip-space.js","names":["glsl","WebGLDevice","Model","Geometry","CLIPSPACE_VERTEX_SHADER","POSITIONS","ClipSpace","constructor","device","opts","TEX_COORDS","map","coord","attach","vs","vertexCount","geometry","topology","attributes","aClipSpacePosition","size","value","Float32Array","aTexCoord","aCoordinate"],"sources":["../../src/lib/clip-space.ts"],"sourcesContent":["\n// ClipSpace\nimport {Device, glsl} from '@luma.gl/core';\nimport {WebGLDevice} from '@luma.gl/webgl';\nimport {Model, ModelProps} from '../model/model';\nimport {Geometry} from '../geometry/geometry';\n\nconst CLIPSPACE_VERTEX_SHADER = glsl`\\\nattribute vec2 aClipSpacePosition;\nattribute vec2 aTexCoord;\nattribute vec2 aCoordinate;\n\nvarying vec2 position;\nvarying vec2 coordinate;\nvarying vec2 uv;\n\nvoid main(void) {\n  gl_Position = vec4(aClipSpacePosition, 0., 1.);\n  position = aClipSpacePosition;\n  coordinate = aCoordinate;\n  uv = aTexCoord;\n}\n`;\n\n/* eslint-disable indent, no-multi-spaces */\nconst POSITIONS = [-1, -1, 1, -1, -1, 1, 1, 1];\n\n/**\n * A flat geometry that covers the \"visible area\" that the GPU renders.\n */\nexport class ClipSpace extends Model {\n  constructor(device: Device | WebGLRenderingContext, opts?: ModelProps) {\n    const TEX_COORDS = POSITIONS.map((coord) => (coord === -1 ? 0 : coord));\n\n    super(\n      WebGLDevice.attach(device),\n      {\n        ...opts,\n        vs: CLIPSPACE_VERTEX_SHADER,\n        vertexCount: 4,\n        geometry: new Geometry({\n          topology: 'triangle-strip',\n          vertexCount: 4,\n          attributes: {\n            aClipSpacePosition: {size: 2, value: new Float32Array(POSITIONS)},\n            aTexCoord: {size: 2, value: new Float32Array(TEX_COORDS)},\n            aCoordinate: {size: 2, value: new Float32Array(TEX_COORDS)}\n          }\n        })\n      }\n    );\n  }\n}\n"],"mappings":"AAEA,SAAgBA,IAAI,QAAO,eAAe;AAC1C,SAAQC,WAAW,QAAO,gBAAgB;AAAC,SACnCC,KAAK;AAAA,SACLC,QAAQ;AAEhB,MAAMC,uBAAuB,GAAGJ,IAAK;AACrC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CAAC;AAGD,MAAMK,SAAS,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;AAK9C,OAAO,MAAMC,SAAS,SAASJ,KAAK,CAAC;EACnCK,WAAWA,CAACC,MAAsC,EAAEC,IAAiB,EAAE;IACrE,MAAMC,UAAU,GAAGL,SAAS,CAACM,GAAG,CAAEC,KAAK,IAAMA,KAAK,KAAK,CAAC,CAAC,GAAG,CAAC,GAAGA,KAAM,CAAC;IAEvE,KAAK,CACHX,WAAW,CAACY,MAAM,CAACL,MAAM,CAAC,EAC1B;MACE,GAAGC,IAAI;MACPK,EAAE,EAAEV,uBAAuB;MAC3BW,WAAW,EAAE,CAAC;MACdC,QAAQ,EAAE,IAAIb,QAAQ,CAAC;QACrBc,QAAQ,EAAE,gBAAgB;QAC1BF,WAAW,EAAE,CAAC;QACdG,UAAU,EAAE;UACVC,kBAAkB,EAAE;YAACC,IAAI,EAAE,CAAC;YAAEC,KAAK,EAAE,IAAIC,YAAY,CAACjB,SAAS;UAAC,CAAC;UACjEkB,SAAS,EAAE;YAACH,IAAI,EAAE,CAAC;YAAEC,KAAK,EAAE,IAAIC,YAAY,CAACZ,UAAU;UAAC,CAAC;UACzDc,WAAW,EAAE;YAACJ,IAAI,EAAE,CAAC;YAAEC,KAAK,EAAE,IAAIC,YAAY,CAACZ,UAAU;UAAC;QAC5D;MACF,CAAC;IACH,CACF,CAAC;EACH;AACF"}
+{"version":3,"file":"clip-space.js","names":["glsl","Model","Geometry","CLIPSPACE_VERTEX_SHADER","POSITIONS","ClipSpace","constructor","device","opts","TEX_COORDS","map","coord","vs","vertexCount","geometry","topology","attributes","aClipSpacePosition","size","value","Float32Array","aTexCoord","aCoordinate"],"sources":["../../src/lib/clip-space.ts"],"sourcesContent":["\n// ClipSpace\nimport {Device, glsl} from '@luma.gl/core';\nimport {Model, ModelProps} from '../model/model';\nimport {Geometry} from '../geometry/geometry';\n\nconst CLIPSPACE_VERTEX_SHADER = glsl`\\\nattribute vec2 aClipSpacePosition;\nattribute vec2 aTexCoord;\nattribute vec2 aCoordinate;\n\nvarying vec2 position;\nvarying vec2 coordinate;\nvarying vec2 uv;\n\nvoid main(void) {\n  gl_Position = vec4(aClipSpacePosition, 0., 1.);\n  position = aClipSpacePosition;\n  coordinate = aCoordinate;\n  uv = aTexCoord;\n}\n`;\n\n/* eslint-disable indent, no-multi-spaces */\nconst POSITIONS = [-1, -1, 1, -1, -1, 1, 1, 1];\n\n/**\n * A flat geometry that covers the \"visible area\" that the GPU renders.\n */\nexport class ClipSpace extends Model {\n  constructor(device: Device, opts?: ModelProps) {\n    const TEX_COORDS = POSITIONS.map((coord) => (coord === -1 ? 0 : coord));\n\n    super(\n      device,\n      {\n        ...opts,\n        vs: CLIPSPACE_VERTEX_SHADER,\n        vertexCount: 4,\n        geometry: new Geometry({\n          topology: 'triangle-strip',\n          vertexCount: 4,\n          attributes: {\n            aClipSpacePosition: {size: 2, value: new Float32Array(POSITIONS)},\n            aTexCoord: {size: 2, value: new Float32Array(TEX_COORDS)},\n            aCoordinate: {size: 2, value: new Float32Array(TEX_COORDS)}\n          }\n        })\n      }\n    );\n  }\n}\n"],"mappings":"AAEA,SAAgBA,IAAI,QAAO,eAAe;AAAC,SACnCC,KAAK;AAAA,SACLC,QAAQ;AAEhB,MAAMC,uBAAuB,GAAGH,IAAK;AACrC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CAAC;AAGD,MAAMI,SAAS,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;AAK9C,OAAO,MAAMC,SAAS,SAASJ,KAAK,CAAC;EACnCK,WAAWA,CAACC,MAAc,EAAEC,IAAiB,EAAE;IAC7C,MAAMC,UAAU,GAAGL,SAAS,CAACM,GAAG,CAAEC,KAAK,IAAMA,KAAK,KAAK,CAAC,CAAC,GAAG,CAAC,GAAGA,KAAM,CAAC;IAEvE,KAAK,CACHJ,MAAM,EACN;MACE,GAAGC,IAAI;MACPI,EAAE,EAAET,uBAAuB;MAC3BU,WAAW,EAAE,CAAC;MACdC,QAAQ,EAAE,IAAIZ,QAAQ,CAAC;QACrBa,QAAQ,EAAE,gBAAgB;QAC1BF,WAAW,EAAE,CAAC;QACdG,UAAU,EAAE;UACVC,kBAAkB,EAAE;YAACC,IAAI,EAAE,CAAC;YAAEC,KAAK,EAAE,IAAIC,YAAY,CAAChB,SAAS;UAAC,CAAC;UACjEiB,SAAS,EAAE;YAACH,IAAI,EAAE,CAAC;YAAEC,KAAK,EAAE,IAAIC,YAAY,CAACX,UAAU;UAAC,CAAC;UACzDa,WAAW,EAAE;YAACJ,IAAI,EAAE,CAAC;YAAEC,KAAK,EAAE,IAAIC,YAAY,CAACX,UAAU;UAAC;QAC5D;MACF,CAAC;IACH,CACF,CAAC;EACH;AACF"}

package/dist/model/model.d.ts

@@ -1,4 +1,4 @@
-import type { TypedArray, RenderPipelineProps, RenderPipelineParameters, BufferLayout } from '@luma.gl/core';
+import type { TypedArray, RenderPipelineProps, RenderPipelineParameters, BufferLayout, VertexArray, AttributeInfo } from '@luma.gl/core';
 import type { Binding, UniformValue, PrimitiveTopology } from '@luma.gl/core';
 import { Device, Buffer, RenderPipeline, RenderPass } from '@luma.gl/core';
 import type { ShaderModule } from '@luma.gl/shadertools';
@@ -23,16 +23,21 @@ export type ModelProps = Omit<RenderPipelineProps, 'vs' | 'fs'> & {
     pipelineFactory?: PipelineFactory;
     /** Shader assembler. Defaults to the ShaderAssembler.getShaderAssembler() */
     shaderAssembler?: ShaderAssembler;
-    /** Geometry */
-    geometry?: GPUGeometry | Geometry | null;
     /** Parameters that are built into the pipeline */
     parameters?: RenderPipelineParameters;
-    /** shadertool modules */
-    moduleSettings?: Record<string, Record<string, any>>;
+    /** Geometry */
+    geometry?: GPUGeometry | Geometry | null;
     /** Vertex count */
     vertexCount?: number;
     /** instance count */
     instanceCount?: number;
+    indexBuffer?: Buffer | null;
+    /** @note this is really a map of buffers, not a map of attributes */
+    attributes?: Record<string, Buffer>;
+    /**   */
+    constantAttributes?: Record<string, TypedArray>;
+    /** Mapped uniforms for shadertool modules */
+    moduleSettings?: Record<string, Record<string, any>>;
 };
 /**
  * v9 Model API
@@ -63,7 +68,7 @@ export declare class Model {
     /** instance count */
     instanceCount: number;
     /** Index buffer */
-    indices: Buffer | null;
+    indexBuffer: Buffer | null;
     /** Buffer-valued attributes */
     bufferAttributes: Record<string, Buffer>;
     /** Constant-valued attributes */
@@ -74,7 +79,15 @@ export declare class Model {
     uniforms: Record<string, UniformValue>;
     /** The underlying GPU "program". @note May be recreated if parameters change */
     pipeline: RenderPipeline;
+    /**
+     * VertexArray
+     * @note not implemented: if bufferLayout is updated, vertex array has to be rebuilt!
+     * @todo - allow application to define multiple vertex arrays?
+     * */
+    vertexArray: VertexArray;
     _pipelineNeedsUpdate: string | false;
+    _attributeInfos: Record<string, AttributeInfo>;
+    _gpuGeometry: GPUGeometry | null;
     private _getModuleUniforms;
     private props;
     constructor(device: Device, props: ModelProps);
@@ -82,10 +95,16 @@ export declare class Model {
     draw(renderPass: RenderPass): void;
     /**
      * Updates the optional geometry
-    * Geometry, sets several attributes, indices, and also vertex count and topology
+     * Geometry, set topology and bufferLayout
+     * @note Can trigger a pipeline rebuild / pipeline cache fetch on WebGPU
+     */
+    setGeometry(geometry: GPUGeometry | Geometry): GPUGeometry;
+    /**
+     * Updates the optional geometry attributes
+     * Geometry, sets several attributes, indexBuffer, and also vertex count
      * @note Can trigger a pipeline rebuild / pipeline cache fetch on WebGPU
      */
-    setGeometry(geometry: GPUGeometry | Geometry): void;
+    _setGeometryAttributes(gpuGeometry: GPUGeometry): void;
     /**
      * Updates the primitive topology ('triangle-list', 'triangle-strip' etc).
      * @note Triggers a pipeline rebuild / pipeline cache fetch on WebGPU
@@ -120,33 +139,36 @@ export declare class Model {
      * @deprecated Updates shader module settings (which results in uniforms being set)
      */
     updateModuleSettings(props: Record<string, any>): void;
+    /**
+     * Sets bindings (textures, samplers, uniform buffers)
+     */
+    setBindings(bindings: Record<string, Binding>): void;
+    /**
+     * Sets individual uniforms
+     * @deprecated WebGL only, use uniform buffers for portability
+     * @param uniforms
+     * @returns self for chaining
+     */
+    setUniforms(uniforms: Record<string, UniformValue>): void;
     /**
      * Sets the index buffer
      * @todo - how to unset it if we change geometry?
      */
-    setIndexBuffer(indices: Buffer | null): void;
+    setIndexBuffer(indexBuffer: Buffer | null): void;
     /**
      * Sets attributes (buffers)
      * @note Overrides any attributes previously set with the same name
      */
-    setAttributes(bufferAttributes: Record<string, Buffer>): void;
+    setAttributes(buffers: Record<string, Buffer>): void;
     /**
      * Sets constant attributes
      * @note Overrides any attributes previously set with the same name
+     * Constant attributes are only supported in WebGL, not in WebGPU
+     * Any attribute that is disabled in the current vertex array object
+     * is read from the context's global constant value for that attribute location.
      * @param constantAttributes
      */
-    setConstantAttributes(constantAttributes: Record<string, TypedArray>): void;
-    /**
-     * Sets bindings (textures, samplers, uniform buffers)
-     */
-    setBindings(bindings: Record<string, Binding>): void;
-    /**
-     * Sets individual uniforms
-     * @deprecated WebGL only, use uniform buffers for portability
-     * @param uniforms
-     * @returns self for chaining
-     */
-    setUniforms(uniforms: Record<string, UniformValue>): void;
+    setConstantAttributes(attributes: Record<string, TypedArray>): void;
     _setPipelineNeedsUpdate(reason: string): void;
     _updatePipeline(): RenderPipeline;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/model/model.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,UAAU,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAC3G,OAAO,KAAK,EAAC,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAC5E,OAAO,EAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAsB,MAAM,eAAe,CAAC;AAC9F,OAAO,KAAK,EAAC,YAAY,EAAe,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAC,WAAW,EAAkB,MAAM,0BAA0B,CAAC;AACtE,OAAO,EAAC,eAAe,EAAC,MAAM,yBAAyB,CAAC;AAExD,MAAM,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,IAAI,GAAG,IAAI,CAAC,GAAG;IAEhE,EAAE,EAAE;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAC,GAAG,MAAM,GAAG,IAAI,CAAC;IACnD,EAAE,EAAE;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAC,GAAG,MAAM,GAAG,IAAI,CAAC;IACnD,uDAAuD;IACvD,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC;IACzB,wDAAwD;IACxD,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;IAIpD,qGAAqG;IACrG,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,6EAA6E;IAC7E,eAAe,CAAC,EAAE,eAAe,CAAC;IAElC,eAAe;IACf,QAAQ,CAAC,EAAE,WAAW,GAAG,QAAQ,GAAG,IAAI,CAAC;IACzC,kDAAkD;IAClD,UAAU,CAAC,EAAE,wBAAwB,CAAC;IACtC,yBAAyB;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IACrD,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,qBAAqB;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,KAAK;IAChB,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,UAAU,CAAC,CAcvC;IAEF,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1C,QAAQ,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,CAAM;IAIpC,4DAA4D;IAC5D,UAAU,EAAE,wBAAwB,CAAC;IAErC,6BAA6B;IAC7B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,oBAAoB;IACpB,YAAY,EAAE,YAAY,EAAE,CAAC;IAI7B,mBAAmB;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,qBAAqB;IACrB,aAAa,EAAE,MAAM,CAAK;IAE1B,mBAAmB;IACnB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC9B,+BAA+B;IAC/B,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;IAC9C,iCAAiC;IACjC,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAM;IACpD,qDAAqD;IACrD,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM;IACvC,qFAAqF;IACrF,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAM;IAE5C,gFAAgF;IAChF,QAAQ,EAAE,cAAc,CAAC;IACzB,oBAAoB,EAAE,MAAM,GAAG,KAAK,CAAmB;IACvD,OAAO,CAAC,kBAAkB,CAAuE;IACjG,OAAO,CAAC,KAAK,CAAuB;gBAExB,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU;IAuE7C,OAAO,IAAI,IAAI;IAMf,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAsBlC;;;;OAIG;IACH,WAAW,CAAC,QAAQ,EAAE,WAAW,GAAG,QAAQ,GAAG,IAAI;IAWnD;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI;IAO9C;;;OAGG;IACH,eAAe,CAAC,YAAY,EAAE,YAAY,EAAE,GAAG,IAAI;IAOnD;;;;OAIG;IACH,aAAa,CAAC,UAAU,EAAE,wBAAwB;IASlD;;;OAGG;IACH,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAIzC;;;OAGG;IACH,gBAAgB,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;IAI7C;;OAEG;IACH,oBAAoB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IAKtD;;OAEG;IACH,oBAAoB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IAItD;;;OAGG;IACH,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAI5C;;;OAGG;IACH,aAAa,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAQ7D;;;;OAIG;IACH,qBAAqB,CAAC,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,IAAI;IAK3E;;OAEG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAIpD;;;;;OAKG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,IAAI;IAKzD,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAI7C,eAAe,IAAI,cAAc;CAelC"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/model/model.ts"],"names":[],"mappings":"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"}

package/dist/model/model.js

@@ -1,4 +1,5 @@
 import { RenderPipeline, log, uid, deepEqual } from '@luma.gl/core';
+import { getAttributeInfosFromLayouts } from '@luma.gl/core';
 import { ShaderAssembler } from '@luma.gl/shadertools';
 import { makeGPUGeometry } from "../geometry/gpu-geometry.js";
 import { PipelineFactory } from "../lib/pipeline-factory.js";
@@ -15,13 +16,16 @@ export class Model {
     this.bufferLayout = void 0;
     this.vertexCount = void 0;
     this.instanceCount = 0;
-    this.indices = null;
+    this.indexBuffer = null;
     this.bufferAttributes = {};
     this.constantAttributes = {};
     this.bindings = {};
     this.uniforms = {};
     this.pipeline = void 0;
+    this.vertexArray = void 0;
     this._pipelineNeedsUpdate = 'newly created';
+    this._attributeInfos = {};
+    this._gpuGeometry = null;
     this._getModuleUniforms = void 0;
     this.props = void 0;
     this.props = {
@@ -52,10 +56,16 @@ export class Model {
     this.bufferLayout = this.props.bufferLayout;
     this.parameters = this.props.parameters;
     if (props.geometry) {
-      this.setGeometry(props.geometry);
+      this._gpuGeometry = this.setGeometry(props.geometry);
     }
     this.pipelineFactory = props.pipelineFactory || PipelineFactory.getDefaultPipelineFactory(this.device);
     this.pipeline = this._updatePipeline();
+    this.vertexArray = device.createVertexArray({
+      renderPipeline: this.pipeline
+    });
+    if (this._gpuGeometry) {
+      this._setGeometryAttributes(this._gpuGeometry);
+    }
     if (props.vertexCount) {
       this.setVertexCount(props.vertexCount);
     }
@@ -63,11 +73,17 @@ export class Model {
       this.setInstanceCount(props.instanceCount);
     }
     if (props.indices) {
-      this.setIndexBuffer(props.indices);
+      throw new Error('Model.props.indices removed. Use props.indexBuffer');
+    }
+    if (props.indexBuffer) {
+      this.setIndexBuffer(props.indexBuffer);
     }
     if (props.attributes) {
       this.setAttributes(props.attributes);
     }
+    if (props.constantAttributes) {
+      this.setConstantAttributes(props.constantAttributes);
+    }
     if (props.bindings) {
       this.setBindings(props.bindings);
     }
@@ -85,13 +101,11 @@ export class Model {
   }
   draw(renderPass) {
     this.pipeline = this._updatePipeline();
-    this.pipeline.setIndexBuffer(this.indices);
-    this.pipeline.setAttributes(this.bufferAttributes);
-    this.pipeline.setConstantAttributes(this.constantAttributes);
     this.pipeline.setBindings(this.bindings);
     this.pipeline.setUniforms(this.uniforms);
     this.pipeline.draw({
       renderPass,
+      vertexArray: this.vertexArray,
       vertexCount: this.vertexCount,
       instanceCount: this.instanceCount
     });
@@ -100,6 +114,12 @@ export class Model {
     const gpuGeometry = geometry && makeGPUGeometry(this.device, geometry);
     this.setTopology(gpuGeometry.topology || 'triangle-list');
     this.bufferLayout = mergeBufferLayouts(this.bufferLayout, gpuGeometry.bufferLayout);
+    if (this.vertexArray) {
+      this._setGeometryAttributes(gpuGeometry);
+    }
+    return gpuGeometry;
+  }
+  _setGeometryAttributes(gpuGeometry) {
     this.vertexCount = gpuGeometry.vertexCount;
     this.setAttributes(gpuGeometry.attributes);
     this.setIndexBuffer(gpuGeometry.indices);
@@ -111,9 +131,14 @@ export class Model {
     }
   }
   setBufferLayout(bufferLayout) {
-    if (bufferLayout !== this.bufferLayout) {
-      this.bufferLayout = bufferLayout;
-      this._setPipelineNeedsUpdate('bufferLayout');
+    this.bufferLayout = this._gpuGeometry ? mergeBufferLayouts(bufferLayout, this._gpuGeometry.bufferLayout) : bufferLayout;
+    this._setPipelineNeedsUpdate('bufferLayout');
+    this.pipeline = this._updatePipeline();
+    this.vertexArray = this.device.createVertexArray({
+      renderPipeline: this.pipeline
+    });
+    if (this._gpuGeometry) {
+      this._setGeometryAttributes(this._gpuGeometry);
     }
   }
   setParameters(parameters) {
@@ -135,18 +160,6 @@ export class Model {
   updateModuleSettings(props) {
     this.setShaderModuleProps(props);
   }
-  setIndexBuffer(indices) {
-    this.indices = indices;
-  }
-  setAttributes(bufferAttributes) {
-    if (bufferAttributes.indices) {
-      log.warn(`Model:${this.id} setAttributes() - indices should be set using setIndexBuffer()`);
-    }
-    Object.assign(this.bufferAttributes, bufferAttributes);
-  }
-  setConstantAttributes(constantAttributes) {
-    Object.assign(this.constantAttributes, constantAttributes);
-  }
   setBindings(bindings) {
     Object.assign(this.bindings, bindings);
   }
@@ -154,12 +167,51 @@ export class Model {
     this.pipeline.setUniforms(uniforms);
     Object.assign(this.uniforms, uniforms);
   }
+  setIndexBuffer(indexBuffer) {
+    this.vertexArray.setIndexBuffer(indexBuffer);
+  }
+  setAttributes(buffers) {
+    if (buffers.indices) {
+      log.warn(`Model:${this.id} setAttributes() - indexBuffer should be set using setIndexBuffer()`);
+    }
+    for (const [bufferName, buffer] of Object.entries(buffers)) {
+      var _bufferLayout$attribu;
+      const bufferLayout = this.bufferLayout.find(layout => layout.name === bufferName);
+      if (!bufferLayout) {
+        continue;
+      }
+      const attributeNames = bufferLayout.attributes ? (_bufferLayout$attribu = bufferLayout.attributes) === null || _bufferLayout$attribu === void 0 ? void 0 : _bufferLayout$attribu.map(layout => layout.attribute) : [bufferLayout.name];
+      let set = false;
+      for (const attributeName of attributeNames) {
+        const attributeInfo = this._attributeInfos[attributeName];
+        if (attributeInfo) {
+          this.vertexArray.setBuffer(attributeInfo.location, buffer);
+          set = true;
+        }
+      }
+      if (!set) {
+        log.warn(`Model(${this.id}): Ignoring buffer "${buffer.id}" for unknown attribute "${bufferName}"`)();
+      }
+    }
+  }
+  setConstantAttributes(attributes) {
+    for (const [attributeName, value] of Object.entries(attributes)) {
+      const attributeInfo = this._attributeInfos[attributeName];
+      if (attributeInfo) {
+        this.vertexArray.setConstant(attributeInfo.location, value);
+      } else {
+        log.warn(`Model "${this.id}: Ignoring constant supplied for unknown attribute "${attributeName}"`)();
+      }
+    }
+  }
   _setPipelineNeedsUpdate(reason) {
     this._pipelineNeedsUpdate = this._pipelineNeedsUpdate || reason;
   }
   _updatePipeline() {
     if (this._pipelineNeedsUpdate) {
-      log.log(1, `Model ${this.id}: Recreating pipeline because "${this._pipelineNeedsUpdate}".`)();
+      if (this.pipeline) {
+        log.log(1, `Model ${this.id}: Recreating pipeline because "${this._pipelineNeedsUpdate}".`)();
+      }
       this._pipelineNeedsUpdate = false;
       this.pipeline = this.device.createRenderPipeline({
         ...this.props,
@@ -167,14 +219,17 @@ export class Model {
         topology: this.topology,
         parameters: this.parameters,
         vs: this.device.createShader({
+          id: '{$this.id}-vertex',
           stage: 'vertex',
           source: this.vs
         }),
         fs: this.fs ? this.device.createShader({
+          id: '{$this.id}-fragment',
           stage: 'fragment',
           source: this.fs
         }) : null
       });
+      this._attributeInfos = getAttributeInfosFromLayouts(this.pipeline.shaderLayout, this.bufferLayout);
     }
     return this.pipeline;
   }
@@ -190,6 +245,9 @@ Model.defaultProps = {
   modules: [],
   moduleSettings: {},
   geometry: null,
+  indexBuffer: null,
+  attributes: {},
+  constantAttributes: {},
   pipelineFactory: undefined,
   shaderAssembler: ShaderAssembler.getDefaultShaderAssembler()
 };

package/dist/model/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","names":["RenderPipeline","log","uid","deepEqual","ShaderAssembler","makeGPUGeometry","PipelineFactory","Model","constructor","device","props","id","vs","fs","pipelineFactory","userData","parameters","topology","bufferLayout","vertexCount","instanceCount","indices","bufferAttributes","constantAttributes","bindings","uniforms","pipeline","_pipelineNeedsUpdate","_getModuleUniforms","defaultProps","Object","assign","platformInfo","type","info","shaderLanguage","shadingLanguages","gpu","features","getUniforms","shaderAssembler","assembleShaders","geometry","setGeometry","getDefaultPipelineFactory","_updatePipeline","setVertexCount","setInstanceCount","setIndexBuffer","attributes","setAttributes","setBindings","setUniforms","moduleSettings","updateModuleSettings","seal","destroy","release","draw","renderPass","setConstantAttributes","gpuGeometry","setTopology","mergeBufferLayouts","_setPipelineNeedsUpdate","setBufferLayout","setParameters","setShaderModuleProps","warn","reason","createRenderPipeline","createShader","stage","source","handle","undefined","defines","modules","getDefaultShaderAssembler","layouts1","layouts2","layouts","attribute","index","findIndex","attribute2","name","push"],"sources":["../../src/model/model.ts"],"sourcesContent":["// luma.gl, MIT license\n\nimport type {TypedArray, RenderPipelineProps, RenderPipelineParameters, BufferLayout} from '@luma.gl/core';\nimport type {Binding, UniformValue, PrimitiveTopology} from '@luma.gl/core';\nimport {Device, Buffer, RenderPipeline, RenderPass, log, uid, deepEqual} from '@luma.gl/core';\nimport type {ShaderModule, PlatformInfo} from '@luma.gl/shadertools';\nimport {ShaderAssembler} from '@luma.gl/shadertools';\nimport type {Geometry} from '../geometry/geometry';\nimport {GPUGeometry, makeGPUGeometry} from '../geometry/gpu-geometry';\nimport {PipelineFactory} from '../lib/pipeline-factory';\n\nexport type ModelProps = Omit<RenderPipelineProps, 'vs' | 'fs'> & {\n  // Model also accepts a string shaders\n  vs: {glsl?: string; wgsl?: string} | string | null;\n  fs: {glsl?: string; wgsl?: string} | string | null;\n  /** shadertool shader modules (added to shader code) */\n  modules?: ShaderModule[];\n  /** Shadertool module defines (configures shader code)*/\n  defines?: Record<string, string | number | boolean>;\n  // TODO - injections, hooks etc?\n\n\n  /** pipeline factory to use to create render pipelines. Defaults to default factory for the device */\n  pipelineFactory?: PipelineFactory;\n  /** Shader assembler. Defaults to the ShaderAssembler.getShaderAssembler() */\n  shaderAssembler?: ShaderAssembler;\n  \n  /** Geometry */\n  geometry?: GPUGeometry | Geometry | null;\n  /** Parameters that are built into the pipeline */\n  parameters?: RenderPipelineParameters;\n  /** shadertool modules */\n  moduleSettings?: Record<string, Record<string, any>>;\n  /** Vertex count */\n  vertexCount?: number;\n  /** instance count */\n  instanceCount?: number;\n};\n\n/**\n * v9 Model API\n * A model\n * - automatically reuses pipelines (programs) when possible\n * - automatically rebuilds pipelines if necessary to accommodate changed settings\n * shadertools integration\n * - accepts modules and performs shader transpilation\n */\nexport class Model {\n  static defaultProps: Required<ModelProps> = {\n    ...RenderPipeline.defaultProps,\n    vs: null,\n    fs: null,\n    id: 'unnamed',\n    handle: undefined,\n    userData: {},\n    defines: {},\n    modules: [],\n    moduleSettings: {},\n    geometry: null,\n\n    pipelineFactory: undefined!,\n    shaderAssembler: ShaderAssembler.getDefaultShaderAssembler(),\n  };\n\n  readonly device: Device;\n  readonly id: string;\n  readonly vs: string;\n  readonly fs: string;\n  readonly pipelineFactory: PipelineFactory;\n  userData: {[key: string]: any} = {};\n\n  // Fixed properties (change can trigger pipeline rebuild)\n\n  /** The render pipeline GPU parameters, depth testing etc */\n  parameters: RenderPipelineParameters;\n\n  /** The primitive topology */\n  topology: PrimitiveTopology;\n  /** Buffer layout */\n  bufferLayout: BufferLayout[];\n\n  // Dynamic properties\n\n  /** Vertex count */\n  vertexCount: number;\n  /** instance count */\n  instanceCount: number = 0;\n\n  /** Index buffer */\n  indices: Buffer | null = null;\n  /** Buffer-valued attributes */\n  bufferAttributes: Record<string, Buffer> = {};\n  /** Constant-valued attributes */\n  constantAttributes: Record<string, TypedArray> = {};\n  /** Bindings (textures, samplers, uniform buffers) */\n  bindings: Record<string, Binding> = {};\n  /** Sets uniforms @deprecated Use uniform buffers and setBindings() for portability*/\n  uniforms: Record<string, UniformValue> = {};\n\n  /** The underlying GPU \"program\". @note May be recreated if parameters change */\n  pipeline: RenderPipeline;\n  _pipelineNeedsUpdate: string | false = 'newly created';\n  private _getModuleUniforms: (props?: Record<string, Record<string, any>>) => Record<string, any>;\n  private props: Required<ModelProps>;\n\n  constructor(device: Device, props: ModelProps) {\n    this.props = {...Model.defaultProps, ...props};\n    props = this.props;\n    this.id = props.id || uid('model');\n    this.device = device;\n\n    Object.assign(this.userData, props.userData);\n\n    /** Create a shadertools platform info from the Device */\n    const platformInfo: PlatformInfo = {\n      type: device.info.type,\n      shaderLanguage: device.info.shadingLanguages[0],\n      gpu: device.info.gpu,\n      features: device.features\n    };\n\n    const {vs, fs, getUniforms} = this.props.shaderAssembler.assembleShaders(platformInfo, this.props);\n    this.vs = vs;\n    this.fs = fs;\n    this._getModuleUniforms = getUniforms;\n\n    this.vertexCount = this.props.vertexCount;\n    this.instanceCount = this.props.instanceCount;\n\n    this.topology = this.props.topology;\n    this.bufferLayout = this.props.bufferLayout;\n    this.parameters = this.props.parameters;\n\n    // Geometry, if provided, sets several attributes, indices, and also vertex count and topology\n    if (props.geometry) {\n      this.setGeometry(props.geometry);\n    }\n\n    this.pipelineFactory =\n      props.pipelineFactory || PipelineFactory.getDefaultPipelineFactory(this.device);\n\n    // Create the pipeline \n    // @note order is important\n    this.pipeline = this._updatePipeline();\n\n    // Now we can apply geometry attributes\n\n    // Apply any dynamic settings that will not trigger pipeline change\n    if (props.vertexCount) {\n      this.setVertexCount(props.vertexCount);\n    }\n    if (props.instanceCount) {\n      this.setInstanceCount(props.instanceCount);\n    }\n    if (props.indices) {\n      this.setIndexBuffer(props.indices);\n    }\n    if (props.attributes) {\n      this.setAttributes(props.attributes);\n    }\n    if (props.bindings) {\n      this.setBindings(props.bindings);\n    }\n    if (props.uniforms) {\n      this.setUniforms(props.uniforms);\n    }\n    if (props.moduleSettings) {\n      this.updateModuleSettings(props.moduleSettings);\n    }\n\n    this.setUniforms(this._getModuleUniforms()); // Get all default module uniforms\n\n    // Catch any access to non-standard props\n    Object.seal(this);\n  }\n\n  destroy(): void {\n    this.pipelineFactory.release(this.pipeline);\n  }\n\n  // Draw call\n\n  draw(renderPass: RenderPass): void {\n    // Check if the pipeline is invalidated\n    // TODO - this is likely the worst place to do this from performance perspective. Perhaps add a predraw()?\n    this.pipeline = this._updatePipeline();\n\n    // Set pipeline state, we may be sharing a pipeline so we need to set all state on every draw\n    // Any caching needs to be done inside the pipeline functions\n    this.pipeline.setIndexBuffer(this.indices);\n    this.pipeline.setAttributes(this.bufferAttributes);\n    this.pipeline.setConstantAttributes(this.constantAttributes);\n    this.pipeline.setBindings(this.bindings);\n    this.pipeline.setUniforms(this.uniforms);\n\n    this.pipeline.draw({\n      renderPass,\n      vertexCount: this.vertexCount,\n      instanceCount: this.instanceCount\n    });\n  }\n\n  // Update fixed fields (can trigger pipeline rebuild)\n\n  /** \n   * Updates the optional geometry\n  * Geometry, sets several attributes, indices, and also vertex count and topology\n   * @note Can trigger a pipeline rebuild / pipeline cache fetch on WebGPU\n   */\n  setGeometry(geometry: GPUGeometry | Geometry): void {\n    const gpuGeometry = geometry && makeGPUGeometry(this.device, geometry);\n    this.setTopology(gpuGeometry.topology || 'triangle-list');\n    this.bufferLayout = mergeBufferLayouts(this.bufferLayout, gpuGeometry.bufferLayout);\n\n    // TODO - delete previous geometry?\n    this.vertexCount = gpuGeometry.vertexCount;\n    this.setAttributes(gpuGeometry.attributes);\n    this.setIndexBuffer(gpuGeometry.indices);\n  }\n\n  /** \n   * Updates the primitive topology ('triangle-list', 'triangle-strip' etc). \n   * @note Triggers a pipeline rebuild / pipeline cache fetch on WebGPU\n   */\n  setTopology(topology: PrimitiveTopology): void {\n    if (topology !== this.topology) {\n      this.topology = topology;\n      this._setPipelineNeedsUpdate('topology');\n    }\n  }\n\n  /** \n   * Updates the buffer layout. \n   * @note Triggers a pipeline rebuild / pipeline cache fetch on WebGPU\n   */\n  setBufferLayout(bufferLayout: BufferLayout[]): void {\n    if (bufferLayout !== this.bufferLayout) {\n      this.bufferLayout = bufferLayout;\n      this._setPipelineNeedsUpdate('bufferLayout');\n    }\n  }\n\n  /**\n   * Set GPU parameters.\n   * @note Can trigger a pipeline rebuild / pipeline cache fetch.\n   * @param parameters\n   */\n  setParameters(parameters: RenderPipelineParameters) {\n    if (!deepEqual(parameters, this.parameters, 2)) {\n      this.parameters = parameters;\n      this._setPipelineNeedsUpdate('parameters');\n    }\n  }\n    \n  // Update dynamic fields\n\n  /**\n   * Updates the vertex count (used in draw calls)\n   * @note Any attributes with stepMode=vertex need to be at least this big\n   */\n  setVertexCount(vertexCount: number): void {\n    this.vertexCount = vertexCount;\n  }\n\n  /**\n   * Updates the instance count (used in draw calls)\n   * @note Any attributes with stepMode=instance need to be at least this big\n   */\n  setInstanceCount(instanceCount: number): void {\n    this.instanceCount = instanceCount;\n  }\n\n  /**\n   * Updates shader module settings (which results in uniforms being set)\n   */\n  setShaderModuleProps(props: Record<string, any>): void {\n    const uniforms = this._getModuleUniforms(props);\n    Object.assign(this.uniforms, uniforms);\n  }\n\n  /**\n   * @deprecated Updates shader module settings (which results in uniforms being set)\n   */\n  updateModuleSettings(props: Record<string, any>): void {\n    this.setShaderModuleProps(props);\n  }\n\n  /**\n   * Sets the index buffer\n   * @todo - how to unset it if we change geometry?\n   */\n  setIndexBuffer(indices: Buffer | null): void {\n    this.indices = indices;\n  }\n\n  /**\n   * Sets attributes (buffers)\n   * @note Overrides any attributes previously set with the same name\n   */\n  setAttributes(bufferAttributes: Record<string, Buffer>): void {\n    if (bufferAttributes.indices) {\n      log.warn(`Model:${this.id} setAttributes() - indices should be set using setIndexBuffer()`);\n    }\n\n    Object.assign(this.bufferAttributes, bufferAttributes);\n  }\n\n  /**\n   * Sets constant attributes\n   * @note Overrides any attributes previously set with the same name\n   * @param constantAttributes\n   */\n  setConstantAttributes(constantAttributes: Record<string, TypedArray>): void {\n    // TODO - this doesn't work under WebGPU, we'll need to create buffers or inject uniforms\n    Object.assign(this.constantAttributes, constantAttributes);\n  }\n\n  /**\n   * Sets bindings (textures, samplers, uniform buffers)\n   */\n  setBindings(bindings: Record<string, Binding>): void {\n    Object.assign(this.bindings, bindings);\n  }\n\n  /**\n   * Sets individual uniforms\n   * @deprecated WebGL only, use uniform buffers for portability\n   * @param uniforms\n   * @returns self for chaining\n   */\n  setUniforms(uniforms: Record<string, UniformValue>): void {\n    this.pipeline.setUniforms(uniforms);\n    Object.assign(this.uniforms, uniforms);\n  }\n\n  _setPipelineNeedsUpdate(reason: string): void {\n    this._pipelineNeedsUpdate = this._pipelineNeedsUpdate || reason;\n  }\n\n  _updatePipeline(): RenderPipeline {\n    if (this._pipelineNeedsUpdate) {\n      log.log(1, `Model ${this.id}: Recreating pipeline because \"${this._pipelineNeedsUpdate}\".`)();\n      this._pipelineNeedsUpdate = false;\n      this.pipeline = this.device.createRenderPipeline({\n        ...this.props,\n        bufferLayout: this.bufferLayout,\n        topology: this.topology,\n        parameters: this.parameters,\n        vs: this.device.createShader({stage: 'vertex', source: this.vs}),\n        fs: this.fs ? this.device.createShader({stage: 'fragment', source: this.fs}) : null\n      });\n    }\n    return this.pipeline;\n  }\n}\n\n/** TODO - move to core, document add tests */\nfunction mergeBufferLayouts(layouts1: BufferLayout[], layouts2: BufferLayout[]): BufferLayout[] {\n  const layouts = [...layouts1];\n  for (const attribute of layouts2) {\n    const index = layouts.findIndex(\n      (attribute2) => attribute2.name === attribute.name\n    );\n    if (index < 0) {\n      layouts.push(attribute);\n    } else {\n      layouts[index] = attribute;\n    }\n  }\n  return layouts;\n}"],"mappings":"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"}
+{"version":3,"file":"model.js","names":["RenderPipeline","log","uid","deepEqual","getAttributeInfosFromLayouts","ShaderAssembler","makeGPUGeometry","PipelineFactory","Model","constructor","device","props","id","vs","fs","pipelineFactory","userData","parameters","topology","bufferLayout","vertexCount","instanceCount","indexBuffer","bufferAttributes","constantAttributes","bindings","uniforms","pipeline","vertexArray","_pipelineNeedsUpdate","_attributeInfos","_gpuGeometry","_getModuleUniforms","defaultProps","Object","assign","platformInfo","type","info","shaderLanguage","shadingLanguages","gpu","features","getUniforms","shaderAssembler","assembleShaders","geometry","setGeometry","getDefaultPipelineFactory","_updatePipeline","createVertexArray","renderPipeline","_setGeometryAttributes","setVertexCount","setInstanceCount","indices","Error","setIndexBuffer","attributes","setAttributes","setConstantAttributes","setBindings","setUniforms","moduleSettings","updateModuleSettings","seal","destroy","release","draw","renderPass","gpuGeometry","setTopology","mergeBufferLayouts","_setPipelineNeedsUpdate","setBufferLayout","setParameters","setShaderModuleProps","buffers","warn","bufferName","buffer","entries","_bufferLayout$attribu","find","layout","name","attributeNames","map","attribute","set","attributeName","attributeInfo","setBuffer","location","value","setConstant","reason","createRenderPipeline","createShader","stage","source","shaderLayout","handle","undefined","defines","modules","getDefaultShaderAssembler","layouts1","layouts2","layouts","index","findIndex","attribute2","push"],"sources":["../../src/model/model.ts"],"sourcesContent":["// luma.gl, MIT license\n\nimport type {\n  TypedArray,\n  RenderPipelineProps,\n  RenderPipelineParameters,\n  BufferLayout,\n  VertexArray,\n  AttributeInfo\n} from '@luma.gl/core';\nimport type {Binding, UniformValue, PrimitiveTopology} from '@luma.gl/core';\nimport {Device, Buffer, RenderPipeline, RenderPass, log, uid, deepEqual} from '@luma.gl/core';\nimport {getAttributeInfosFromLayouts} from '@luma.gl/core';\nimport type {ShaderModule, PlatformInfo} from '@luma.gl/shadertools';\nimport {ShaderAssembler} from '@luma.gl/shadertools';\nimport type {Geometry} from '../geometry/geometry';\nimport {GPUGeometry, makeGPUGeometry} from '../geometry/gpu-geometry';\nimport {PipelineFactory} from '../lib/pipeline-factory';\n\nexport type ModelProps = Omit<RenderPipelineProps, 'vs' | 'fs'> & {\n  // Model also accepts a string shaders\n  vs: {glsl?: string; wgsl?: string} | string | null;\n  fs: {glsl?: string; wgsl?: string} | string | null;\n  /** shadertool shader modules (added to shader code) */\n  modules?: ShaderModule[];\n  /** Shadertool module defines (configures shader code)*/\n  defines?: Record<string, string | number | boolean>;\n  // TODO - injections, hooks etc?\n\n  /** pipeline factory to use to create render pipelines. Defaults to default factory for the device */\n  pipelineFactory?: PipelineFactory;\n  /** Shader assembler. Defaults to the ShaderAssembler.getShaderAssembler() */\n  shaderAssembler?: ShaderAssembler;\n\n  /** Parameters that are built into the pipeline */\n  parameters?: RenderPipelineParameters;\n\n  /** Geometry */\n  geometry?: GPUGeometry | Geometry | null;\n\n  /** Vertex count */\n  vertexCount?: number;\n  /** instance count */\n  instanceCount?: number;\n\n  indexBuffer?: Buffer | null;\n  /** @note this is really a map of buffers, not a map of attributes */\n  attributes?: Record<string, Buffer>;\n  /**   */\n  constantAttributes?: Record<string, TypedArray>;\n\n  /** Mapped uniforms for shadertool modules */\n  moduleSettings?: Record<string, Record<string, any>>;\n};\n\n/**\n * v9 Model API\n * A model\n * - automatically reuses pipelines (programs) when possible\n * - automatically rebuilds pipelines if necessary to accommodate changed settings\n * shadertools integration\n * - accepts modules and performs shader transpilation\n */\nexport class Model {\n  static defaultProps: Required<ModelProps> = {\n    ...RenderPipeline.defaultProps,\n    vs: null,\n    fs: null,\n    id: 'unnamed',\n    handle: undefined,\n    userData: {},\n    defines: {},\n    modules: [],\n    moduleSettings: {},\n    geometry: null,\n    indexBuffer: null,\n    attributes: {},\n    constantAttributes: {},\n\n    pipelineFactory: undefined!,\n    shaderAssembler: ShaderAssembler.getDefaultShaderAssembler()\n  };\n\n  readonly device: Device;\n  readonly id: string;\n  readonly vs: string;\n  readonly fs: string;\n  readonly pipelineFactory: PipelineFactory;\n  userData: {[key: string]: any} = {};\n\n  // Fixed properties (change can trigger pipeline rebuild)\n\n  /** The render pipeline GPU parameters, depth testing etc */\n  parameters: RenderPipelineParameters;\n\n  /** The primitive topology */\n  topology: PrimitiveTopology;\n  /** Buffer layout */\n  bufferLayout: BufferLayout[];\n\n  // Dynamic properties\n\n  /** Vertex count */\n  vertexCount: number;\n  /** instance count */\n  instanceCount: number = 0;\n\n  /** Index buffer */\n  indexBuffer: Buffer | null = null;\n  /** Buffer-valued attributes */\n  bufferAttributes: Record<string, Buffer> = {};\n  /** Constant-valued attributes */\n  constantAttributes: Record<string, TypedArray> = {};\n  /** Bindings (textures, samplers, uniform buffers) */\n  bindings: Record<string, Binding> = {};\n  /** Sets uniforms @deprecated Use uniform buffers and setBindings() for portability*/\n  uniforms: Record<string, UniformValue> = {};\n\n  /** The underlying GPU \"program\". @note May be recreated if parameters change */\n  pipeline: RenderPipeline;\n\n  /**\n   * VertexArray\n   * @note not implemented: if bufferLayout is updated, vertex array has to be rebuilt!\n   * @todo - allow application to define multiple vertex arrays?\n   * */\n  vertexArray: VertexArray;\n\n  _pipelineNeedsUpdate: string | false = 'newly created';\n  _attributeInfos: Record<string, AttributeInfo> = {};\n  _gpuGeometry: GPUGeometry | null = null;\n  private _getModuleUniforms: (props?: Record<string, Record<string, any>>) => Record<string, any>;\n  private props: Required<ModelProps>;\n\n  constructor(device: Device, props: ModelProps) {\n    this.props = {...Model.defaultProps, ...props};\n    props = this.props;\n    this.id = props.id || uid('model');\n    this.device = device;\n\n    Object.assign(this.userData, props.userData);\n\n    /** Create a shadertools platform info from the Device */\n    const platformInfo: PlatformInfo = {\n      type: device.info.type,\n      shaderLanguage: device.info.shadingLanguages[0],\n      gpu: device.info.gpu,\n      features: device.features\n    };\n\n    const {vs, fs, getUniforms} = this.props.shaderAssembler.assembleShaders(\n      platformInfo,\n      this.props\n    );\n    this.vs = vs;\n    this.fs = fs;\n    this._getModuleUniforms = getUniforms;\n\n    this.vertexCount = this.props.vertexCount;\n    this.instanceCount = this.props.instanceCount;\n\n    this.topology = this.props.topology;\n    this.bufferLayout = this.props.bufferLayout;\n    this.parameters = this.props.parameters;\n\n    // Geometry, if provided, sets topology and vertex cound\n    if (props.geometry) {\n      this._gpuGeometry = this.setGeometry(props.geometry);\n    }\n\n    this.pipelineFactory =\n      props.pipelineFactory || PipelineFactory.getDefaultPipelineFactory(this.device);\n\n    // Create the pipeline\n    // @note order is important\n    this.pipeline = this._updatePipeline();\n\n    this.vertexArray = device.createVertexArray({\n      renderPipeline: this.pipeline\n    });\n\n    // Now we can apply geometry attributes\n    if (this._gpuGeometry) {\n      this._setGeometryAttributes(this._gpuGeometry);\n    }\n\n    // Apply any dynamic settings that will not trigger pipeline change\n    if (props.vertexCount) {\n      this.setVertexCount(props.vertexCount);\n    }\n    if (props.instanceCount) {\n      this.setInstanceCount(props.instanceCount);\n    }\n    // @ts-expect-error\n    if (props.indices) {\n      throw new Error('Model.props.indices removed. Use props.indexBuffer')\n    }\n    if (props.indexBuffer) {\n      this.setIndexBuffer(props.indexBuffer);\n    }\n    if (props.attributes) {\n      this.setAttributes(props.attributes);\n    }\n    if (props.constantAttributes) {\n      this.setConstantAttributes(props.constantAttributes);\n    }\n    if (props.bindings) {\n      this.setBindings(props.bindings);\n    }\n    if (props.uniforms) {\n      this.setUniforms(props.uniforms);\n    }\n    if (props.moduleSettings) {\n      this.updateModuleSettings(props.moduleSettings);\n    }\n\n    this.setUniforms(this._getModuleUniforms()); // Get all default module uniforms\n\n    // Catch any access to non-standard props\n    Object.seal(this);\n  }\n\n  destroy(): void {\n    this.pipelineFactory.release(this.pipeline);\n  }\n\n  // Draw call\n\n  draw(renderPass: RenderPass): void {\n    // Check if the pipeline is invalidated\n    // TODO - this is likely the worst place to do this from performance perspective. Perhaps add a predraw()?\n    this.pipeline = this._updatePipeline();\n\n    // Set pipeline state, we may be sharing a pipeline so we need to set all state on every draw\n    // Any caching needs to be done inside the pipeline functions\n    this.pipeline.setBindings(this.bindings);\n    this.pipeline.setUniforms(this.uniforms);\n\n    this.pipeline.draw({\n      renderPass,\n      vertexArray: this.vertexArray,\n      vertexCount: this.vertexCount,\n      instanceCount: this.instanceCount\n    });\n  }\n\n  // Update fixed fields (can trigger pipeline rebuild)\n\n  /**\n   * Updates the optional geometry\n   * Geometry, set topology and bufferLayout\n   * @note Can trigger a pipeline rebuild / pipeline cache fetch on WebGPU\n   */\n  setGeometry(geometry: GPUGeometry | Geometry): GPUGeometry {\n    const gpuGeometry = geometry && makeGPUGeometry(this.device, geometry);\n    this.setTopology(gpuGeometry.topology || 'triangle-list');\n    this.bufferLayout = mergeBufferLayouts(this.bufferLayout, gpuGeometry.bufferLayout);\n    if (this.vertexArray) {\n      this._setGeometryAttributes(gpuGeometry);\n    }\n    return gpuGeometry;\n  }\n\n  /**\n   * Updates the optional geometry attributes\n   * Geometry, sets several attributes, indexBuffer, and also vertex count\n   * @note Can trigger a pipeline rebuild / pipeline cache fetch on WebGPU\n   */\n  _setGeometryAttributes(gpuGeometry: GPUGeometry): void {\n    // TODO - delete previous geometry?\n    this.vertexCount = gpuGeometry.vertexCount;\n    this.setAttributes(gpuGeometry.attributes);\n    this.setIndexBuffer(gpuGeometry.indices);\n  }\n\n  /**\n   * Updates the primitive topology ('triangle-list', 'triangle-strip' etc).\n   * @note Triggers a pipeline rebuild / pipeline cache fetch on WebGPU\n   */\n  setTopology(topology: PrimitiveTopology): void {\n    if (topology !== this.topology) {\n      this.topology = topology;\n      this._setPipelineNeedsUpdate('topology');\n    }\n  }\n\n  /**\n   * Updates the buffer layout.\n   * @note Triggers a pipeline rebuild / pipeline cache fetch on WebGPU\n   */\n  setBufferLayout(bufferLayout: BufferLayout[]): void {\n    this.bufferLayout = this._gpuGeometry\n      ? mergeBufferLayouts(bufferLayout, this._gpuGeometry.bufferLayout)\n      : bufferLayout;\n    this._setPipelineNeedsUpdate('bufferLayout');\n\n    // Recreate the pipeline\n    this.pipeline = this._updatePipeline();\n    \n    // vertex array needs to be updated if we update buffer layout,\n    // but not if we update parameters\n    this.vertexArray = this.device.createVertexArray({\n      renderPipeline: this.pipeline\n    });\n\n    // Reapply geometry attributes to the new vertex array\n    if (this._gpuGeometry) {\n      this._setGeometryAttributes(this._gpuGeometry);\n    }\n  }\n\n  /**\n   * Set GPU parameters.\n   * @note Can trigger a pipeline rebuild / pipeline cache fetch.\n   * @param parameters\n   */\n  setParameters(parameters: RenderPipelineParameters) {\n    if (!deepEqual(parameters, this.parameters, 2)) {\n      this.parameters = parameters;\n      this._setPipelineNeedsUpdate('parameters');\n    }\n  }\n\n  // Update dynamic fields\n\n  /**\n   * Updates the vertex count (used in draw calls)\n   * @note Any attributes with stepMode=vertex need to be at least this big\n   */\n  setVertexCount(vertexCount: number): void {\n    this.vertexCount = vertexCount;\n  }\n\n  /**\n   * Updates the instance count (used in draw calls)\n   * @note Any attributes with stepMode=instance need to be at least this big\n   */\n  setInstanceCount(instanceCount: number): void {\n    this.instanceCount = instanceCount;\n  }\n\n  /**\n   * Updates shader module settings (which results in uniforms being set)\n   */\n  setShaderModuleProps(props: Record<string, any>): void {\n    const uniforms = this._getModuleUniforms(props);\n    Object.assign(this.uniforms, uniforms);\n  }\n\n  /**\n   * @deprecated Updates shader module settings (which results in uniforms being set)\n   */\n  updateModuleSettings(props: Record<string, any>): void {\n    this.setShaderModuleProps(props);\n  }\n\n  /**\n   * Sets bindings (textures, samplers, uniform buffers)\n   */\n  setBindings(bindings: Record<string, Binding>): void {\n    Object.assign(this.bindings, bindings);\n  }\n\n  /**\n   * Sets individual uniforms\n   * @deprecated WebGL only, use uniform buffers for portability\n   * @param uniforms\n   * @returns self for chaining\n   */\n  setUniforms(uniforms: Record<string, UniformValue>): void {\n    this.pipeline.setUniforms(uniforms);\n    Object.assign(this.uniforms, uniforms);\n  }\n\n  /**\n   * Sets the index buffer\n   * @todo - how to unset it if we change geometry?\n   */\n  setIndexBuffer(indexBuffer: Buffer | null): void {\n    this.vertexArray.setIndexBuffer(indexBuffer);\n  }\n\n  /**\n   * Sets attributes (buffers)\n   * @note Overrides any attributes previously set with the same name\n   */\n  setAttributes(buffers: Record<string, Buffer>): void {\n    if (buffers.indices) {\n      log.warn(\n        `Model:${this.id} setAttributes() - indexBuffer should be set using setIndexBuffer()`\n      );\n    }\n    for (const [bufferName, buffer] of Object.entries(buffers)) {\n      const bufferLayout = this.bufferLayout.find(layout => layout.name === bufferName);\n      if (!bufferLayout) {\n        continue; // eslint-disable-line no-continue\n      }\n\n      // For an interleaved attribute we may need to set multiple attributes\n      const attributeNames = bufferLayout.attributes\n        ? bufferLayout.attributes?.map(layout => layout.attribute)\n        : [bufferLayout.name];\n      let set = false;\n      for (const attributeName of attributeNames) {\n        const attributeInfo = this._attributeInfos[attributeName];\n        if (attributeInfo) {\n          this.vertexArray.setBuffer(attributeInfo.location, buffer);\n          set = true;\n        }\n      }\n      if (!set) {\n        log.warn(\n          `Model(${this.id}): Ignoring buffer \"${buffer.id}\" for unknown attribute \"${bufferName}\"`\n        )();\n      }\n    }\n  }\n\n  /**\n   * Sets constant attributes\n   * @note Overrides any attributes previously set with the same name\n   * Constant attributes are only supported in WebGL, not in WebGPU\n   * Any attribute that is disabled in the current vertex array object\n   * is read from the context's global constant value for that attribute location.\n   * @param constantAttributes\n   */\n  setConstantAttributes(attributes: Record<string, TypedArray>): void {\n    for (const [attributeName, value] of Object.entries(attributes)) {\n      const attributeInfo = this._attributeInfos[attributeName];\n      if (attributeInfo) {\n        this.vertexArray.setConstant(attributeInfo.location, value);\n      } else {\n        log.warn(`Model \"${this.id}: Ignoring constant supplied for unknown attribute \"${attributeName}\"`)();\n      }\n    }\n  }\n\n  _setPipelineNeedsUpdate(reason: string): void {\n    this._pipelineNeedsUpdate = this._pipelineNeedsUpdate || reason;\n  }\n\n  _updatePipeline(): RenderPipeline {\n    if (this._pipelineNeedsUpdate) {\n      if (this.pipeline) {\n        log.log(1, `Model ${this.id}: Recreating pipeline because \"${this._pipelineNeedsUpdate}\".`)();\n      }\n      this._pipelineNeedsUpdate = false;\n      this.pipeline = this.device.createRenderPipeline({\n        ...this.props,\n        bufferLayout: this.bufferLayout,\n        topology: this.topology,\n        parameters: this.parameters,\n        vs: this.device.createShader({id: '{$this.id}-vertex', stage: 'vertex', source: this.vs}),\n        fs: this.fs ? this.device.createShader({id: '{$this.id}-fragment', stage: 'fragment', source: this.fs}) : null\n      });\n      this._attributeInfos = getAttributeInfosFromLayouts(\n        this.pipeline.shaderLayout,\n        this.bufferLayout\n      );\n    }\n    return this.pipeline;\n  }\n}\n\n/** TODO - move to core, document add tests */\nfunction mergeBufferLayouts(layouts1: BufferLayout[], layouts2: BufferLayout[]): BufferLayout[] {\n  const layouts = [...layouts1];\n  for (const attribute of layouts2) {\n    const index = layouts.findIndex(attribute2 => attribute2.name === attribute.name);\n    if (index < 0) {\n      layouts.push(attribute);\n    } else {\n      layouts[index] = attribute;\n    }\n  }\n  return layouts;\n}\n"],"mappings":"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"}

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

@@ -1,14 +1,14 @@
-import { NumericArray } from '@luma.gl/core';
+import { NumberArray } from '@luma.gl/core';
 import { Vector3, Matrix4 } from '@math.gl/core';
 /** Properties for creating a new Scenegraph */
 export type ScenegraphNodeProps = {
     id?: string;
     /** whether to display the object at all */
     display?: boolean;
-    matrix?: NumericArray;
-    position?: NumericArray;
-    rotation?: NumericArray;
-    scale?: NumericArray;
+    matrix?: NumberArray;
+    position?: NumberArray;
+    rotation?: NumberArray;
+    scale?: NumberArray;
     update?: boolean;
 };
 export declare class ScenegraphNode {

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

@@ -1 +1 @@
-{"version":3,"file":"scenegraph-node.d.ts","sourceRoot":"","sources":["../../src/scenegraph/scenegraph-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,YAAY,EAAC,MAAM,eAAe,CAAC;AACxD,OAAO,EAAC,OAAO,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAE/C,+CAA+C;AAC/C,MAAM,MAAM,mBAAmB,GAAG;IAChC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,2CAA2C;IAC3C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAC;AAEF,qBAAa,cAAc;IACzB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,OAAO,CAAiB;IAEhC,OAAO,UAAQ;IACf,QAAQ,UAAiB;IACzB,QAAQ,UAAiB;IACzB,KAAK,UAAwB;IAC7B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM;IAEvC,KAAK,EAAE,mBAAmB,CAAM;gBAEpB,KAAK,GAAE,mBAAwB;IAQ3C,SAAS,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,GAAG,IAAI;IAIxC,OAAO,IAAI,IAAI;IAEf,iCAAiC;IACjC,MAAM,IAAI,IAAI;IAGd,QAAQ,CAAC,KAAK,EAAE,mBAAmB,GAAG,IAAI;IAK1C,QAAQ,IAAI,MAAM;IAIlB,WAAW,CAAC,QAAQ,EAAE,GAAG,GAAG,IAAI;IAMhC,WAAW,CAAC,QAAQ,EAAE,GAAG,GAAG,IAAI;IAMhC,QAAQ,CAAC,KAAK,EAAE,GAAG,GAAG,IAAI;IAM1B,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,UAAU,GAAE,OAAc,GAAG,IAAI;IAQxD,mBAAmB,CAAC,UAAU,EAAE;QAC9B,QAAQ,CAAC,EAAE,GAAG,CAAC;QACf,QAAQ,CAAC,EAAE,GAAG,CAAC;QACf,KAAK,CAAC,EAAE,GAAG,CAAC;QACZ,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,GAAG,IAAI;IAiBR,YAAY,IAAI,IAAI;IAYpB,MAAM,CAAC,OAAO,GAAE;QAAC,QAAQ,CAAC,EAAE,GAAG,CAAC;QAAC,QAAQ,CAAC,EAAE,GAAG,CAAC;QAAC,KAAK,CAAC,EAAE,GAAG,CAAA;KAAM,GAAG,IAAI;IAezE,qBAAqB,CACnB,UAAU,EAAE,GAAG,EACf,WAAW,CAAC,EAAE,GAAG,GAChB;QACD,UAAU,EAAE,GAAG,CAAC;QAChB,WAAW,EAAE,GAAG,CAAC;QACjB,YAAY,EAAE,GAAG,CAAC;QAClB,WAAW,EAAE,GAAG,CAAC;QACjB,kBAAkB,EAAE,GAAG,CAAC;QACxB,2BAA2B,EAAE,GAAG,CAAC;KAClC;IA0CD,uBAAuB,CAAC,KAAK,EAAE,mBAAmB,GAAG,IAAI;CAsB1D"}
+{"version":3,"file":"scenegraph-node.d.ts","sourceRoot":"","sources":["../../src/scenegraph/scenegraph-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,WAAW,EAAC,MAAM,eAAe,CAAC;AACvD,OAAO,EAAC,OAAO,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAE/C,+CAA+C;AAC/C,MAAM,MAAM,mBAAmB,GAAG;IAChC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,2CAA2C;IAC3C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAC;AAEF,qBAAa,cAAc;IACzB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,OAAO,CAAiB;IAEhC,OAAO,UAAQ;IACf,QAAQ,UAAiB;IACzB,QAAQ,UAAiB;IACzB,KAAK,UAAwB;IAC7B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM;IAEvC,KAAK,EAAE,mBAAmB,CAAM;gBAEpB,KAAK,GAAE,mBAAwB;IAQ3C,SAAS,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,GAAG,IAAI;IAIxC,OAAO,IAAI,IAAI;IAEf,iCAAiC;IACjC,MAAM,IAAI,IAAI;IAGd,QAAQ,CAAC,KAAK,EAAE,mBAAmB,GAAG,IAAI;IAK1C,QAAQ,IAAI,MAAM;IAIlB,WAAW,CAAC,QAAQ,EAAE,GAAG,GAAG,IAAI;IAMhC,WAAW,CAAC,QAAQ,EAAE,GAAG,GAAG,IAAI;IAMhC,QAAQ,CAAC,KAAK,EAAE,GAAG,GAAG,IAAI;IAM1B,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,UAAU,GAAE,OAAc,GAAG,IAAI;IAQxD,mBAAmB,CAAC,UAAU,EAAE;QAC9B,QAAQ,CAAC,EAAE,GAAG,CAAC;QACf,QAAQ,CAAC,EAAE,GAAG,CAAC;QACf,KAAK,CAAC,EAAE,GAAG,CAAC;QACZ,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,GAAG,IAAI;IAiBR,YAAY,IAAI,IAAI;IAYpB,MAAM,CAAC,OAAO,GAAE;QAAC,QAAQ,CAAC,EAAE,GAAG,CAAC;QAAC,QAAQ,CAAC,EAAE,GAAG,CAAC;QAAC,KAAK,CAAC,EAAE,GAAG,CAAA;KAAM,GAAG,IAAI;IAezE,qBAAqB,CACnB,UAAU,EAAE,GAAG,EACf,WAAW,CAAC,EAAE,GAAG,GAChB;QACD,UAAU,EAAE,GAAG,CAAC;QAChB,WAAW,EAAE,GAAG,CAAC;QACjB,YAAY,EAAE,GAAG,CAAC;QAClB,WAAW,EAAE,GAAG,CAAC;QACjB,kBAAkB,EAAE,GAAG,CAAC;QACxB,2BAA2B,EAAE,GAAG,CAAC;KAClC;IA0CD,uBAAuB,CAAC,KAAK,EAAE,mBAAmB,GAAG,IAAI;CAsB1D"}