@luma.gl/engine 9.0.0-alpha.21 → 9.0.0-alpha.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luma.gl/engine",
-  "version": "9.0.0-alpha.21",
+  "version": "9.0.0-alpha.23",
   "description": "WebGL2 Components for High Performance Rendering and Computation",
   "type": "module",
   "license": "MIT",
@@ -40,13 +40,13 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.0.0",
-    "@luma.gl/api": "9.0.0-alpha.21",
-    "@luma.gl/constants": "9.0.0-alpha.21",
-    "@luma.gl/shadertools": "9.0.0-alpha.21",
-    "@luma.gl/webgl": "9.0.0-alpha.21",
+    "@luma.gl/api": "9.0.0-alpha.23",
+    "@luma.gl/constants": "9.0.0-alpha.23",
+    "@luma.gl/shadertools": "9.0.0-alpha.23",
+    "@luma.gl/webgl": "9.0.0-alpha.23",
     "@math.gl/core": "4.0.0-alpha.4",
     "@probe.gl/log": "^4.0.2",
     "@probe.gl/stats": "^4.0.2"
   },
-  "gitHead": "7ee95470a6a2f62753201beb0c36b00e37c70455"
+  "gitHead": "5e4a30497333bea4be8f2b3f3db33c0b67931b9c"
 }

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

@@ -276,7 +276,7 @@ export class AnimationLoop {
 
   _setDisplay(display: any) {
     if (this.display) {
-      this.display.delete();
+      this.display.destroy();
       this.display.animationLoop = null;
     }
 
@@ -355,8 +355,10 @@ export class AnimationLoop {
     }
     this.animationProps = {
       animationLoop: this,
+
       device: this.device,
       canvas: this.device?.canvasContext?.canvas,
+      renderPass: this.device.getDefaultRenderPass(),
       timeline: this.timeline,
 
       // Initial values
@@ -393,6 +395,8 @@ export class AnimationLoop {
       return;
     }
 
+    this.animationProps.renderPass = this.device.getDefaultRenderPass();
+
     const {width, height, aspect} = this._getSizeAndAspect();
     if (width !== this.animationProps.width || height !== this.animationProps.height) {
       this.setNeedsRedraw('drawing buffer resized');

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

@@ -1,10 +1,11 @@
-import {Device} from '@luma.gl/api';
+import {Device, RenderPass} from '@luma.gl/api';
 import {Timeline} from '../animation/timeline'
 import type {AnimationLoop} from './animation-loop';
 
 /** Properties passed to every render frame  */
 export type AnimationProps = {
   device: Device;
+  renderPass: RenderPass;
   animationLoop: AnimationLoop;
 
   /** @todo Should be canvasContext */

package/src/index.ts

@@ -13,8 +13,10 @@ export {AnimationLoop} from './animation-loop/animation-loop';
 export type {MakeAnimationLoopProps} from './animation-loop/make-animation-loop';
 export {makeAnimationLoop} from './animation-loop/make-animation-loop';
 
-export type {ModelProps} from './lib/model';
-export {Model} from './lib/model';
+export type {ModelProps} from './model/model';
+export {Model} from './model/model';
+
+export {Transform} from './transform/transform';
 
 export {PipelineFactory} from './lib/pipeline-factory';
 

package/src/lib/clip-space.ts

@@ -3,7 +3,7 @@
 import GL from '@luma.gl/constants';
 import {Device, glsl} from '@luma.gl/api';
 import {WebGLDevice} from '@luma.gl/webgl';
-import {Model, ModelProps} from './model';
+import {Model, ModelProps} from '../model/model';
 import {Geometry} from '../geometry/geometry';
 
 const CLIPSPACE_VERTEX_SHADER = glsl`\

package/src/lib/pipeline-factory.ts

@@ -1,5 +1,5 @@
 import type {RenderPipelineParameters, PrimitiveTopology, ShaderLayout} from '@luma.gl/api';
-import {Device, RenderPipeline} from '@luma.gl/api/';
+import {Device, RenderPipeline} from '@luma.gl/api';
 import type { ShaderModule } from '@luma.gl/shadertools';
 import {assembleShaders} from '@luma.gl/shadertools';
 

package/src/{lib → model}/model.ts

@@ -5,15 +5,18 @@ import {RenderPipeline} from '@luma.gl/api';
 import type { ShaderModule } from '@luma.gl/shadertools';
 import type {Geometry} from '../geometry/geometry';
 import {getAttributeBuffersFromGeometry, getIndexBufferFromGeometry} from './model-utils';
-import {PipelineFactory} from './pipeline-factory';
+import {PipelineFactory} from '../lib/pipeline-factory';
 
 export type ModelProps = Omit<RenderPipelineProps, 'vs' | 'fs'> & {
   // Model also accepts a string
   vs?: {glsl?: string; wgsl?: string} | string | null;
   fs?: {glsl?: string; wgsl?: string} | string | null;
+  defines?: Record<string, string | number | boolean>;
   modules?: ShaderModule[];
   moduleSettings?: Record<string, Record<string, any>>;
   geometry?: Geometry | null;
+  /** deprecated pipeline factory to use to create renderpipelines */
+  pipelineFactory?: PipelineFactory;
 };
 
 const DEFAULT_MODEL_PROPS: Required<ModelProps> = {
@@ -23,20 +26,25 @@ const DEFAULT_MODEL_PROPS: Required<ModelProps> = {
   id: 'unnamed',
   handle: undefined,
   userData: {},
+  defines: {},
   modules: [],
   moduleSettings: {},
-  geometry: null
+  geometry: null,
+  pipelineFactory: undefined
 };
 
 /** v9 API */
 export class Model {
   readonly device: Device;
-  readonly pipeline: RenderPipeline;
   readonly id: string;
   readonly vs: string;
   readonly fs: string | null = null;
   readonly topology: PrimitiveTopology;
   readonly vertexCount;
+
+  readonly pipelineFactory: PipelineFactory;
+  pipeline: RenderPipeline;
+
   props: Required<ModelProps>;
 
   private _getModuleUniforms: (props?: Record<string, Record<string, any>>) => Record<string, any>;
@@ -64,12 +72,13 @@ export class Model {
       this.topology = this.props.geometry.topology || 'triangle-list';
     }
 
-    const pipelineFactory = PipelineFactory.getDefaultPipelineFactory(this.device);
-    const {pipeline, getUniforms} = pipelineFactory.createRenderPipeline({
+    this.pipelineFactory = this.props.pipelineFactory || PipelineFactory.getDefaultPipelineFactory(this.device);
+    const {pipeline, getUniforms} = this.pipelineFactory.createRenderPipeline({
       ...this.props,
       vs: this.vs,
       fs: this.fs,
       topology: this.topology,
+      defines: props.defines,
       parameters: props.parameters,
       layout: props.layout
     });
@@ -85,10 +94,10 @@ export class Model {
   }
 
   destroy(): void {
-    this.pipeline.destroy();
+    this.pipelineFactory.release(this.pipeline);
   }
 
-  draw(renderPass?: RenderPass): this {
+  draw(renderPass: RenderPass): this {
     this.pipeline.draw({
       renderPass,
       vertexCount: this.vertexCount,

package/src/transform/transform.ts

@@ -0,0 +1,246 @@
+// luma.gl, MIT license
+
+import {Device, Buffer, Texture, Framebuffer} from '@luma.gl/api';
+import {getShaderInfo, getPassthroughFS} from '@luma.gl/shadertools';
+import GL from '@luma.gl/constants';
+import {WebGLDevice, GLParameters} from '@luma.gl/webgl';
+import {Model} from '../model/model';
+
+// import {AccessorObject} from '@luma.gl/webgl';
+// import {default as TransformFeedback} from '../classic/transform-feedback';
+// import BufferTransform from './buffer-transform';
+// import TextureTransform from './texture-transform';
+
+type TransformFeedback = any;
+
+/** Properties for creating Transforms */
+export type TransformProps = {
+  id?: string;
+  vs?: string;
+  elementCount?: number;
+  sourceBuffers?: Record<string, Buffer>;
+  feedbackBuffers?: Record<string, string | Buffer | {buffer: Buffer; byteOffset?: number}>;
+  varyings?: string[];
+  feedbackMap?: Record<string, string>;
+  modules?: object[]; // TODO use ShaderModule type
+  attributes?: Record<string, any>;
+  uniforms?: Record<string, any>;
+  defines?: Record<string, any>
+  parameters?: GLParameters;
+  discard?: boolean;
+  isIndexed?: boolean;
+  inject?: Record<string, string>;
+  drawMode?: number;
+  framebuffer?: Framebuffer;
+  _sourceTextures?: Record<string, Texture>;
+  _targetTexture?: string | Texture;
+  _targetTextureVarying?: string;
+  _swapTexture?: string | null;
+  _fs?: string;
+  fs?: string;
+};
+
+/** Options that can be provided when running a Transform */
+export type TransformRunOptions = {
+  framebuffer?: Framebuffer;
+  clearRenderTarget?: boolean;
+  uniforms?: Record<string, any>;
+  parameters?: Record<string, any>;
+  discard?: boolean;
+};
+
+/** Options that control drawing a Transform. Used by subclasses to return draw parameters */
+export type TransformDrawOptions = {
+  attributes?: Record<string, any>;
+  framebuffer?: any;
+  uniforms?: object;
+  discard?: boolean;
+  parameters?: object;
+  transformFeedback?: any;
+};
+
+export type TransformBinding = {
+  sourceBuffers: Record<string, Buffer>;
+  sourceTextures: Record<string, Texture>;
+  feedbackBuffers?: Record<string, Buffer | {buffer: Buffer}>;
+  transformFeedback?: TransformFeedback;
+  framebuffer?: Framebuffer;
+  targetTexture?: Texture;
+};
+
+/**
+ * Takes source and target buffers/textures and sets up the pipeline
+ */
+export class Transform {
+  /**
+   * Check if Transforms are supported (they are not under WebGL1)
+   * @todo differentiate writing to buffer vs not
+   */
+  static isSupported(device: Device | WebGLRenderingContext): boolean {
+    // try {
+    //   const webglDevice = WebGLDevice.attach(device);
+    //   return webglDevice.isWebGL2;
+    // } catch {
+    //   return false;
+    // }
+    return false;
+  }
+
+  readonly device: WebGLDevice;
+  readonly gl: WebGL2RenderingContext;
+  // model: Model;
+  elementCount = 0;
+  // bufferTransform: BufferTransform | null = null;
+  // textureTransform: TextureTransform | null = null;
+  elementIDBuffer: Buffer | null = null;
+
+  constructor(device: Device | WebGLRenderingContext, props: TransformProps = {}) {
+    this.device = WebGLDevice.attach(device);
+    // TODO assert webgl2?
+    this.gl = this.device.gl2;
+    this._buildResourceTransforms(props);
+
+    props = this._updateModelProps(props);
+    // @ts-expect-error TODO this is valid type error for params
+    this.model = new Model(this.device, {
+      ...props,
+      fs: props.fs || getPassthroughFS({version: getShaderInfo(props.vs).version}),
+      id: props.id || 'transform-model',
+      // @ts-expect-error
+      drawMode: props.drawMode || GL.POINTS,
+      vertexCount: props.elementCount
+    });
+
+    // if (this.bufferTransform) {
+    //   this.bufferTransform.setupResources({model: this.model});
+    // }
+    Object.seal(this);
+  }
+
+  /** Delete owned resources. */
+  destroy(): void {
+    // if (this.model) {
+    //   this.model.destroy();
+    // }
+    // if (this.bufferTransform) {
+    //   this.bufferTransform.destroy();
+    // }
+    // if (this.textureTransform) {
+    //   this.textureTransform.destroy();
+    // }
+  }
+
+  /** @deprecated Use destroy*() */
+  delete(): void {
+    this.destroy();
+  }
+
+  /** Run one transform loop. */
+  run(options?: TransformRunOptions): void {
+    const {clearRenderTarget = true} = options || {};
+
+    const updatedOpts = this._updateDrawOptions(options);
+
+    if (clearRenderTarget && updatedOpts.framebuffer) {
+      // clear(this.device, {framebuffer: updatedOpts.framebuffer, color: true});
+    }
+
+    // this.model.transform(updatedOpts);
+  }
+
+  /** swap resources if a map is provided */
+  swap(): void {
+    // let swapped = false;
+    // const resourceTransforms = [this.bufferTransform, this.textureTransform].filter(Boolean);
+    // for (const resourceTransform of resourceTransforms) {
+    //   swapped = swapped || Boolean(resourceTransform?.swap());
+    // }
+    // assert(swapped, 'Nothing to swap');
+  }
+
+  /** Return Buffer object for given varying name. */
+  getBuffer(varyingName: string): Buffer | null {
+    // return this.bufferTransform && this.bufferTransform.getBuffer(varyingName);
+    return null;
+  }
+
+  /** Return data either from Buffer or from Texture */
+  getData(options: {packed?: boolean; varyingName?: string} = {}) {
+    // const resourceTransforms = [this.bufferTransform, this.textureTransform].filter(Boolean);
+    // for (const resourceTransform of resourceTransforms) {
+    //   const data = resourceTransform?.getData(options);
+    //   if (data) {
+    //     return data;
+    //   }
+    // }
+    // return null;
+  }
+
+  /** Return framebuffer object if rendering to textures */
+  getFramebuffer(): Framebuffer | null {
+    // return this.textureTransform?.getFramebuffer() || null;
+    return null;
+  }
+
+  /** Update some or all buffer/texture bindings. */
+  update(props: TransformProps): void {
+    // if (props.elementCount !== undefined) {
+    //   this.model.setVertexCount(props.elementCount);
+    // }
+    // const resourceTransforms = [this.bufferTransform, this.textureTransform].filter(Boolean);
+    // for (const resourceTransform of resourceTransforms) {
+    //   resourceTransform?.update(props);
+    // }
+  }
+
+  // Private
+
+  _updateModelProps(props: TransformProps): TransformProps {
+    const updatedProps: TransformProps = {...props};
+    // const resourceTransforms = [this.bufferTransform, this.textureTransform].filter(Boolean) ;
+    // for (const resourceTransform of resourceTransforms) {
+    //   updatedProps = resourceTransform.updateModelProps(updatedProps);
+    // }
+    return updatedProps;
+  }
+
+  _buildResourceTransforms(props: TransformProps) {
+    // if (canCreateBufferTransform(props)) {
+    //   this.bufferTransform = new BufferTransform(this.device, props);
+    // }
+    // if (canCreateTextureTransform(props)) {
+    //   this.textureTransform = new TextureTransform(this.device, props);
+    // }
+    // assert(
+    //   this.bufferTransform || this.textureTransform,
+    //   'must provide source/feedback buffers or source/target textures'
+    // );
+  }
+
+  _updateDrawOptions(options: TransformRunOptions): TransformDrawOptions {
+    const updatedOpts = {...options};
+    // const resourceTransforms = [this.bufferTransform, this.textureTransform].filter(Boolean) ;
+    // for (const resourceTransform of resourceTransforms) {
+    //   updatedOpts = Object.assign(updatedOpts, resourceTransform.getDrawOptions(updatedOpts));
+    // }
+    return updatedOpts;
+  }
+}
+
+// Helper Methods
+
+// function canCreateBufferTransform(props: TransformProps): boolean {
+//   const canCreate =
+//     (props.feedbackBuffers && !isObjectEmpty(props.feedbackBuffers)) ||
+//     (props.feedbackMap && !isObjectEmpty(props.feedbackMap)) ||
+//     (props.varyings && props.varyings.length > 0);
+//   return Boolean(canCreate);
+// }
+
+// function canCreateTextureTransform(props: TransformProps): boolean {
+//   const canCreate =
+//     (props._sourceTextures && !isObjectEmpty(props._sourceTextures)) ||
+//     props._targetTexture ||
+//     props._targetTextureVarying;
+//   return Boolean(canCreate);
+// }

package/dist/lib/model-utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"model-utils.d.ts","sourceRoot":"","sources":["../../src/lib/model-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,MAAM,EAAS,MAAM,cAAc,CAAC;AACpD,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AAsDnD,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,MAAM,GAAG,SAAS,CAYjG;AAED,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAc1G"}

package/dist/lib/model-utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"model-utils.js","names":["Buffer","assert","GLTF_TO_LUMA_ATTRIBUTE_MAP","POSITION","NORMAL","COLOR_0","TEXCOORD_0","TEXCOORD_1","TEXCOORD_2","getIndexBufferFromGeometry","device","geometry","indices","undefined","data","value","Uint16Array","Uint32Array","createBuffer","usage","INDEX","getAttributeBuffersFromGeometry","buffers","name","attribute","Object","entries","attributes","remappedName","mapAttributeName","constant","Error","typedArray","id","concat"],"sources":["../../src/lib/model-utils.ts"],"sourcesContent":["import {Device, Buffer, assert} from '@luma.gl/api';\nimport type {Geometry} from '../geometry/geometry';\n\n// Support for mapping new geometries with glTF attribute names to \"classic\" luma.gl shader names\nconst GLTF_TO_LUMA_ATTRIBUTE_MAP = {\n  POSITION: 'positions',\n  NORMAL: 'normals',\n  COLOR_0: 'colors',\n  TEXCOORD_0: 'texCoords',\n  TEXCOORD_1: 'texCoords1',\n  TEXCOORD_2: 'texCoords2'\n};\n\n/*\nexport function getAttributeLayoutsFromGeometry(geometry: Geometry) {\n  const layouts: Record<string, {}> = {};\n  let indices = geometry.indices;\n\n  for (const [name, attribute] of Object.entries(geometry.attributes)) {\n    const remappedName = mapAttributeName(name);\n\n    if (attribute.constant) {\n      throw new Error('constant attributes not supported');\n    } else {\n      const typedArray = attribute.value;\n      // Create accessor by copying the attribute and removing `value``\n      const accessor = {...attribute};\n      delete accessor.value;\n      buffers[remappedName] = [device.createBuffer(typedArray), accessor];\n\n      inferAttributeAccessor(name, accessor);\n    }\n  }\n}\n\nexport class Table {\n  length: number;\n  // columns: Record<string, TypedArray> = {};\n}\n\nexport class GPUTable {\n  length: number;\n  columns: Record<string, Buffer> = {};\n}\n\nexport function convertTableToGPUTable(table: Table) {\n  // for (const ) {}\n}\n\nexport function renameTableColumns(table: Table, map: (name: string) => string) {\n  const newColumns = table.columns.reduce()\n  table.clone();\n}\n*/\n\nexport function getIndexBufferFromGeometry(device: Device, geometry: Geometry): Buffer | undefined {\n  if (!geometry.indices) {\n    return undefined;\n  }\n\n  // @ts-expect-error\n  const data = geometry.indices.value || geometry.indices;\n  assert(\n    data instanceof Uint16Array || data instanceof Uint32Array,\n    'attribute array for \"indices\" must be of integer type'\n  );\n  return device.createBuffer({usage: Buffer.INDEX, data});\n}\n\nexport function getAttributeBuffersFromGeometry(device: Device, geometry: Geometry): Record<string, Buffer> {\n  const buffers: Record<string, Buffer> = {};\n\n  for (const [name, attribute] of Object.entries(geometry.attributes)) {\n    const remappedName = mapAttributeName(name);\n    if (attribute?.constant) {\n      throw new Error('constant attributes not supported');\n    } else {\n      const typedArray = attribute?.value;\n      buffers[remappedName] = device.createBuffer({data: typedArray, id: `${remappedName}-buffer`});\n    }\n  }\n\n  return buffers;\n}\n\nfunction mapAttributeName(name: string): string {\n  // @ts-ignore-error\n  return GLTF_TO_LUMA_ATTRIBUTE_MAP[name] || name;\n}\n\n/*\n// Check for well known attribute names\n// eslint-disable-next-line complexity\nexport function inferAttributeAccessor(attributeName, attribute) {\n  let category;\n  switch (attributeName) {\n    case 'texCoords':\n    case 'texCoord1':\n    case 'texCoord2':\n    case 'texCoord3':\n      category = 'uvs';\n      break;\n    case 'vertices':\n    case 'positions':\n    case 'normals':\n    case 'pickingColors':\n      category = 'vectors';\n      break;\n    default:\n  }\n\n  // Check for categorys\n  switch (category) {\n    case 'vectors':\n      attribute.size = attribute.size || 3;\n      break;\n    case 'uvs':\n      attribute.size = attribute.size || 2;\n      break;\n    default:\n  }\n\n  assert(Number.isFinite(attribute.size), `attribute ${attributeName} needs size`);\n}\n*/\n"],"mappings":"AAAA,SAAgBA,MAAM,EAAEC,MAAM,QAAO,cAAc;AAInD,MAAMC,0BAA0B,GAAG;EACjCC,QAAQ,EAAE,WAAW;EACrBC,MAAM,EAAE,SAAS;EACjBC,OAAO,EAAE,QAAQ;EACjBC,UAAU,EAAE,WAAW;EACvBC,UAAU,EAAE,YAAY;EACxBC,UAAU,EAAE;AACd,CAAC;AA4CD,OAAO,SAASC,0BAA0BA,CAACC,MAAc,EAAEC,QAAkB,EAAsB;EACjG,IAAI,CAACA,QAAQ,CAACC,OAAO,EAAE;IACrB,OAAOC,SAAS;EAClB;EAGA,MAAMC,IAAI,GAAGH,QAAQ,CAACC,OAAO,CAACG,KAAK,IAAIJ,QAAQ,CAACC,OAAO;EACvDX,MAAM,CACJa,IAAI,YAAYE,WAAW,IAAIF,IAAI,YAAYG,WAAW,EAC1D,uDAAuD,CACxD;EACD,OAAOP,MAAM,CAACQ,YAAY,CAAC;IAACC,KAAK,EAAEnB,MAAM,CAACoB,KAAK;IAAEN;EAAI,CAAC,CAAC;AACzD;AAEA,OAAO,SAASO,+BAA+BA,CAACX,MAAc,EAAEC,QAAkB,EAA0B;EAC1G,MAAMW,OAA+B,GAAG,CAAC,CAAC;EAE1C,KAAK,MAAM,CAACC,IAAI,EAAEC,SAAS,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACf,QAAQ,CAACgB,UAAU,CAAC,EAAE;IACnE,MAAMC,YAAY,GAAGC,gBAAgB,CAACN,IAAI,CAAC;IAC3C,IAAIC,SAAS,aAATA,SAAS,eAATA,SAAS,CAAEM,QAAQ,EAAE;MACvB,MAAM,IAAIC,KAAK,CAAC,mCAAmC,CAAC;IACtD,CAAC,MAAM;MACL,MAAMC,UAAU,GAAGR,SAAS,aAATA,SAAS,uBAATA,SAAS,CAAET,KAAK;MACnCO,OAAO,CAACM,YAAY,CAAC,GAAGlB,MAAM,CAACQ,YAAY,CAAC;QAACJ,IAAI,EAAEkB,UAAU;QAAEC,EAAE,KAAAC,MAAA,CAAKN,YAAY;MAAS,CAAC,CAAC;IAC/F;EACF;EAEA,OAAON,OAAO;AAChB;AAEA,SAASO,gBAAgBA,CAACN,IAAY,EAAU;EAE9C,OAAOrB,0BAA0B,CAACqB,IAAI,CAAC,IAAIA,IAAI;AACjD"}

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

@@ -1 +0,0 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/lib/model.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAE,UAAU,EAAE,OAAO,EAAE,iBAAiB,EAAC,MAAM,cAAc,CAAC;AAC9G,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AAInD,oBAAY,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,IAAI,GAAG,IAAI,CAAC,GAAG;IAEhE,EAAE,CAAC,EAAE;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAC,GAAG,MAAM,GAAG,IAAI,CAAC;IACpD,EAAE,CAAC,EAAE;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAC,GAAG,MAAM,GAAG,IAAI,CAAC;IACpD,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IACrD,QAAQ,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;CAC5B,CAAC;AAcF,aAAa;AACb,qBAAa,KAAK;IAChB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;IAClC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAQ;IAClC,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,CAAC;IACrC,QAAQ,CAAC,WAAW,SAAC;IACrB,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;IAE5B,OAAO,CAAC,kBAAkB,CAAuE;gBAErF,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU;IA2C7C,OAAO,IAAI,IAAI;IAIf,IAAI,CAAC,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI;IASnC,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAmBjC,oBAAoB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IAMtD,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAMrC,aAAa,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAMvD,uBAAuB;IACvB,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAMpD,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IAMhD,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;CAWvC"}

package/dist/lib/model.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"model.js","names":["RenderPipeline","getAttributeBuffersFromGeometry","getIndexBufferFromGeometry","PipelineFactory","DEFAULT_MODEL_PROPS","_DEFAULT_PROPS","vs","fs","id","handle","undefined","userData","modules","moduleSettings","geometry","Model","constructor","device","props","_defineProperty","Error","getShaderSource","vertexCount","topology","pipelineFactory","getDefaultPipelineFactory","pipeline","getUniforms","createRenderPipeline","parameters","layout","_getModuleUniforms","_setGeometry","setUniforms","setProps","destroy","draw","renderPass","instanceCount","indices","setIndexBuffer","attributes","setAttributes","bindings","setBindings","uniforms","updateModuleSettings","Object","assign","geometryBuffers","indexBuffer","shader","info","type","wgsl","glsl"],"sources":["../../src/lib/model.ts"],"sourcesContent":["// luma.gl, MIT license\n\nimport type {Device, Buffer, RenderPipelineProps, RenderPass, Binding, PrimitiveTopology} from '@luma.gl/api';\nimport {RenderPipeline} from '@luma.gl/api';\nimport type { ShaderModule } from '@luma.gl/shadertools';\nimport type {Geometry} from '../geometry/geometry';\nimport {getAttributeBuffersFromGeometry, getIndexBufferFromGeometry} from './model-utils';\nimport {PipelineFactory} from './pipeline-factory';\n\nexport type ModelProps = Omit<RenderPipelineProps, 'vs' | 'fs'> & {\n  // Model also accepts a string\n  vs?: {glsl?: string; wgsl?: string} | string | null;\n  fs?: {glsl?: string; wgsl?: string} | string | null;\n  modules?: ShaderModule[];\n  moduleSettings?: Record<string, Record<string, any>>;\n  geometry?: Geometry | null;\n};\n\nconst DEFAULT_MODEL_PROPS: Required<ModelProps> = {\n  ...RenderPipeline._DEFAULT_PROPS,\n  vs: null,\n  fs: null,\n  id: 'unnamed',\n  handle: undefined,\n  userData: {},\n  modules: [],\n  moduleSettings: {},\n  geometry: null\n};\n\n/** v9 API */\nexport class Model {\n  readonly device: Device;\n  readonly pipeline: RenderPipeline;\n  readonly id: string;\n  readonly vs: string;\n  readonly fs: string | null = null;\n  readonly topology: PrimitiveTopology;\n  readonly vertexCount;\n  props: Required<ModelProps>;\n\n  private _getModuleUniforms: (props?: Record<string, Record<string, any>>) => Record<string, any>;\n\n  constructor(device: Device, props: ModelProps) {\n    this.props = {...DEFAULT_MODEL_PROPS, ...props};\n    props = this.props;\n    this.id = this.props.id;\n    this.device = device;\n\n    // Create the pipeline\n    if (!props.vs) {\n      throw new Error('no vertex shader');\n    }\n    this.vs = getShaderSource(this.device, props.vs);\n    if (props.fs) {\n      this.fs = getShaderSource(this.device, props.fs);\n    }\n\n    this.vertexCount = this.props.vertexCount;\n    this.topology = this.props.topology;\n\n    if (this.props.geometry) {\n      this.vertexCount = this.props.geometry.vertexCount;\n      this.topology = this.props.geometry.topology || 'triangle-list';\n    }\n\n    const pipelineFactory = PipelineFactory.getDefaultPipelineFactory(this.device);\n    const {pipeline, getUniforms} = pipelineFactory.createRenderPipeline({\n      ...this.props,\n      vs: this.vs,\n      fs: this.fs,\n      topology: this.topology,\n      parameters: props.parameters,\n      layout: props.layout\n    });\n\n    this.pipeline = pipeline;\n    this._getModuleUniforms = getUniforms;\n\n    if (this.props.geometry) {\n      this._setGeometry(this.props.geometry);\n    }\n    this.setUniforms(this._getModuleUniforms()) // Get all default module uniforms\n    this.setProps(this.props);\n  }\n\n  destroy(): void {\n    this.pipeline.destroy();\n  }\n\n  draw(renderPass?: RenderPass): this {\n    this.pipeline.draw({\n      renderPass,\n      vertexCount: this.vertexCount,\n      instanceCount: this.props.instanceCount\n    });\n    return this;\n  }\n\n  setProps(props: ModelProps): this {\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    return this;\n  }\n\n  updateModuleSettings(props: Record<string, any>): this {\n    const uniforms = this._getModuleUniforms(props);\n    this.setUniforms(uniforms);\n    return this;\n  }\n\n  setIndexBuffer(indices: Buffer): this {\n    this.pipeline.setIndexBuffer(indices);\n    // this._indices = indices;\n    return this;\n  }\n\n  setAttributes(attributes: Record<string, Buffer>): this {\n    this.pipeline.setAttributes(attributes);\n    Object.assign(this.props.attributes, attributes);\n    return this;\n  }\n\n  /** Set the bindings */\n  setBindings(bindings: Record<string, Binding>): this {\n    this.pipeline.setBindings(bindings);\n    Object.assign(this.props.bindings, bindings);\n    return this;\n  }\n\n  setUniforms(uniforms: Record<string, any>): this {\n    this.pipeline.setUniforms(uniforms);\n    Object.assign(this.props.uniforms, uniforms);\n    return this;\n  }\n\n  _setGeometry(geometry: Geometry): void {\n    // this._deleteGeometryBuffers();\n\n    const geometryBuffers = getAttributeBuffersFromGeometry(this.device, geometry);\n    this.setAttributes(geometryBuffers);\n\n    const indexBuffer = getIndexBufferFromGeometry(this.device, geometry);\n    if (indexBuffer) {\n      this.setIndexBuffer(indexBuffer);\n    }\n  }\n}\n\n/** Create a shader from the different overloads */\nfunction getShaderSource(device: Device, shader: string | {glsl?: string; wgsl?: string}): string {\n  // TODO - detect WGSL/GLSL and throw an error if not supported\n  if (typeof shader === 'string') {\n    return shader;\n  }\n\n  switch (device.info.type) {\n    case 'webgpu':\n      if (shader?.wgsl) {\n        return shader.wgsl;\n      }\n      throw new Error('WebGPU does not support GLSL shaders');\n\n    default:\n      if (shader?.glsl) {\n        return shader.glsl;\n      }\n      throw new Error('WebGL does not support WGSL shaders');\n  }\n}\n"],"mappings":"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"}