@luma.gl/engine 9.0.0-alpha.41 → 9.0.0-alpha.43

package/dist/dist.dev.js

@@ -38,6 +38,7 @@ var __exports__ = (() => {
     ConeGeometry: () => ConeGeometry,
     CubeGeometry: () => CubeGeometry,
     CylinderGeometry: () => CylinderGeometry,
+    GPUGeometry: () => GPUGeometry,
     Geometry: () => Geometry,
     GroupNode: () => GroupNode,
     IcoSphereGeometry: () => IcoSphereGeometry,
@@ -1905,6 +1906,26 @@ var __exports__ = (() => {
     }
   };
 
+  // ../core/src/lib/utils/uniform.ts
+  function isUniformValue(value) {
+    return isNumberArray(value) !== null || typeof value === "number" || typeof value === "boolean";
+  }
+  function splitUniformsAndBindings(uniforms) {
+    const result = {
+      bindings: {},
+      uniforms: {}
+    };
+    Object.keys(uniforms).forEach((name2) => {
+      const uniform = uniforms[name2];
+      if (isUniformValue(uniform)) {
+        result.uniforms[name2] = uniform;
+      } else {
+        result.bindings[name2] = uniform;
+      }
+    });
+    return result;
+  }
+
   // ../core/src/lib/utils/deep-equal.ts
   function deepEqual(a, b, depth) {
     if (a === b) {
@@ -2594,7 +2615,7 @@ var __exports__ = (() => {
         vs,
         fs,
         dependencies = [],
-        uniforms = {},
+        uniformPropTypes = {},
         getUniforms,
         deprecations = [],
         defines = {},
@@ -2609,8 +2630,8 @@ var __exports__ = (() => {
       this.deprecations = this._parseDeprecationDefinitions(deprecations);
       this.defines = defines;
       this.injections = normalizeInjections(inject);
-      if (uniforms) {
-        this.uniforms = makePropValidators(uniforms);
+      if (uniformPropTypes) {
+        this.uniforms = makePropValidators(uniformPropTypes);
       }
     }
     // Extracts the source code chunk for the specified shader type from the named shader module
@@ -5644,21 +5665,15 @@ ${stage === "fragment" ? FRAGMENT_SHADER_PROLOGUE : ""}
       this.instanceCount = instanceCount;
     }
     /**
-     * Updates shader module settings (which results in uniforms being set)
+     * Updates shader module settings (which results in bindings & uniforms being set)
      */
     setShaderModuleProps(props) {
-      const uniforms = this._getModuleUniforms(props);
-      const keys = Object.keys(uniforms).filter((k) => {
-        const uniform = uniforms[k];
-        return !Array.isArray(uniform) && typeof uniform !== "number" && typeof uniform !== "boolean";
-      });
-      const bindings = {};
-      for (const k of keys) {
-        bindings[k] = uniforms[k];
-        delete uniforms[k];
-      }
-      Object.assign(this.uniforms, uniforms);
+      const {
+        bindings,
+        uniforms
+      } = splitUniformsAndBindings(this._getModuleUniforms(props));
       Object.assign(this.bindings, bindings);
+      Object.assign(this.uniforms, uniforms);
     }
     /**
      * @deprecated Updates shader module settings (which results in uniforms being set)
@@ -5875,7 +5890,7 @@ ${stage === "fragment" ? FRAGMENT_SHADER_PROLOGUE : ""}
       const uniformTypes = {};
       for (const [name2, {
         format
-      }] of Object.entries(props.shaderModule.uniforms)) {
+      }] of Object.entries(props.shaderModule.uniformPropTypes || {})) {
         uniformTypes[name2] = format;
       }
       this.uniformBufferLayout = new UniformBufferLayout(uniformTypes);

package/dist/geometry/gpu-geometry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gpu-geometry.d.ts","sourceRoot":"","sources":["../../src/geometry/gpu-geometry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AACnE,OAAO,EAAC,MAAM,EAAE,MAAM,EAAc,MAAM,eAAe,CAAC;AAC1D,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AAEnD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,oEAAoE;IACpE,QAAQ,EACJ,YAAY,GACZ,WAAW,GACX,YAAY,GACZ,iBAAiB,GACjB,eAAe,GACf,gBAAgB,GAChB,oBAAoB,CAAC;IACzB,sDAAsD;IACtD,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,YAAY,EAAE,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC,CAAC;AAEF,qBAAa,WAAW;IACtB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM;IAEvC,oEAAoE;IACpE,QAAQ,CAAC,QAAQ,CAAC,EAAE,iBAAiB,CAAC;IACtC,QAAQ,CAAC,YAAY,EAAE,YAAY,EAAE,CAAM;IAE3C,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAEhC,KAAK,EAAE,gBAAgB;IAenC,OAAO,IAAI,IAAI;IAQf,cAAc,IAAI,MAAM;IAIxB,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAIvC,UAAU,IAAI,MAAM,GAAG,IAAI;IAI3B,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;CAKjD;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,WAAW,GAAG,WAAW,CAc7F;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,MAAM,GAAG,SAAS,CAMjG;AAED,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,GACjB;IAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,YAAY,EAAE,YAAY,EAAE,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAC,CAoBzF"}
+{"version":3,"file":"gpu-geometry.d.ts","sourceRoot":"","sources":["../../src/geometry/gpu-geometry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AACnE,OAAO,EAAC,MAAM,EAAE,MAAM,EAAc,MAAM,eAAe,CAAC;AAC1D,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AAEnD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,oEAAoE;IACpE,QAAQ,EACJ,YAAY,GACZ,WAAW,GACX,YAAY,GACZ,iBAAiB,GACjB,eAAe,GACf,gBAAgB,GAChB,oBAAoB,CAAC;IACzB,sDAAsD;IACtD,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,YAAY,EAAE,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC,CAAC;AAEF,qBAAa,WAAW;IACtB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM;IAEvC,oEAAoE;IACpE,QAAQ,CAAC,QAAQ,CAAC,EAAE,iBAAiB,CAAC;IACtC,QAAQ,CAAC,YAAY,EAAE,YAAY,EAAE,CAAM;IAE3C,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAEhC,KAAK,EAAE,gBAAgB;IAenC,OAAO,IAAI,IAAI;IAQf,cAAc,IAAI,MAAM;IAIxB,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAIvC,UAAU,IAAI,MAAM,GAAG,IAAI;IAI3B,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;CAKjD;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,WAAW,GAAG,WAAW,CAc7F;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,MAAM,GAAG,SAAS,CAMjG;AAED,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,GACjB;IAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,YAAY,EAAE,YAAY,EAAE,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAC,CAmBzF"}

package/dist/geometry/gpu-geometry.js.map

@@ -1 +1 @@
-{"version":3,"file":"gpu-geometry.js","names":["Buffer","uid","assert","GPUGeometry","constructor","props","id","userData","topology","bufferLayout","vertexCount","indices","attributes","usage","INDEX","destroy","_this$attributes$colo","positions","normals","texCoords","colors","getVertexCount","getAttributes","getIndexes","_calculateVertexCount","byteLength","makeGPUGeometry","device","geometry","getIndexBufferFromGeometry","getAttributeBuffersFromGeometry","undefined","data","value","createBuffer","attributeName","attribute","Object","entries","name","push","format","size"],"sources":["../../src/geometry/gpu-geometry.ts"],"sourcesContent":["import type {PrimitiveTopology, BufferLayout} from '@luma.gl/core';\nimport {Device, Buffer, uid, assert} from '@luma.gl/core';\nimport type {Geometry} from '../geometry/geometry';\n\nexport type GPUGeometryProps = {\n  id?: string;\n  /** Determines how vertices are read from the 'vertex' attributes */\n  topology:\n    | 'point-list'\n    | 'line-list'\n    | 'line-strip'\n    | 'line-loop-webgl'\n    | 'triangle-list'\n    | 'triangle-strip'\n    | 'triangle-fan-webgl';\n  /** Auto calculated from attributes if not provided */\n  vertexCount: number;\n  bufferLayout: BufferLayout[];\n  indices?: Buffer | null;\n  attributes: Record<string, Buffer>;\n};\n\nexport class GPUGeometry {\n  readonly id: string;\n  userData: Record<string, unknown> = {};\n\n  /** Determines how vertices are read from the 'vertex' attributes */\n  readonly topology?: PrimitiveTopology;\n  readonly bufferLayout: BufferLayout[] = [];\n\n  readonly vertexCount: number;\n  readonly indices?: Buffer | null;\n  readonly attributes: Record<string, Buffer>;\n\n  constructor(props: GPUGeometryProps) {\n    this.id = props.id || uid('geometry');\n    this.topology = props.topology;\n    this.indices = props.indices || null;\n    this.attributes = props.attributes;\n\n    this.vertexCount = props.vertexCount;\n\n    this.bufferLayout = props.bufferLayout || [];\n\n    if (this.indices) {\n      assert(this.indices.usage === Buffer.INDEX);\n    }\n  }\n\n  destroy(): void {\n    this.indices.destroy();\n    this.attributes.positions.destroy();\n    this.attributes.normals.destroy();\n    this.attributes.texCoords.destroy();\n    this.attributes.colors?.destroy();\n  }\n\n  getVertexCount(): number {\n    return this.vertexCount;\n  }\n\n  getAttributes(): Record<string, Buffer> {\n    return this.attributes;\n  }\n\n  getIndexes(): Buffer | null {\n    return this.indices;\n  }\n\n  _calculateVertexCount(positions: Buffer): number {\n    // Assume that positions is a fully packed float32x3 buffer\n    const vertexCount = positions.byteLength / 12;\n    return vertexCount;\n  }\n}\n\nexport function makeGPUGeometry(device: Device, geometry: Geometry | GPUGeometry): GPUGeometry {\n  if (geometry instanceof GPUGeometry) {\n    return geometry;\n  }\n\n  const indices = getIndexBufferFromGeometry(device, geometry);\n  const {attributes, bufferLayout} = getAttributeBuffersFromGeometry(device, geometry);\n  return new GPUGeometry({\n    topology: geometry.topology || 'triangle-list',\n    bufferLayout,\n    vertexCount: geometry.vertexCount,\n    indices,\n    attributes\n  });\n}\n\nexport function getIndexBufferFromGeometry(device: Device, geometry: Geometry): Buffer | undefined {\n  if (!geometry.indices) {\n    return undefined;\n  }\n  const data = geometry.indices.value;\n  return device.createBuffer({usage: Buffer.INDEX, data});\n}\n\nexport function getAttributeBuffersFromGeometry(\n  device: Device,\n  geometry: Geometry\n): {attributes: Record<string, Buffer>, bufferLayout: BufferLayout[], vertexCount: number} {\n  const bufferLayout: BufferLayout[] = [];\n\n  const attributes: Record<string, Buffer> = {};\n  for (const [attributeName, attribute] of Object.entries(geometry.attributes)) {\n    let name: string = attributeName;\n    // TODO Map some GLTF attribute names (is this still needed?)\n    switch (attributeName) {\n      case 'POSITION': name = 'positions'; break;\n      case 'NORMAL': name = 'normals'; break;\n      case 'TEXCOORD_0': name = 'texCoords'; break;\n    }\n\n    attributes[name] = device.createBuffer({data: attribute.value, id: `${attributeName}-buffer`});\n    bufferLayout.push({name, format: `float32x${attribute.size as 2 | 3 | 4}`});\n  }\n\n  const vertexCount = geometry._calculateVertexCount(geometry.attributes, geometry.indices)\n\n  return {attributes, bufferLayout, vertexCount};\n}\n"],"mappings":"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"}
+{"version":3,"file":"gpu-geometry.js","names":["Buffer","uid","assert","GPUGeometry","constructor","props","id","userData","topology","bufferLayout","vertexCount","indices","attributes","usage","INDEX","destroy","_this$attributes$colo","positions","normals","texCoords","colors","getVertexCount","getAttributes","getIndexes","_calculateVertexCount","byteLength","makeGPUGeometry","device","geometry","getIndexBufferFromGeometry","getAttributeBuffersFromGeometry","undefined","data","value","createBuffer","attributeName","attribute","Object","entries","name","push","format","size"],"sources":["../../src/geometry/gpu-geometry.ts"],"sourcesContent":["import type {PrimitiveTopology, BufferLayout} from '@luma.gl/core';\nimport {Device, Buffer, uid, assert} from '@luma.gl/core';\nimport type {Geometry} from '../geometry/geometry';\n\nexport type GPUGeometryProps = {\n  id?: string;\n  /** Determines how vertices are read from the 'vertex' attributes */\n  topology:\n    | 'point-list'\n    | 'line-list'\n    | 'line-strip'\n    | 'line-loop-webgl'\n    | 'triangle-list'\n    | 'triangle-strip'\n    | 'triangle-fan-webgl';\n  /** Auto calculated from attributes if not provided */\n  vertexCount: number;\n  bufferLayout: BufferLayout[];\n  indices?: Buffer | null;\n  attributes: Record<string, Buffer>;\n};\n\nexport class GPUGeometry {\n  readonly id: string;\n  userData: Record<string, unknown> = {};\n\n  /** Determines how vertices are read from the 'vertex' attributes */\n  readonly topology?: PrimitiveTopology;\n  readonly bufferLayout: BufferLayout[] = [];\n\n  readonly vertexCount: number;\n  readonly indices?: Buffer | null;\n  readonly attributes: Record<string, Buffer>;\n\n  constructor(props: GPUGeometryProps) {\n    this.id = props.id || uid('geometry');\n    this.topology = props.topology;\n    this.indices = props.indices || null;\n    this.attributes = props.attributes;\n\n    this.vertexCount = props.vertexCount;\n\n    this.bufferLayout = props.bufferLayout || [];\n\n    if (this.indices) {\n      assert(this.indices.usage === Buffer.INDEX);\n    }\n  }\n\n  destroy(): void {\n    this.indices.destroy();\n    this.attributes.positions.destroy();\n    this.attributes.normals.destroy();\n    this.attributes.texCoords.destroy();\n    this.attributes.colors?.destroy();\n  }\n\n  getVertexCount(): number {\n    return this.vertexCount;\n  }\n\n  getAttributes(): Record<string, Buffer> {\n    return this.attributes;\n  }\n\n  getIndexes(): Buffer | null {\n    return this.indices;\n  }\n\n  _calculateVertexCount(positions: Buffer): number {\n    // Assume that positions is a fully packed float32x3 buffer\n    const vertexCount = positions.byteLength / 12;\n    return vertexCount;\n  }\n}\n\nexport function makeGPUGeometry(device: Device, geometry: Geometry | GPUGeometry): GPUGeometry {\n  if (geometry instanceof GPUGeometry) {\n    return geometry;\n  }\n\n  const indices = getIndexBufferFromGeometry(device, geometry);\n  const {attributes, bufferLayout} = getAttributeBuffersFromGeometry(device, geometry);\n  return new GPUGeometry({\n    topology: geometry.topology || 'triangle-list',\n    bufferLayout,\n    vertexCount: geometry.vertexCount,\n    indices,\n    attributes\n  });\n}\n\nexport function getIndexBufferFromGeometry(device: Device, geometry: Geometry): Buffer | undefined {\n  if (!geometry.indices) {\n    return undefined;\n  }\n  const data = geometry.indices.value;\n  return device.createBuffer({usage: Buffer.INDEX, data});\n}\n\nexport function getAttributeBuffersFromGeometry(\n  device: Device,\n  geometry: Geometry\n): {attributes: Record<string, Buffer>, bufferLayout: BufferLayout[], vertexCount: number} {\n  const bufferLayout: BufferLayout[] = [];\n\n  const attributes: Record<string, Buffer> = {};\n  for (const [attributeName, attribute] of Object.entries(geometry.attributes)) {\n    let name: string = attributeName;\n    // TODO Map some GLTF attribute names (is this still needed?)\n    switch (attributeName) {\n      case 'POSITION': name = 'positions'; break;\n      case 'NORMAL': name = 'normals'; break;\n      case 'TEXCOORD_0': name = 'texCoords'; break;\n    }\n    attributes[name] = device.createBuffer({data: attribute.value, id: `${attributeName}-buffer`});\n    bufferLayout.push({name, format: `float32x${attribute.size as 2 | 3 | 4}`});\n  }\n\n  const vertexCount = geometry._calculateVertexCount(geometry.attributes, geometry.indices)\n\n  return {attributes, bufferLayout, vertexCount};\n}\n"],"mappings":"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"}

package/dist/index.cjs

@@ -63,6 +63,7 @@ __export(src_exports, {
   ConeGeometry: () => ConeGeometry,
   CubeGeometry: () => CubeGeometry,
   CylinderGeometry: () => CylinderGeometry,
+  GPUGeometry: () => GPUGeometry,
   Geometry: () => Geometry,
   GroupNode: () => GroupNode,
   IcoSphereGeometry: () => IcoSphereGeometry,
@@ -991,21 +992,12 @@ var _Model = class {
     this.instanceCount = instanceCount;
   }
   /**
-   * Updates shader module settings (which results in uniforms being set)
+   * Updates shader module settings (which results in bindings & uniforms being set)
    */
   setShaderModuleProps(props) {
-    const uniforms = this._getModuleUniforms(props);
-    const keys = Object.keys(uniforms).filter((k) => {
-      const uniform = uniforms[k];
-      return !Array.isArray(uniform) && typeof uniform !== "number" && typeof uniform !== "boolean";
-    });
-    const bindings = {};
-    for (const k of keys) {
-      bindings[k] = uniforms[k];
-      delete uniforms[k];
-    }
-    Object.assign(this.uniforms, uniforms);
+    const { bindings, uniforms } = (0, import_core6.splitUniformsAndBindings)(this._getModuleUniforms(props));
     Object.assign(this.bindings, bindings);
+    Object.assign(this.uniforms, uniforms);
   }
   /**
    * @deprecated Updates shader module settings (which results in uniforms being set)
@@ -1214,7 +1206,7 @@ var ShaderModuleUniforms = class {
     this.shaderModule = props.shaderModule;
     this.useUniformBuffers = this.device.info.type !== "webgl";
     const uniformTypes = {};
-    for (const [name, { format }] of Object.entries(props.shaderModule.uniforms)) {
+    for (const [name, { format }] of Object.entries(props.shaderModule.uniformPropTypes || {})) {
       uniformTypes[name] = format;
     }
     this.uniformBufferLayout = new import_core9.UniformBufferLayout(uniformTypes);

package/dist/index.d.ts

@@ -14,9 +14,12 @@ 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';
+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';

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,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"}
+{"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,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"}

package/dist/index.js

@@ -12,6 +12,7 @@ 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";

package/dist/index.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"index.js","names":["Timeline","KeyFrames","AnimationLoopTemplate","AnimationLoop","makeAnimationLoop","Model","Transform","PipelineFactory","ShaderModuleUniforms","ClipSpace","ScenegraphNode","GroupNode","ModelNode","Geometry","GPUGeometry","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 type {ModelNodeProps} from './scenegraph/model-node';\nexport {ModelNode} from './scenegraph/model-node';\n\n// Geometries\nexport type {GeometryProps} from './geometry/geometry';\nexport {Geometry} from './geometry/geometry';\nexport type {GPUGeometryProps} from './geometry/gpu-geometry';\nexport {GPUGeometry} from './geometry/gpu-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,SAETC,SAAS;AAAA,SAITC,QAAQ;AAAA,SAERC,WAAW;AAAA,SAIXC,YAAY;AAAA,SAEZC,YAAY;AAAA,SAEZC,gBAAgB;AAAA,SAEhBC,iBAAiB;AAAA,SAEjBC,aAAa;AAAA,SAEbC,cAAc;AAAA,SAEdC,qBAAqB"}

package/dist/model/model.d.ts

@@ -132,7 +132,7 @@ export declare class Model {
      */
     setInstanceCount(instanceCount: number): void;
     /**
-     * Updates shader module settings (which results in uniforms being set)
+     * Updates shader module settings (which results in bindings & uniforms being set)
      */
     setShaderModuleProps(props: Record<string, any>): void;
     /**

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,4 +1,4 @@
-import { RenderPipeline, log, uid, deepEqual } from '@luma.gl/core';
+import { RenderPipeline, log, uid, deepEqual, splitUniformsAndBindings } from '@luma.gl/core';
 import { getAttributeInfosFromLayouts } from '@luma.gl/core';
 import { ShaderAssembler } from '@luma.gl/shadertools';
 import { makeGPUGeometry } from "../geometry/gpu-geometry.js";
@@ -154,18 +154,12 @@ export class Model {
     this.instanceCount = instanceCount;
   }
   setShaderModuleProps(props) {
-    const uniforms = this._getModuleUniforms(props);
-    const keys = Object.keys(uniforms).filter(k => {
-      const uniform = uniforms[k];
-      return !Array.isArray(uniform) && typeof uniform !== 'number' && typeof uniform !== 'boolean';
-    });
-    const bindings = {};
-    for (const k of keys) {
-      bindings[k] = uniforms[k];
-      delete uniforms[k];
-    }
-    Object.assign(this.uniforms, uniforms);
+    const {
+      bindings,
+      uniforms
+    } = splitUniformsAndBindings(this._getModuleUniforms(props));
     Object.assign(this.bindings, bindings);
+    Object.assign(this.uniforms, uniforms);
   }
   updateModuleSettings(props) {
     this.setShaderModuleProps(props);

package/dist/model/model.js.map

@@ -1 +1 @@
-{"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","keys","filter","k","uniform","Array","isArray","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// Copyright (c) vis.gl contributors\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\n    // Extract textures & framebuffers set by the modules\n    // TODO better way to extract bindings\n    const keys = Object.keys(uniforms).filter(k => {\n      const uniform = uniforms[k];\n      return !Array.isArray(uniform) && (typeof uniform !== 'number') && (typeof uniform !== 'boolean');\n    });\n    const bindings: Record<string, Binding> = {};\n    for (const k of keys) {\n      bindings[k] = uniforms[k];\n      delete uniforms[k];\n    }\n\n    Object.assign(this.uniforms, uniforms);\n    Object.assign(this.bindings, bindings);\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":"AAYA,SAAwBA,cAAc,EAAcC,GAAG,EAAEC,GAAG,EAAEC,SAAS,QAAO,eAAe;AAC7F,SAAQC,4BAA4B,QAAO,eAAe;AAE1D,SAAQC,eAAe,QAAO,sBAAsB;AAAC,SAEhCC,eAAe;AAAA,SAC5BC,eAAe;AA8CvB,OAAO,MAAMC,KAAK,CAAC;EAuEjBC,WAAWA,CAACC,MAAc,EAAEC,KAAiB,EAAE;IAAA,KAnDtCD,MAAM;IAAA,KACNE,EAAE;IAAA,KACFC,EAAE;IAAA,KACFC,EAAE;IAAA,KACFC,eAAe;IAAA,KACxBC,QAAQ,GAAyB,CAAC,CAAC;IAAA,KAKnCC,UAAU;IAAA,KAGVC,QAAQ;IAAA,KAERC,YAAY;IAAA,KAKZC,WAAW;IAAA,KAEXC,aAAa,GAAW,CAAC;IAAA,KAGzBC,WAAW,GAAkB,IAAI;IAAA,KAEjCC,gBAAgB,GAA2B,CAAC,CAAC;IAAA,KAE7CC,kBAAkB,GAA+B,CAAC,CAAC;IAAA,KAEnDC,QAAQ,GAA4B,CAAC,CAAC;IAAA,KAEtCC,QAAQ,GAAiC,CAAC,CAAC;IAAA,KAG3CC,QAAQ;IAAA,KAORC,WAAW;IAAA,KAEXC,oBAAoB,GAAmB,eAAe;IAAA,KACtDC,eAAe,GAAkC,CAAC,CAAC;IAAA,KACnDC,YAAY,GAAuB,IAAI;IAAA,KAC/BC,kBAAkB;IAAA,KAClBrB,KAAK;IAGX,IAAI,CAACA,KAAK,GAAG;MAAC,GAAGH,KAAK,CAACyB,YAAY;MAAE,GAAGtB;IAAK,CAAC;IAC9CA,KAAK,GAAG,IAAI,CAACA,KAAK;IAClB,IAAI,CAACC,EAAE,GAAGD,KAAK,CAACC,EAAE,IAAIV,GAAG,CAAC,OAAO,CAAC;IAClC,IAAI,CAACQ,MAAM,GAAGA,MAAM;IAEpBwB,MAAM,CAACC,MAAM,CAAC,IAAI,CAACnB,QAAQ,EAAEL,KAAK,CAACK,QAAQ,CAAC;IAG5C,MAAMoB,YAA0B,GAAG;MACjCC,IAAI,EAAE3B,MAAM,CAAC4B,IAAI,CAACD,IAAI;MACtBE,cAAc,EAAE7B,MAAM,CAAC4B,IAAI,CAACE,gBAAgB,CAAC,CAAC,CAAC;MAC/CC,GAAG,EAAE/B,MAAM,CAAC4B,IAAI,CAACG,GAAG;MACpBC,QAAQ,EAAEhC,MAAM,CAACgC;IACnB,CAAC;IAED,MAAM;MAAC7B,EAAE;MAAEC,EAAE;MAAE6B;IAAW,CAAC,GAAG,IAAI,CAAChC,KAAK,CAACiC,eAAe,CAACC,eAAe,CACtET,YAAY,EACZ,IAAI,CAACzB,KACP,CAAC;IACD,IAAI,CAACE,EAAE,GAAGA,EAAE;IACZ,IAAI,CAACC,EAAE,GAAGA,EAAE;IACZ,IAAI,CAACkB,kBAAkB,GAAGW,WAAW;IAErC,IAAI,CAACvB,WAAW,GAAG,IAAI,CAACT,KAAK,CAACS,WAAW;IACzC,IAAI,CAACC,aAAa,GAAG,IAAI,CAACV,KAAK,CAACU,aAAa;IAE7C,IAAI,CAACH,QAAQ,GAAG,IAAI,CAACP,KAAK,CAACO,QAAQ;IACnC,IAAI,CAACC,YAAY,GAAG,IAAI,CAACR,KAAK,CAACQ,YAAY;IAC3C,IAAI,CAACF,UAAU,GAAG,IAAI,CAACN,KAAK,CAACM,UAAU;IAGvC,IAAIN,KAAK,CAACmC,QAAQ,EAAE;MAClB,IAAI,CAACf,YAAY,GAAG,IAAI,CAACgB,WAAW,CAACpC,KAAK,CAACmC,QAAQ,CAAC;IACtD;IAEA,IAAI,CAAC/B,eAAe,GAClBJ,KAAK,CAACI,eAAe,IAAIR,eAAe,CAACyC,yBAAyB,CAAC,IAAI,CAACtC,MAAM,CAAC;IAIjF,IAAI,CAACiB,QAAQ,GAAG,IAAI,CAACsB,eAAe,CAAC,CAAC;IAEtC,IAAI,CAACrB,WAAW,GAAGlB,MAAM,CAACwC,iBAAiB,CAAC;MAC1CC,cAAc,EAAE,IAAI,CAACxB;IACvB,CAAC,CAAC;IAGF,IAAI,IAAI,CAACI,YAAY,EAAE;MACrB,IAAI,CAACqB,sBAAsB,CAAC,IAAI,CAACrB,YAAY,CAAC;IAChD;IAGA,IAAIpB,KAAK,CAACS,WAAW,EAAE;MACrB,IAAI,CAACiC,cAAc,CAAC1C,KAAK,CAACS,WAAW,CAAC;IACxC;IACA,IAAIT,KAAK,CAACU,aAAa,EAAE;MACvB,IAAI,CAACiC,gBAAgB,CAAC3C,KAAK,CAACU,aAAa,CAAC;IAC5C;IAEA,IAAIV,KAAK,CAAC4C,OAAO,EAAE;MACjB,MAAM,IAAIC,KAAK,CAAC,oDAAoD,CAAC;IACvE;IACA,IAAI7C,KAAK,CAACW,WAAW,EAAE;MACrB,IAAI,CAACmC,cAAc,CAAC9C,KAAK,CAACW,WAAW,CAAC;IACxC;IACA,IAAIX,KAAK,CAAC+C,UAAU,EAAE;MACpB,IAAI,CAACC,aAAa,CAAChD,KAAK,CAAC+C,UAAU,CAAC;IACtC;IACA,IAAI/C,KAAK,CAACa,kBAAkB,EAAE;MAC5B,IAAI,CAACoC,qBAAqB,CAACjD,KAAK,CAACa,kBAAkB,CAAC;IACtD;IACA,IAAIb,KAAK,CAACc,QAAQ,EAAE;MAClB,IAAI,CAACoC,WAAW,CAAClD,KAAK,CAACc,QAAQ,CAAC;IAClC;IACA,IAAId,KAAK,CAACe,QAAQ,EAAE;MAClB,IAAI,CAACoC,WAAW,CAACnD,KAAK,CAACe,QAAQ,CAAC;IAClC;IACA,IAAIf,KAAK,CAACoD,cAAc,EAAE;MACxB,IAAI,CAACC,oBAAoB,CAACrD,KAAK,CAACoD,cAAc,CAAC;IACjD;IAEA,IAAI,CAACD,WAAW,CAAC,IAAI,CAAC9B,kBAAkB,CAAC,CAAC,CAAC;IAG3CE,MAAM,CAAC+B,IAAI,CAAC,IAAI,CAAC;EACnB;EAEAC,OAAOA,CAAA,EAAS;IACd,IAAI,CAACnD,eAAe,CAACoD,OAAO,CAAC,IAAI,CAACxC,QAAQ,CAAC;EAC7C;EAIAyC,IAAIA,CAACC,UAAsB,EAAQ;IAGjC,IAAI,CAAC1C,QAAQ,GAAG,IAAI,CAACsB,eAAe,CAAC,CAAC;IAItC,IAAI,CAACtB,QAAQ,CAACkC,WAAW,CAAC,IAAI,CAACpC,QAAQ,CAAC;IACxC,IAAI,CAACE,QAAQ,CAACmC,WAAW,CAAC,IAAI,CAACpC,QAAQ,CAAC;IAExC,IAAI,CAACC,QAAQ,CAACyC,IAAI,CAAC;MACjBC,UAAU;MACVzC,WAAW,EAAE,IAAI,CAACA,WAAW;MAC7BR,WAAW,EAAE,IAAI,CAACA,WAAW;MAC7BC,aAAa,EAAE,IAAI,CAACA;IACtB,CAAC,CAAC;EACJ;EASA0B,WAAWA,CAACD,QAAgC,EAAe;IACzD,MAAMwB,WAAW,GAAGxB,QAAQ,IAAIxC,eAAe,CAAC,IAAI,CAACI,MAAM,EAAEoC,QAAQ,CAAC;IACtE,IAAI,CAACyB,WAAW,CAACD,WAAW,CAACpD,QAAQ,IAAI,eAAe,CAAC;IACzD,IAAI,CAACC,YAAY,GAAGqD,kBAAkB,CAAC,IAAI,CAACrD,YAAY,EAAEmD,WAAW,CAACnD,YAAY,CAAC;IACnF,IAAI,IAAI,CAACS,WAAW,EAAE;MACpB,IAAI,CAACwB,sBAAsB,CAACkB,WAAW,CAAC;IAC1C;IACA,OAAOA,WAAW;EACpB;EAOAlB,sBAAsBA,CAACkB,WAAwB,EAAQ;IAErD,IAAI,CAAClD,WAAW,GAAGkD,WAAW,CAAClD,WAAW;IAC1C,IAAI,CAACuC,aAAa,CAACW,WAAW,CAACZ,UAAU,CAAC;IAC1C,IAAI,CAACD,cAAc,CAACa,WAAW,CAACf,OAAO,CAAC;EAC1C;EAMAgB,WAAWA,CAACrD,QAA2B,EAAQ;IAC7C,IAAIA,QAAQ,KAAK,IAAI,CAACA,QAAQ,EAAE;MAC9B,IAAI,CAACA,QAAQ,GAAGA,QAAQ;MACxB,IAAI,CAACuD,uBAAuB,CAAC,UAAU,CAAC;IAC1C;EACF;EAMAC,eAAeA,CAACvD,YAA4B,EAAQ;IAClD,IAAI,CAACA,YAAY,GAAG,IAAI,CAACY,YAAY,GACjCyC,kBAAkB,CAACrD,YAAY,EAAE,IAAI,CAACY,YAAY,CAACZ,YAAY,CAAC,GAChEA,YAAY;IAChB,IAAI,CAACsD,uBAAuB,CAAC,cAAc,CAAC;IAG5C,IAAI,CAAC9C,QAAQ,GAAG,IAAI,CAACsB,eAAe,CAAC,CAAC;IAItC,IAAI,CAACrB,WAAW,GAAG,IAAI,CAAClB,MAAM,CAACwC,iBAAiB,CAAC;MAC/CC,cAAc,EAAE,IAAI,CAACxB;IACvB,CAAC,CAAC;IAGF,IAAI,IAAI,CAACI,YAAY,EAAE;MACrB,IAAI,CAACqB,sBAAsB,CAAC,IAAI,CAACrB,YAAY,CAAC;IAChD;EACF;EAOA4C,aAAaA,CAAC1D,UAAoC,EAAE;IAClD,IAAI,CAACd,SAAS,CAACc,UAAU,EAAE,IAAI,CAACA,UAAU,EAAE,CAAC,CAAC,EAAE;MAC9C,IAAI,CAACA,UAAU,GAAGA,UAAU;MAC5B,IAAI,CAACwD,uBAAuB,CAAC,YAAY,CAAC;IAC5C;EACF;EAQApB,cAAcA,CAACjC,WAAmB,EAAQ;IACxC,IAAI,CAACA,WAAW,GAAGA,WAAW;EAChC;EAMAkC,gBAAgBA,CAACjC,aAAqB,EAAQ;IAC5C,IAAI,CAACA,aAAa,GAAGA,aAAa;EACpC;EAKAuD,oBAAoBA,CAACjE,KAA0B,EAAQ;IACrD,MAAMe,QAAQ,GAAG,IAAI,CAACM,kBAAkB,CAACrB,KAAK,CAAC;IAI/C,MAAMkE,IAAI,GAAG3C,MAAM,CAAC2C,IAAI,CAACnD,QAAQ,CAAC,CAACoD,MAAM,CAACC,CAAC,IAAI;MAC7C,MAAMC,OAAO,GAAGtD,QAAQ,CAACqD,CAAC,CAAC;MAC3B,OAAO,CAACE,KAAK,CAACC,OAAO,CAACF,OAAO,CAAC,IAAK,OAAOA,OAAO,KAAK,QAAS,IAAK,OAAOA,OAAO,KAAK,SAAU;IACnG,CAAC,CAAC;IACF,MAAMvD,QAAiC,GAAG,CAAC,CAAC;IAC5C,KAAK,MAAMsD,CAAC,IAAIF,IAAI,EAAE;MACpBpD,QAAQ,CAACsD,CAAC,CAAC,GAAGrD,QAAQ,CAACqD,CAAC,CAAC;MACzB,OAAOrD,QAAQ,CAACqD,CAAC,CAAC;IACpB;IAEA7C,MAAM,CAACC,MAAM,CAAC,IAAI,CAACT,QAAQ,EAAEA,QAAQ,CAAC;IACtCQ,MAAM,CAACC,MAAM,CAAC,IAAI,CAACV,QAAQ,EAAEA,QAAQ,CAAC;EACxC;EAKAuC,oBAAoBA,CAACrD,KAA0B,EAAQ;IACrD,IAAI,CAACiE,oBAAoB,CAACjE,KAAK,CAAC;EAClC;EAKAkD,WAAWA,CAACpC,QAAiC,EAAQ;IACnDS,MAAM,CAACC,MAAM,CAAC,IAAI,CAACV,QAAQ,EAAEA,QAAQ,CAAC;EACxC;EAQAqC,WAAWA,CAACpC,QAAsC,EAAQ;IACxD,IAAI,CAACC,QAAQ,CAACmC,WAAW,CAACpC,QAAQ,CAAC;IACnCQ,MAAM,CAACC,MAAM,CAAC,IAAI,CAACT,QAAQ,EAAEA,QAAQ,CAAC;EACxC;EAMA+B,cAAcA,CAACnC,WAA0B,EAAQ;IAC/C,IAAI,CAACM,WAAW,CAAC6B,cAAc,CAACnC,WAAW,CAAC;EAC9C;EAMAqC,aAAaA,CAACwB,OAA+B,EAAQ;IACnD,IAAIA,OAAO,CAAC5B,OAAO,EAAE;MACnBtD,GAAG,CAACmF,IAAI,CACL,SAAQ,IAAI,CAACxE,EAAG,qEACnB,CAAC;IACH;IACA,KAAK,MAAM,CAACyE,UAAU,EAAEC,MAAM,CAAC,IAAIpD,MAAM,CAACqD,OAAO,CAACJ,OAAO,CAAC,EAAE;MAAA,IAAAK,qBAAA;MAC1D,MAAMrE,YAAY,GAAG,IAAI,CAACA,YAAY,CAACsE,IAAI,CAACC,MAAM,IAAIA,MAAM,CAACC,IAAI,KAAKN,UAAU,CAAC;MACjF,IAAI,CAAClE,YAAY,EAAE;QACjB;MACF;MAGA,MAAMyE,cAAc,GAAGzE,YAAY,CAACuC,UAAU,IAAA8B,qBAAA,GAC1CrE,YAAY,CAACuC,UAAU,cAAA8B,qBAAA,uBAAvBA,qBAAA,CAAyBK,GAAG,CAACH,MAAM,IAAIA,MAAM,CAACI,SAAS,CAAC,GACxD,CAAC3E,YAAY,CAACwE,IAAI,CAAC;MACvB,IAAII,GAAG,GAAG,KAAK;MACf,KAAK,MAAMC,aAAa,IAAIJ,cAAc,EAAE;QAC1C,MAAMK,aAAa,GAAG,IAAI,CAACnE,eAAe,CAACkE,aAAa,CAAC;QACzD,IAAIC,aAAa,EAAE;UACjB,IAAI,CAACrE,WAAW,CAACsE,SAAS,CAACD,aAAa,CAACE,QAAQ,EAAEb,MAAM,CAAC;UAC1DS,GAAG,GAAG,IAAI;QACZ;MACF;MACA,IAAI,CAACA,GAAG,EAAE;QACR9F,GAAG,CAACmF,IAAI,CACL,SAAQ,IAAI,CAACxE,EAAG,uBAAsB0E,MAAM,CAAC1E,EAAG,4BAA2ByE,UAAW,GACzF,CAAC,CAAC,CAAC;MACL;IACF;EACF;EAUAzB,qBAAqBA,CAACF,UAAsC,EAAQ;IAClE,KAAK,MAAM,CAACsC,aAAa,EAAEI,KAAK,CAAC,IAAIlE,MAAM,CAACqD,OAAO,CAAC7B,UAAU,CAAC,EAAE;MAC/D,MAAMuC,aAAa,GAAG,IAAI,CAACnE,eAAe,CAACkE,aAAa,CAAC;MACzD,IAAIC,aAAa,EAAE;QACjB,IAAI,CAACrE,WAAW,CAACyE,WAAW,CAACJ,aAAa,CAACE,QAAQ,EAAEC,KAAK,CAAC;MAC7D,CAAC,MAAM;QACLnG,GAAG,CAACmF,IAAI,CAAE,UAAS,IAAI,CAACxE,EAAG,uDAAsDoF,aAAc,GAAE,CAAC,CAAC,CAAC;MACtG;IACF;EACF;EAEAvB,uBAAuBA,CAAC6B,MAAc,EAAQ;IAC5C,IAAI,CAACzE,oBAAoB,GAAG,IAAI,CAACA,oBAAoB,IAAIyE,MAAM;EACjE;EAEArD,eAAeA,CAAA,EAAmB;IAChC,IAAI,IAAI,CAACpB,oBAAoB,EAAE;MAC7B,IAAI,IAAI,CAACF,QAAQ,EAAE;QACjB1B,GAAG,CAACA,GAAG,CAAC,CAAC,EAAG,SAAQ,IAAI,CAACW,EAAG,kCAAiC,IAAI,CAACiB,oBAAqB,IAAG,CAAC,CAAC,CAAC;MAC/F;MACA,IAAI,CAACA,oBAAoB,GAAG,KAAK;MACjC,IAAI,CAACF,QAAQ,GAAG,IAAI,CAACjB,MAAM,CAAC6F,oBAAoB,CAAC;QAC/C,GAAG,IAAI,CAAC5F,KAAK;QACbQ,YAAY,EAAE,IAAI,CAACA,YAAY;QAC/BD,QAAQ,EAAE,IAAI,CAACA,QAAQ;QACvBD,UAAU,EAAE,IAAI,CAACA,UAAU;QAC3BJ,EAAE,EAAE,IAAI,CAACH,MAAM,CAAC8F,YAAY,CAAC;UAAC5F,EAAE,EAAE,mBAAmB;UAAE6F,KAAK,EAAE,QAAQ;UAAEC,MAAM,EAAE,IAAI,CAAC7F;QAAE,CAAC,CAAC;QACzFC,EAAE,EAAE,IAAI,CAACA,EAAE,GAAG,IAAI,CAACJ,MAAM,CAAC8F,YAAY,CAAC;UAAC5F,EAAE,EAAE,qBAAqB;UAAE6F,KAAK,EAAE,UAAU;UAAEC,MAAM,EAAE,IAAI,CAAC5F;QAAE,CAAC,CAAC,GAAG;MAC5G,CAAC,CAAC;MACF,IAAI,CAACgB,eAAe,GAAG1B,4BAA4B,CACjD,IAAI,CAACuB,QAAQ,CAACgF,YAAY,EAC1B,IAAI,CAACxF,YACP,CAAC;IACH;IACA,OAAO,IAAI,CAACQ,QAAQ;EACtB;AACF;AA7ZanB,KAAK,CACTyB,YAAY,GAAyB;EAC1C,GAAGjC,cAAc,CAACiC,YAAY;EAC9BpB,EAAE,EAAE,IAAI;EACRC,EAAE,EAAE,IAAI;EACRF,EAAE,EAAE,SAAS;EACbgG,MAAM,EAAEC,SAAS;EACjB7F,QAAQ,EAAE,CAAC,CAAC;EACZ8F,OAAO,EAAE,CAAC,CAAC;EACXC,OAAO,EAAE,EAAE;EACXhD,cAAc,EAAE,CAAC,CAAC;EAClBjB,QAAQ,EAAE,IAAI;EACdxB,WAAW,EAAE,IAAI;EACjBoC,UAAU,EAAE,CAAC,CAAC;EACdlC,kBAAkB,EAAE,CAAC,CAAC;EAEtBT,eAAe,EAAE8F,SAAU;EAC3BjE,eAAe,EAAEvC,eAAe,CAAC2G,yBAAyB,CAAC;AAC7D,CAAC;AA8YH,SAASxC,kBAAkBA,CAACyC,QAAwB,EAAEC,QAAwB,EAAkB;EAC9F,MAAMC,OAAO,GAAG,CAAC,GAAGF,QAAQ,CAAC;EAC7B,KAAK,MAAMnB,SAAS,IAAIoB,QAAQ,EAAE;IAChC,MAAME,KAAK,GAAGD,OAAO,CAACE,SAAS,CAACC,UAAU,IAAIA,UAAU,CAAC3B,IAAI,KAAKG,SAAS,CAACH,IAAI,CAAC;IACjF,IAAIyB,KAAK,GAAG,CAAC,EAAE;MACbD,OAAO,CAACI,IAAI,CAACzB,SAAS,CAAC;IACzB,CAAC,MAAM;MACLqB,OAAO,CAACC,KAAK,CAAC,GAAGtB,SAAS;IAC5B;EACF;EACA,OAAOqB,OAAO;AAChB"}
+{"version":3,"file":"model.js","names":["RenderPipeline","log","uid","deepEqual","splitUniformsAndBindings","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// Copyright (c) vis.gl contributors\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, splitUniformsAndBindings} 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 bindings & uniforms being set)\n   */\n  setShaderModuleProps(props: Record<string, any>): void {\n    const {bindings, uniforms} = splitUniformsAndBindings(this._getModuleUniforms(props));\n    Object.assign(this.bindings, bindings);\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/shadertools/shader-module-uniforms.js

@@ -17,7 +17,7 @@ export class ShaderModuleUniforms {
     const uniformTypes = {};
     for (const [name, {
       format
-    }] of Object.entries(props.shaderModule.uniforms)) {
+    }] of Object.entries(props.shaderModule.uniformPropTypes || {})) {
       uniformTypes[name] = format;
     }
     this.uniformBufferLayout = new UniformBufferLayout(uniformTypes);

package/dist/shadertools/shader-module-uniforms.js.map

@@ -1 +1 @@
-{"version":3,"file":"shader-module-uniforms.js","names":["isNumberArray","Buffer","UniformBufferLayout","ShaderModuleUniforms","constructor","props","device","shaderModule","useUniformBuffers","uniformBufferLayout","uniformBuffer","uniforms","modifiedUniforms","modified","needsRedraw","info","type","uniformTypes","name","format","Object","entries","createBuffer","usage","UNIFORM","byteLength","setUniforms","key","value","_setUniform","setNeedsRedraw","reason","getUniformBuffer","getModifiedUniforms","data","getData","write","getUniforms","groupName","arrayEqual","a","b","limit","arguments","length","undefined","arrayA","arrayB","i"],"sources":["../../src/shadertools/shader-module-uniforms.ts"],"sourcesContent":["// luma.gl, MIT license\nimport {NumberArray, isNumberArray} from '@luma.gl/core';\nimport {Device, Buffer, UniformBufferLayout, ShaderUniformType} from '@luma.gl/core';\nimport {ShaderModule} from '@luma.gl/shadertools';\n\n/** Duplicates definition in core module to avoid cross dependencies */\nexport type UniformValue = number | boolean | Readonly<NumberArray>; // Float32Array> | Readonly<Int32Array> | Readonly<Uint32Array> | Readonly<number[]>;\n\n/** A uniform store holds a number of uniform values and does some book keeping on what has changes */\nexport class ShaderModuleUniforms<TUniforms extends Record<string, UniformValue>> {\n  device: Device;\n  shaderModule: ShaderModule<TUniforms>;\n\n  useUniformBuffers: boolean;\n  uniformBufferLayout: UniformBufferLayout;\n  uniformBuffer: Buffer | null = null;\n\n  uniforms: Record<string, UniformValue> = {};\n  modifiedUniforms: Record<string, boolean> = {};\n  modified: boolean = true;\n\n  needsRedraw: string | false = 'initialized';\n\n  constructor(props?: {\n    device: Device;\n    shaderModule: ShaderModule<TUniforms>\n  }) {\n    this.device = props.device;\n    this.shaderModule = props.shaderModule;\n    this.useUniformBuffers = this.device.info.type !== 'webgl';\n\n    // extract uniform formats and create a uniform buffer layout\n    const uniformTypes: Record<string, ShaderUniformType> = {};\n    for (const [name, {format}] of Object.entries(props.shaderModule.uniforms)) {\n      uniformTypes[name] = format;\n    }\n    this.uniformBufferLayout = new UniformBufferLayout(uniformTypes);\n\n    // create a uniform buffer\n    if (this.useUniformBuffers) {\n      this.uniformBuffer = this.device.createBuffer({\n        usage: Buffer.UNIFORM,\n        byteLength: this.uniformBufferLayout.byteLength\n      });  \n    }\n  }\n\n  /** Set a map of uniforms */\n  setUniforms(uniforms: TUniforms): void {\n    for (const [key, value] of Object.entries(uniforms)) {\n      this._setUniform(key, value);\n      this.setNeedsRedraw(key);\n    }\n  }\n\n  setNeedsRedraw(reason: string): void {\n    this.needsRedraw = this.needsRedraw || reason;\n  }\n\n  /** \n   * Updates the uniform buffer if needed. \n   * Clears the dirty flag.\n   */\n  getUniformBuffer(): Buffer {\n    if (this.needsRedraw) {\n      const modifiedUniforms = this.getModifiedUniforms();\n      const data = this.uniformBufferLayout.getData(modifiedUniforms);\n      this.uniformBuffer.write(data);\n    }\n    return this.uniformBuffer;\n  }\n\n  /** Returns all uniforms */\n  getUniforms(groupName: string): Record<string, UniformValue> {\n    this.modifiedUniforms = {};\n    this.needsRedraw = false;\n    return (this.uniforms[groupName] || {}) as Record<string, UniformValue>;\n  }\n\n  /** Returns modified uniforms */\n  getModifiedUniforms() {\n    const modifiedUniforms = this.modifiedUniforms;\n    this.modifiedUniforms = {};\n    this.needsRedraw = false;\n    return modifiedUniforms;\n  }\n\n  /** Set a single uniform */\n  private _setUniform(key: string, value: UniformValue) {\n    // if (this.layout[key] !== undefined) {\n    //   this.uniforms[key] = value;\n    //   this.modifiedUniforms[key] = true;\n    //   this.modified = true;\n    // } else {\n    //   log.warn(`Unknown uniform ${key}`)\n    // }\n    if (arrayEqual(this.uniforms[key], value)) {\n      return;\n    }\n    this.uniforms[key] = value;\n    this.modifiedUniforms[key] = true;\n    this.modified = true;\n  }\n}\n\nfunction arrayEqual(a: unknown, b: unknown, limit: number = 16) {\n  if (a !== b) {\n    return false;\n  }\n  const arrayA = isNumberArray(a);\n  if (!arrayA) {\n    return false;\n  }\n  const arrayB = isNumberArray(b);\n  if (arrayB && arrayA.length === arrayB.length) {\n    for (let i = 0; i < arrayA.length; ++i) {\n      if (arrayB[i] !== arrayA[i]) {\n        return false;\n      }\n    }\n  }\n  return true;\n}\n\n\n// export function makeUniformStore<I extends Record<string, Record<string, unknown>>>(name: string, uniforms: I): UniformStore<{ [P in keyof I]: I[P] }> {\n//   return new UniformStore<{ [P in keyof I]: I[P] }>({name, uniforms});\n// }\n\n// type ShaderModule<Uniforms extends Record<string, unknown> = {}> = {\n//   uniformTypes: Record<keyof Uniforms, string>;\n// };\n\n// type Module1Uniforms = {\n//   uniform1?: number;\n//   uniform2?: [number, number];\n// }\n\n// type Module2Uniforms = {\n//   uniform3: number;\n//   uniform4: [number, number];\n// }\n\n// const shaderModule: ShaderModule<Module1Uniforms> = {\n//   uniformTypes: {\n//     uniform1: 'aaa',\n//     uniform2: 'aaa'\n//   }\n// }\n\n\n// const module1Uniforms = new ShaderModuleUniforms<Module1Uniforms>();\n\n// module1Uniforms.setUniforms({\n//   uniform1: 1,\n//   uniform2: [1, 1]\n// });\n\n\n\n// setUniformStore(pipeline, blockIndex, block);\n\n// GLSL utilities\n\n\n// TYPE TESTS\n\n/*\nnew UniformStore<ModuleUniforms>().setUniforms({\n  uniform1: 1,\n  uniform2: 1,\n});\n\nnew UniformStore<ModuleUniforms>().setUniforms({\n  three: 1,\n  uniform1: 1,\n});\n*/\n"],"mappings":"AACA,SAAqBA,aAAa,QAAO,eAAe;AACxD,SAAgBC,MAAM,EAAEC,mBAAmB,QAA0B,eAAe;AAOpF,OAAO,MAAMC,oBAAoB,CAAiD;EAchFC,WAAWA,CAACC,KAGX,EAAE;IAAA,KAhBHC,MAAM;IAAA,KACNC,YAAY;IAAA,KAEZC,iBAAiB;IAAA,KACjBC,mBAAmB;IAAA,KACnBC,aAAa,GAAkB,IAAI;IAAA,KAEnCC,QAAQ,GAAiC,CAAC,CAAC;IAAA,KAC3CC,gBAAgB,GAA4B,CAAC,CAAC;IAAA,KAC9CC,QAAQ,GAAY,IAAI;IAAA,KAExBC,WAAW,GAAmB,aAAa;IAMzC,IAAI,CAACR,MAAM,GAAGD,KAAK,CAACC,MAAM;IAC1B,IAAI,CAACC,YAAY,GAAGF,KAAK,CAACE,YAAY;IACtC,IAAI,CAACC,iBAAiB,GAAG,IAAI,CAACF,MAAM,CAACS,IAAI,CAACC,IAAI,KAAK,OAAO;IAG1D,MAAMC,YAA+C,GAAG,CAAC,CAAC;IAC1D,KAAK,MAAM,CAACC,IAAI,EAAE;MAACC;IAAM,CAAC,CAAC,IAAIC,MAAM,CAACC,OAAO,CAAChB,KAAK,CAACE,YAAY,CAACI,QAAQ,CAAC,EAAE;MAC1EM,YAAY,CAACC,IAAI,CAAC,GAAGC,MAAM;IAC7B;IACA,IAAI,CAACV,mBAAmB,GAAG,IAAIP,mBAAmB,CAACe,YAAY,CAAC;IAGhE,IAAI,IAAI,CAACT,iBAAiB,EAAE;MAC1B,IAAI,CAACE,aAAa,GAAG,IAAI,CAACJ,MAAM,CAACgB,YAAY,CAAC;QAC5CC,KAAK,EAAEtB,MAAM,CAACuB,OAAO;QACrBC,UAAU,EAAE,IAAI,CAAChB,mBAAmB,CAACgB;MACvC,CAAC,CAAC;IACJ;EACF;EAGAC,WAAWA,CAACf,QAAmB,EAAQ;IACrC,KAAK,MAAM,CAACgB,GAAG,EAAEC,KAAK,CAAC,IAAIR,MAAM,CAACC,OAAO,CAACV,QAAQ,CAAC,EAAE;MACnD,IAAI,CAACkB,WAAW,CAACF,GAAG,EAAEC,KAAK,CAAC;MAC5B,IAAI,CAACE,cAAc,CAACH,GAAG,CAAC;IAC1B;EACF;EAEAG,cAAcA,CAACC,MAAc,EAAQ;IACnC,IAAI,CAACjB,WAAW,GAAG,IAAI,CAACA,WAAW,IAAIiB,MAAM;EAC/C;EAMAC,gBAAgBA,CAAA,EAAW;IACzB,IAAI,IAAI,CAAClB,WAAW,EAAE;MACpB,MAAMF,gBAAgB,GAAG,IAAI,CAACqB,mBAAmB,CAAC,CAAC;MACnD,MAAMC,IAAI,GAAG,IAAI,CAACzB,mBAAmB,CAAC0B,OAAO,CAACvB,gBAAgB,CAAC;MAC/D,IAAI,CAACF,aAAa,CAAC0B,KAAK,CAACF,IAAI,CAAC;IAChC;IACA,OAAO,IAAI,CAACxB,aAAa;EAC3B;EAGA2B,WAAWA,CAACC,SAAiB,EAAgC;IAC3D,IAAI,CAAC1B,gBAAgB,GAAG,CAAC,CAAC;IAC1B,IAAI,CAACE,WAAW,GAAG,KAAK;IACxB,OAAQ,IAAI,CAACH,QAAQ,CAAC2B,SAAS,CAAC,IAAI,CAAC,CAAC;EACxC;EAGAL,mBAAmBA,CAAA,EAAG;IACpB,MAAMrB,gBAAgB,GAAG,IAAI,CAACA,gBAAgB;IAC9C,IAAI,CAACA,gBAAgB,GAAG,CAAC,CAAC;IAC1B,IAAI,CAACE,WAAW,GAAG,KAAK;IACxB,OAAOF,gBAAgB;EACzB;EAGQiB,WAAWA,CAACF,GAAW,EAAEC,KAAmB,EAAE;IAQpD,IAAIW,UAAU,CAAC,IAAI,CAAC5B,QAAQ,CAACgB,GAAG,CAAC,EAAEC,KAAK,CAAC,EAAE;MACzC;IACF;IACA,IAAI,CAACjB,QAAQ,CAACgB,GAAG,CAAC,GAAGC,KAAK;IAC1B,IAAI,CAAChB,gBAAgB,CAACe,GAAG,CAAC,GAAG,IAAI;IACjC,IAAI,CAACd,QAAQ,GAAG,IAAI;EACtB;AACF;AAEA,SAAS0B,UAAUA,CAACC,CAAU,EAAEC,CAAU,EAAsB;EAAA,IAApBC,KAAa,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,EAAE;EAC5D,IAAIH,CAAC,KAAKC,CAAC,EAAE;IACX,OAAO,KAAK;EACd;EACA,MAAMK,MAAM,GAAG9C,aAAa,CAACwC,CAAC,CAAC;EAC/B,IAAI,CAACM,MAAM,EAAE;IACX,OAAO,KAAK;EACd;EACA,MAAMC,MAAM,GAAG/C,aAAa,CAACyC,CAAC,CAAC;EAC/B,IAAIM,MAAM,IAAID,MAAM,CAACF,MAAM,KAAKG,MAAM,CAACH,MAAM,EAAE;IAC7C,KAAK,IAAII,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGF,MAAM,CAACF,MAAM,EAAE,EAAEI,CAAC,EAAE;MACtC,IAAID,MAAM,CAACC,CAAC,CAAC,KAAKF,MAAM,CAACE,CAAC,CAAC,EAAE;QAC3B,OAAO,KAAK;MACd;IACF;EACF;EACA,OAAO,IAAI;AACb"}
+{"version":3,"file":"shader-module-uniforms.js","names":["isNumberArray","Buffer","UniformBufferLayout","ShaderModuleUniforms","constructor","props","device","shaderModule","useUniformBuffers","uniformBufferLayout","uniformBuffer","uniforms","modifiedUniforms","modified","needsRedraw","info","type","uniformTypes","name","format","Object","entries","uniformPropTypes","createBuffer","usage","UNIFORM","byteLength","setUniforms","key","value","_setUniform","setNeedsRedraw","reason","getUniformBuffer","getModifiedUniforms","data","getData","write","getUniforms","groupName","arrayEqual","a","b","limit","arguments","length","undefined","arrayA","arrayB","i"],"sources":["../../src/shadertools/shader-module-uniforms.ts"],"sourcesContent":["// luma.gl, MIT license\nimport {NumberArray, isNumberArray} from '@luma.gl/core';\nimport {Device, Buffer, UniformBufferLayout, ShaderUniformType} from '@luma.gl/core';\nimport {ShaderModule} from '@luma.gl/shadertools';\n\n/** Duplicates definition in core module to avoid cross dependencies */\nexport type UniformValue = number | boolean | Readonly<NumberArray>; // Float32Array> | Readonly<Int32Array> | Readonly<Uint32Array> | Readonly<number[]>;\n\n/** A uniform store holds a number of uniform values and does some book keeping on what has changes */\nexport class ShaderModuleUniforms<TUniforms extends Record<string, UniformValue>> {\n  device: Device;\n  shaderModule: ShaderModule<TUniforms>;\n\n  useUniformBuffers: boolean;\n  uniformBufferLayout: UniformBufferLayout;\n  uniformBuffer: Buffer | null = null;\n\n  uniforms: Record<string, UniformValue> = {};\n  modifiedUniforms: Record<string, boolean> = {};\n  modified: boolean = true;\n\n  needsRedraw: string | false = 'initialized';\n\n  constructor(props?: {\n    device: Device;\n    shaderModule: ShaderModule<TUniforms>\n  }) {\n    this.device = props.device;\n    this.shaderModule = props.shaderModule;\n    this.useUniformBuffers = this.device.info.type !== 'webgl';\n\n    // extract uniform formats and create a uniform buffer layout\n    const uniformTypes: Record<string, ShaderUniformType> = {};\n    for (const [name, {format}] of Object.entries(props.shaderModule.uniformPropTypes || {})) {\n      uniformTypes[name] = format;\n    }\n    this.uniformBufferLayout = new UniformBufferLayout(uniformTypes);\n\n    // create a uniform buffer\n    if (this.useUniformBuffers) {\n      this.uniformBuffer = this.device.createBuffer({\n        usage: Buffer.UNIFORM,\n        byteLength: this.uniformBufferLayout.byteLength\n      });  \n    }\n  }\n\n  /** Set a map of uniforms */\n  setUniforms(uniforms: TUniforms): void {\n    for (const [key, value] of Object.entries(uniforms)) {\n      this._setUniform(key, value);\n      this.setNeedsRedraw(key);\n    }\n  }\n\n  setNeedsRedraw(reason: string): void {\n    this.needsRedraw = this.needsRedraw || reason;\n  }\n\n  /** \n   * Updates the uniform buffer if needed. \n   * Clears the dirty flag.\n   */\n  getUniformBuffer(): Buffer {\n    if (this.needsRedraw) {\n      const modifiedUniforms = this.getModifiedUniforms();\n      const data = this.uniformBufferLayout.getData(modifiedUniforms);\n      this.uniformBuffer.write(data);\n    }\n    return this.uniformBuffer;\n  }\n\n  /** Returns all uniforms */\n  getUniforms(groupName: string): Record<string, UniformValue> {\n    this.modifiedUniforms = {};\n    this.needsRedraw = false;\n    return (this.uniforms[groupName] || {}) as Record<string, UniformValue>;\n  }\n\n  /** Returns modified uniforms */\n  getModifiedUniforms() {\n    const modifiedUniforms = this.modifiedUniforms;\n    this.modifiedUniforms = {};\n    this.needsRedraw = false;\n    return modifiedUniforms;\n  }\n\n  /** Set a single uniform */\n  private _setUniform(key: string, value: UniformValue) {\n    // if (this.layout[key] !== undefined) {\n    //   this.uniforms[key] = value;\n    //   this.modifiedUniforms[key] = true;\n    //   this.modified = true;\n    // } else {\n    //   log.warn(`Unknown uniform ${key}`)\n    // }\n    if (arrayEqual(this.uniforms[key], value)) {\n      return;\n    }\n    this.uniforms[key] = value;\n    this.modifiedUniforms[key] = true;\n    this.modified = true;\n  }\n}\n\nfunction arrayEqual(a: unknown, b: unknown, limit: number = 16) {\n  if (a !== b) {\n    return false;\n  }\n  const arrayA = isNumberArray(a);\n  if (!arrayA) {\n    return false;\n  }\n  const arrayB = isNumberArray(b);\n  if (arrayB && arrayA.length === arrayB.length) {\n    for (let i = 0; i < arrayA.length; ++i) {\n      if (arrayB[i] !== arrayA[i]) {\n        return false;\n      }\n    }\n  }\n  return true;\n}\n\n\n// export function makeUniformStore<I extends Record<string, Record<string, unknown>>>(name: string, uniforms: I): UniformStore<{ [P in keyof I]: I[P] }> {\n//   return new UniformStore<{ [P in keyof I]: I[P] }>({name, uniforms});\n// }\n\n// type ShaderModule<Uniforms extends Record<string, unknown> = {}> = {\n//   uniformTypes: Record<keyof Uniforms, string>;\n// };\n\n// type Module1Uniforms = {\n//   uniform1?: number;\n//   uniform2?: [number, number];\n// }\n\n// type Module2Uniforms = {\n//   uniform3: number;\n//   uniform4: [number, number];\n// }\n\n// const shaderModule: ShaderModule<Module1Uniforms> = {\n//   uniformTypes: {\n//     uniform1: 'aaa',\n//     uniform2: 'aaa'\n//   }\n// }\n\n\n// const module1Uniforms = new ShaderModuleUniforms<Module1Uniforms>();\n\n// module1Uniforms.setUniforms({\n//   uniform1: 1,\n//   uniform2: [1, 1]\n// });\n\n\n\n// setUniformStore(pipeline, blockIndex, block);\n\n// GLSL utilities\n\n\n// TYPE TESTS\n\n/*\nnew UniformStore<ModuleUniforms>().setUniforms({\n  uniform1: 1,\n  uniform2: 1,\n});\n\nnew UniformStore<ModuleUniforms>().setUniforms({\n  three: 1,\n  uniform1: 1,\n});\n*/\n"],"mappings":"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"}