@luma.gl/engine 9.0.0-alpha.30 → 9.0.0-alpha.31

package/dist/index.cjs

@@ -704,7 +704,7 @@ var DEFAULT_RENDER_PIPELINE_OPTIONS = {
   defines: {},
   inject: {},
   transpileToGLSL100: false,
-  layout: null,
+  shaderLayout: null,
   varyings: [],
   bufferMode: 35981,
   // // varyings/bufferMode for xform feedback, 0x8c8d: SEPARATE_ATTRIBS
@@ -848,7 +848,7 @@ var PipelineFactory = class {
 };
 
 // src/model/model.ts
-var DEFAULT_MODEL_PROPS = __spreadProps(__spreadValues({}, import_core6.RenderPipeline._DEFAULT_PROPS), {
+var DEFAULT_MODEL_PROPS = __spreadProps(__spreadValues({}, import_core6.RenderPipeline.defaultProps), {
   vs: null,
   fs: null,
   id: "unnamed",
@@ -858,7 +858,9 @@ var DEFAULT_MODEL_PROPS = __spreadProps(__spreadValues({}, import_core6.RenderPi
   modules: [],
   moduleSettings: {},
   geometry: null,
-  pipelineFactory: void 0
+  pipelineFactory: void 0,
+  vertexCount: 0,
+  instanceCount: 0
 });
 var Model = class {
   constructor(device, props) {
@@ -899,7 +901,7 @@ var Model = class {
       topology: this.topology,
       defines: props.defines,
       parameters: props.parameters,
-      layout: props.layout
+      shaderLayout: props.shaderLayout
     }));
     this.pipeline = pipeline;
     this._getModuleUniforms = getUniforms;

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

@@ -5,7 +5,7 @@ export type GetRenderPipelineOptions = {
     vs: string;
     fs: string | null;
     topology: PrimitiveTopology;
-    layout?: ShaderLayout | null;
+    shaderLayout?: ShaderLayout | null;
     parameters?: RenderPipelineParameters;
     modules?: ShaderModule[];
     defines?: Record<string, string | number | boolean>;

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

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

package/dist/lib/pipeline-factory.js

@@ -7,7 +7,7 @@ const DEFAULT_RENDER_PIPELINE_OPTIONS = {
   defines: {},
   inject: {},
   transpileToGLSL100: false,
-  layout: null,
+  shaderLayout: null,
   varyings: [],
   bufferMode: 0x8c8d,
   topology: 'triangle-list',

package/dist/lib/pipeline-factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline-factory.js","names":["assembleShaders","DEFAULT_RENDER_PIPELINE_OPTIONS","vs","fs","modules","defines","inject","transpileToGLSL100","layout","varyings","bufferMode","topology","parameters","PipelineFactory","getDefaultPipelineFactory","device","defaultPipelineFactory","constructor","_defineProperty","addDefaultModule","module","_defaultModules","find","m","name","push","stateHash","removeDefaultModule","moduleName","filter","addShaderHook","hook","opts","Object","assign","_hookFunctions","createRenderPipeline","options","props","_getModuleList","hash","_hashRenderPipeline","_pipelineCache","pipeline","getUniforms","_createRenderPipeline","_getUniforms","x","_useCounts","release","destroy","platformInfo","gpu","info","features","Error","assembled","hookFunctions","createShader","stage","source","vsHash","_getHash","fsHash","moduleHashes","map","sort","varyingHashes","v","defineKeys","keys","injectKeys","defineHashes","injectHashes","key","String","parameterHash","JSON","stringify","concat","join","_hashes","undefined","_hashCounter","appModules","arguments","length","Array","seen","count","i","len"],"sources":["../../src/lib/pipeline-factory.ts"],"sourcesContent":["import type {RenderPipelineParameters, PrimitiveTopology, ShaderLayout} from '@luma.gl/core';\nimport {Device, RenderPipeline} from '@luma.gl/core';\nimport type { ShaderModule } from '@luma.gl/shadertools';\nimport {assembleShaders} from '@luma.gl/shadertools';\n\nexport type GetRenderPipelineOptions = {\n  vs: string;\n  fs: string | null;\n  topology: PrimitiveTopology;\n  layout?: ShaderLayout | null;\n  parameters?: RenderPipelineParameters;\n\n  modules?: ShaderModule[];\n  defines?: Record<string, string | number | boolean>;\n  inject?: Record<string, string>;\n  transpileToGLSL100?: boolean;\n\n  varyings?: string[];\n  bufferMode?: number,  \n};\n\nexport type GetComputePipelineOptions = {\n  cs: string;\n    parameters?: RenderPipelineParameters;\n\n  modules?: ShaderModule[];\n  defines?: Record<string, string>;\n  inject?: Record<string, string>;\n  transpileToGLSL100?: boolean;\n\n  varyings?: string[];\n  bufferMode?: number;\n};\n\nconst DEFAULT_RENDER_PIPELINE_OPTIONS: Required<GetRenderPipelineOptions> = {\n  vs: '',\n  fs: '',\n  modules: [],\n  defines: {},\n  inject: {},\n  transpileToGLSL100: false,\n  layout: null,\n\n  varyings: [],\n  bufferMode: 0x8c8d, // // varyings/bufferMode for xform feedback, 0x8c8d: SEPARATE_ATTRIBS\n  topology: 'triangle-list',\n  parameters: {} \n};\n\ntype GetUniformsFunc = (props?: Record<string, any>) => Record<string, any>;\n\n/** Efficiently create shared pipelines with varying parameters */\nexport class PipelineFactory {\n  readonly device: Device;\n\n  stateHash: number = 0; // Used to change hashing if hooks are modified\n  private _hashCounter: number = 0;\n  private readonly _hashes: Record<string, number> = {};\n  private readonly _useCounts: Record<string, number> = {};\n\n  private readonly _pipelineCache: Record<string, RenderPipeline> = {};\n\n  private readonly _getUniforms: Record<string, GetUniformsFunc> = {};\n  private readonly _hookFunctions: any[] = [];\n  private _defaultModules: any[] = [];\n  // private readonly _registeredModules = {}; // TODO: Remove? This isn't used anywhere in luma.gl\n\n  static getDefaultPipelineFactory(device: Device): PipelineFactory {\n    // @ts-expect-error Add to device\n    device.defaultPipelineFactory = device.defaultPipelineFactory || new PipelineFactory(device);\n    // @ts-expect-error Add to device\n    return device.defaultPipelineFactory;\n  }\n\n  constructor(device: Device) {\n    this.device = device;\n  }\n\n  addDefaultModule(module: ShaderModule): void {\n    if (!this._defaultModules.find((m) => m.name === (typeof module === 'string' ? module : module.name))) {\n      this._defaultModules.push(module);\n    }\n    this.stateHash++;\n  }\n\n  removeDefaultModule(module: ShaderModule): void {\n    const moduleName = typeof module === 'string' ? module : module.name;\n    this._defaultModules = this._defaultModules.filter((m) => m.name !== moduleName);\n    this.stateHash++;\n  }\n\n  addShaderHook(hook: string, opts?: any): void {\n    if (opts) {\n      hook = Object.assign(opts, {hook});\n    }\n    this._hookFunctions.push(hook);\n    this.stateHash++;\n  }\n\n  createRenderPipeline(options: GetRenderPipelineOptions): {\n    pipeline: RenderPipeline;\n    getUniforms: GetUniformsFunc;\n  } {\n    const props: Required<GetRenderPipelineOptions> = {...DEFAULT_RENDER_PIPELINE_OPTIONS, ...options};\n\n    const modules = this._getModuleList(props.modules); // Combine with default modules\n\n    const hash = this._hashRenderPipeline({...props, modules});\n\n    if (!this._pipelineCache[hash]) {\n      const {pipeline, getUniforms} = this._createRenderPipeline({...props, modules});\n      pipeline.hash = hash;\n      this._pipelineCache[hash] = pipeline;\n      this._getUniforms[hash] = getUniforms || ((x?: unknown) => ({}));\n      this._useCounts[hash] = 0;\n    }\n\n    this._useCounts[hash]++;\n\n    return {\n      pipeline: this._pipelineCache[hash],\n      getUniforms: this._getUniforms[hash]\n    };\n  }\n\n  release(pipeline: RenderPipeline): void {\n    const hash = pipeline.hash;\n    this._useCounts[hash]--;\n    if (this._useCounts[hash] === 0) {\n      this._pipelineCache[hash].destroy();\n      delete this._pipelineCache[hash];\n      delete this._getUniforms[hash];\n      delete this._useCounts[hash];\n    }\n  }\n\n  getUniforms(pipeline: RenderPipeline) {\n    return this._getUniforms[pipeline.hash] || null;\n  }\n\n  // PRIVATE\n\n  _createRenderPipeline(props: GetRenderPipelineOptions): {\n    pipeline: RenderPipeline,\n    getUniforms: GetUniformsFunc\n  } {\n    const platformInfo = {\n      gpu: this.device.info.gpu,\n      features: this.device.features\n    };\n\n    if (!props.fs) {\n      throw new Error('fs');\n    }\n\n    const assembled = assembleShaders(platformInfo, {...props, fs: props.fs, hookFunctions: this._hookFunctions});\n\n    const pipeline = this.device.createRenderPipeline({\n      ...props,\n      vs: this.device.createShader({stage: 'vertex', source: assembled.vs}),\n      fs: assembled.fs ? this.device.createShader({stage: 'fragment', source: assembled.fs}) : null,\n    });\n\n    return {pipeline, getUniforms: assembled.getUniforms};\n  }\n\n  /** Calculate a hash based on all the inputs for a render pipeline */\n  _hashRenderPipeline(props: GetRenderPipelineOptions): string {\n    const {modules = [], varyings = [], defines = {}, inject = {}, parameters = {}} = props;\n    const vsHash = this._getHash(props.vs);\n    const fsHash = props.fs ? this._getHash(props.fs) : 0;\n\n    const moduleHashes = modules.map((m) => this._getHash(typeof m === 'string' ? m : m.name)).sort();\n    const varyingHashes = varyings.map((v) => this._getHash(v));\n\n    const defineKeys = Object.keys(defines).sort();\n    const injectKeys = Object.keys(inject).sort();\n    const defineHashes: number[] = [];\n    const injectHashes: number[] = [];\n\n    for (const key of defineKeys) {\n      defineHashes.push(this._getHash(key));\n      defineHashes.push(this._getHash(String(defines[key])));\n    }\n\n    for (const key of injectKeys) {\n      injectHashes.push(this._getHash(key));\n      injectHashes.push(this._getHash(inject[key]));\n    }\n\n    // TODO - hash parameters!\n    const parameterHash = JSON.stringify(parameters);\n\n    return `${vsHash}/${fsHash}D${defineHashes.join('/')}M${moduleHashes.join(\n      '/'\n    )}I${injectHashes.join('/')}V${varyingHashes.join('/')}H${this.stateHash}B${props.bufferMode}${\n      props.transpileToGLSL100 ? 'T' : ''\n    }P${parameterHash}`;\n  }\n\n  _getHash(key: string): number {\n    if (this._hashes[key] === undefined) {\n      this._hashes[key] = this._hashCounter++;\n    }\n    return this._hashes[key];\n  }\n\n  // Dedupe and combine with default modules\n  _getModuleList(appModules: ShaderModule[] = []): ShaderModule[] {\n    const modules = new Array(this._defaultModules.length + appModules.length);\n    const seen: Record<string, boolean> = {};\n    let count = 0;\n\n    for (let i = 0, len = this._defaultModules.length; i < len; ++i) {\n      const module = this._defaultModules[i];\n      const name = module.name;\n      modules[count++] = module;\n      seen[name] = true;\n    }\n\n    for (let i = 0, len = appModules.length; i < len; ++i) {\n      const module = appModules[i];\n      const name = module.name;\n      if (!seen[name]) {\n        modules[count++] = module;\n        seen[name] = true;\n      }\n    }\n\n    modules.length = count;\n\n    return modules;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"pipeline-factory.js","names":["assembleShaders","DEFAULT_RENDER_PIPELINE_OPTIONS","vs","fs","modules","defines","inject","transpileToGLSL100","shaderLayout","varyings","bufferMode","topology","parameters","PipelineFactory","getDefaultPipelineFactory","device","defaultPipelineFactory","constructor","_defineProperty","addDefaultModule","module","_defaultModules","find","m","name","push","stateHash","removeDefaultModule","moduleName","filter","addShaderHook","hook","opts","Object","assign","_hookFunctions","createRenderPipeline","options","props","_getModuleList","hash","_hashRenderPipeline","_pipelineCache","pipeline","getUniforms","_createRenderPipeline","_getUniforms","x","_useCounts","release","destroy","platformInfo","gpu","info","features","Error","assembled","hookFunctions","createShader","stage","source","vsHash","_getHash","fsHash","moduleHashes","map","sort","varyingHashes","v","defineKeys","keys","injectKeys","defineHashes","injectHashes","key","String","parameterHash","JSON","stringify","concat","join","_hashes","undefined","_hashCounter","appModules","arguments","length","Array","seen","count","i","len"],"sources":["../../src/lib/pipeline-factory.ts"],"sourcesContent":["import type {RenderPipelineParameters, PrimitiveTopology, ShaderLayout} from '@luma.gl/core';\nimport {Device, RenderPipeline} from '@luma.gl/core';\nimport type { ShaderModule } from '@luma.gl/shadertools';\nimport {assembleShaders} from '@luma.gl/shadertools';\n\nexport type GetRenderPipelineOptions = {\n  vs: string;\n  fs: string | null;\n  topology: PrimitiveTopology;\n  shaderLayout?: ShaderLayout | null;\n  parameters?: RenderPipelineParameters;\n\n  modules?: ShaderModule[];\n  defines?: Record<string, string | number | boolean>;\n  inject?: Record<string, string>;\n  transpileToGLSL100?: boolean;\n\n  varyings?: string[];\n  bufferMode?: number,  \n};\n\nexport type GetComputePipelineOptions = {\n  cs: string;\n\n  parameters?: RenderPipelineParameters;\n\n  modules?: ShaderModule[];\n  defines?: Record<string, string>;\n  inject?: Record<string, string>;\n  transpileToGLSL100?: boolean;\n\n  varyings?: string[];\n  bufferMode?: number;\n};\n\nconst DEFAULT_RENDER_PIPELINE_OPTIONS: Required<GetRenderPipelineOptions> = {\n  vs: '',\n  fs: '',\n  modules: [],\n  defines: {},\n  inject: {},\n  transpileToGLSL100: false,\n  shaderLayout: null,\n\n  varyings: [],\n  bufferMode: 0x8c8d, // // varyings/bufferMode for xform feedback, 0x8c8d: SEPARATE_ATTRIBS\n  topology: 'triangle-list',\n  parameters: {} \n};\n\ntype GetUniformsFunc = (props?: Record<string, any>) => Record<string, any>;\n\n/** Efficiently create shared pipelines with varying parameters */\nexport class PipelineFactory {\n  readonly device: Device;\n\n  stateHash: number = 0; // Used to change hashing if hooks are modified\n  private _hashCounter: number = 0;\n  private readonly _hashes: Record<string, number> = {};\n  private readonly _useCounts: Record<string, number> = {};\n\n  private readonly _pipelineCache: Record<string, RenderPipeline> = {};\n\n  private readonly _getUniforms: Record<string, GetUniformsFunc> = {};\n  private readonly _hookFunctions: any[] = [];\n  private _defaultModules: any[] = [];\n  // private readonly _registeredModules = {}; // TODO: Remove? This isn't used anywhere in luma.gl\n\n  static getDefaultPipelineFactory(device: Device): PipelineFactory {\n    // @ts-expect-error Add to device\n    device.defaultPipelineFactory = device.defaultPipelineFactory || new PipelineFactory(device);\n    // @ts-expect-error Add to device\n    return device.defaultPipelineFactory;\n  }\n\n  constructor(device: Device) {\n    this.device = device;\n  }\n\n  addDefaultModule(module: ShaderModule): void {\n    if (!this._defaultModules.find((m) => m.name === (typeof module === 'string' ? module : module.name))) {\n      this._defaultModules.push(module);\n    }\n    this.stateHash++;\n  }\n\n  removeDefaultModule(module: ShaderModule): void {\n    const moduleName = typeof module === 'string' ? module : module.name;\n    this._defaultModules = this._defaultModules.filter((m) => m.name !== moduleName);\n    this.stateHash++;\n  }\n\n  addShaderHook(hook: string, opts?: any): void {\n    if (opts) {\n      hook = Object.assign(opts, {hook});\n    }\n    this._hookFunctions.push(hook);\n    this.stateHash++;\n  }\n\n  createRenderPipeline(options: GetRenderPipelineOptions): {\n    pipeline: RenderPipeline;\n    getUniforms: GetUniformsFunc;\n  } {\n    const props: Required<GetRenderPipelineOptions> = {...DEFAULT_RENDER_PIPELINE_OPTIONS, ...options};\n\n    const modules = this._getModuleList(props.modules); // Combine with default modules\n\n    const hash = this._hashRenderPipeline({...props, modules});\n\n    if (!this._pipelineCache[hash]) {\n      const {pipeline, getUniforms} = this._createRenderPipeline({...props, modules});\n      pipeline.hash = hash;\n      this._pipelineCache[hash] = pipeline;\n      this._getUniforms[hash] = getUniforms || ((x?: unknown) => ({}));\n      this._useCounts[hash] = 0;\n    }\n\n    this._useCounts[hash]++;\n\n    return {\n      pipeline: this._pipelineCache[hash],\n      getUniforms: this._getUniforms[hash]\n    };\n  }\n\n  release(pipeline: RenderPipeline): void {\n    const hash = pipeline.hash;\n    this._useCounts[hash]--;\n    if (this._useCounts[hash] === 0) {\n      this._pipelineCache[hash].destroy();\n      delete this._pipelineCache[hash];\n      delete this._getUniforms[hash];\n      delete this._useCounts[hash];\n    }\n  }\n\n  getUniforms(pipeline: RenderPipeline) {\n    return this._getUniforms[pipeline.hash] || null;\n  }\n\n  // PRIVATE\n\n  _createRenderPipeline(props: GetRenderPipelineOptions): {\n    pipeline: RenderPipeline,\n    getUniforms: GetUniformsFunc\n  } {\n    const platformInfo = {\n      gpu: this.device.info.gpu,\n      features: this.device.features\n    };\n\n    if (!props.fs) {\n      throw new Error('fs');\n    }\n\n    const assembled = assembleShaders(platformInfo, {...props, fs: props.fs, hookFunctions: this._hookFunctions});\n\n    const pipeline = this.device.createRenderPipeline({\n      ...props,\n      vs: this.device.createShader({stage: 'vertex', source: assembled.vs}),\n      fs: assembled.fs ? this.device.createShader({stage: 'fragment', source: assembled.fs}) : null,\n    });\n\n    return {pipeline, getUniforms: assembled.getUniforms};\n  }\n\n  /** Calculate a hash based on all the inputs for a render pipeline */\n  _hashRenderPipeline(props: GetRenderPipelineOptions): string {\n    const {modules = [], varyings = [], defines = {}, inject = {}, parameters = {}} = props;\n    const vsHash = this._getHash(props.vs);\n    const fsHash = props.fs ? this._getHash(props.fs) : 0;\n\n    const moduleHashes = modules.map((m) => this._getHash(typeof m === 'string' ? m : m.name)).sort();\n    const varyingHashes = varyings.map((v) => this._getHash(v));\n\n    const defineKeys = Object.keys(defines).sort();\n    const injectKeys = Object.keys(inject).sort();\n    const defineHashes: number[] = [];\n    const injectHashes: number[] = [];\n\n    for (const key of defineKeys) {\n      defineHashes.push(this._getHash(key));\n      defineHashes.push(this._getHash(String(defines[key])));\n    }\n\n    for (const key of injectKeys) {\n      injectHashes.push(this._getHash(key));\n      injectHashes.push(this._getHash(inject[key]));\n    }\n\n    // TODO - hash parameters!\n    const parameterHash = JSON.stringify(parameters);\n\n    return `${vsHash}/${fsHash}D${defineHashes.join('/')}M${moduleHashes.join(\n      '/'\n    )}I${injectHashes.join('/')}V${varyingHashes.join('/')}H${this.stateHash}B${props.bufferMode}${\n      props.transpileToGLSL100 ? 'T' : ''\n    }P${parameterHash}`;\n  }\n\n  _getHash(key: string): number {\n    if (this._hashes[key] === undefined) {\n      this._hashes[key] = this._hashCounter++;\n    }\n    return this._hashes[key];\n  }\n\n  // Dedupe and combine with default modules\n  _getModuleList(appModules: ShaderModule[] = []): ShaderModule[] {\n    const modules = new Array(this._defaultModules.length + appModules.length);\n    const seen: Record<string, boolean> = {};\n    let count = 0;\n\n    for (let i = 0, len = this._defaultModules.length; i < len; ++i) {\n      const module = this._defaultModules[i];\n      const name = module.name;\n      modules[count++] = module;\n      seen[name] = true;\n    }\n\n    for (let i = 0, len = appModules.length; i < len; ++i) {\n      const module = appModules[i];\n      const name = module.name;\n      if (!seen[name]) {\n        modules[count++] = module;\n        seen[name] = true;\n      }\n    }\n\n    modules.length = count;\n\n    return modules;\n  }\n}\n"],"mappings":"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"}

package/dist/model/model.d.ts

@@ -21,6 +21,8 @@ export type ModelProps = Omit<RenderPipelineProps, 'vs' | 'fs'> & {
     geometry?: Geometry | null;
     /** deprecated pipeline factory to use to create renderpipelines */
     pipelineFactory?: PipelineFactory;
+    vertexCount?: number;
+    instanceCount?: number;
 };
 /** v9 API */
 export declare class Model {
@@ -53,7 +55,7 @@ export declare class Model {
     draw(renderPass: RenderPass): void;
     setProps(props: ModelProps): void;
     updateModuleSettings(props: Record<string, any>): void;
-    setIndexBuffer(indices: Buffer): void;
+    setIndexBuffer(indices: Buffer | null): void;
     setAttributes(bufferAttributes: Record<string, Buffer>): void;
     setConstantAttributes(constantAttributes: Record<string, TypedArray>): void;
     /** Set the bindings */

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

@@ -4,7 +4,7 @@ import { RenderPipeline } from '@luma.gl/core';
 import { getAttributeBuffersFromGeometry, getIndexBufferFromGeometry } from "./model-utils.js";
 import { PipelineFactory } from "../lib/pipeline-factory.js";
 const DEFAULT_MODEL_PROPS = {
-  ...RenderPipeline._DEFAULT_PROPS,
+  ...RenderPipeline.defaultProps,
   vs: null,
   fs: null,
   id: 'unnamed',
@@ -14,7 +14,9 @@ const DEFAULT_MODEL_PROPS = {
   modules: [],
   moduleSettings: {},
   geometry: null,
-  pipelineFactory: undefined
+  pipelineFactory: undefined,
+  vertexCount: 0,
+  instanceCount: 0
 };
 export class Model {
   constructor(device, props) {
@@ -65,7 +67,7 @@ export class Model {
       topology: this.topology,
       defines: props.defines,
       parameters: props.parameters,
-      layout: props.layout
+      shaderLayout: props.shaderLayout
     });
     this.pipeline = pipeline;
     this._getModuleUniforms = getUniforms;

package/dist/model/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","names":["log","RenderPipeline","getAttributeBuffersFromGeometry","getIndexBufferFromGeometry","PipelineFactory","DEFAULT_MODEL_PROPS","_DEFAULT_PROPS","vs","fs","id","handle","undefined","userData","defines","modules","moduleSettings","geometry","pipelineFactory","Model","constructor","device","props","_defineProperty","Object","assign","Error","getShaderSource","vertexCount","instanceCount","topology","getDefaultPipelineFactory","pipeline","getUniforms","createRenderPipeline","parameters","layout","_getModuleUniforms","_setGeometry","setUniforms","setProps","destroy","release","draw","renderPass","indices","setIndexBuffer","attributes","setAttributes","bindings","setBindings","uniforms","updateModuleSettings","bufferAttributes","warn","concat","setConstantAttributes","constantAttributes","geometryBuffers","indexBuffer","shader","info","type","wgsl","glsl"],"sources":["../../src/model/model.ts"],"sourcesContent":["// luma.gl, MIT license\n\nimport {\n  Device,\n  Buffer,\n  RenderPipelineProps,\n  RenderPass,\n  Binding,\n  PrimitiveTopology,\n  log\n} from '@luma.gl/core';\nimport {RenderPipeline} from '@luma.gl/core';\nimport type {ShaderModule} from '@luma.gl/shadertools';\nimport type {Geometry} from '../geometry/geometry';\nimport {getAttributeBuffersFromGeometry, getIndexBufferFromGeometry} from './model-utils';\nimport {PipelineFactory} from '../lib/pipeline-factory';\nimport {TypedArray} from '@math.gl/core';\n\n/** @todo import type */\ntype UniformValue = unknown;\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  defines?: Record<string, string | number | boolean>;\n  modules?: ShaderModule[];\n  moduleSettings?: Record<string, Record<string, any>>;\n  geometry?: Geometry | null;\n  /** deprecated pipeline factory to use to create renderpipelines */\n  pipelineFactory?: PipelineFactory;\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  defines: {},\n  modules: [],\n  moduleSettings: {},\n  geometry: null,\n  pipelineFactory: undefined\n};\n\n/** v9 API */\nexport class Model {\n  readonly device: Device;\n  readonly id: string;\n  readonly vs: string;\n  readonly fs: string | null = null;\n  readonly topology: PrimitiveTopology;\n  readonly pipelineFactory: PipelineFactory;\n  /** The underlying GPU \"program\". @note May be recreated if parameters change */\n  pipeline: RenderPipeline;\n  userData: {[key: string]: any} = {};\n\n  // readonly props: Required<ModelProps>;\n\n  /** Vertex count */\n  vertexCount: number;\n  /** instance count */\n  instanceCount: number = 0;\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  /** Uniforms */\n  uniforms: Record<string, UniformValue> = {};\n\n  private _getModuleUniforms: (props?: Record<string, Record<string, any>>) => Record<string, any>;\n\n  constructor(device: Device, props: ModelProps) {\n    props = {...DEFAULT_MODEL_PROPS, ...props};\n    this.id = props.id;\n    this.device = device;\n\n    Object.assign(this.userData, props.userData);\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 = props.vertexCount;\n    this.instanceCount = props.instanceCount;\n    this.topology = props.topology;\n\n    if (props.geometry) {\n      this.vertexCount = props.geometry.vertexCount;\n      this.topology = props.geometry.topology || 'triangle-list';\n    }\n\n    this.pipelineFactory =\n      props.pipelineFactory || PipelineFactory.getDefaultPipelineFactory(this.device);\n    const {pipeline, getUniforms} = this.pipelineFactory.createRenderPipeline({\n      ...props,\n      vs: this.vs,\n      fs: this.fs,\n      topology: this.topology,\n      defines: props.defines,\n      parameters: props.parameters,\n      layout: props.layout\n    });\n\n    this.pipeline = pipeline;\n    this._getModuleUniforms = getUniforms;\n\n    if (props.geometry) {\n      this._setGeometry(props.geometry);\n    }\n\n    this.setUniforms(this._getModuleUniforms()); // Get all default module uniforms\n\n    // Props can update any of the above, so call setProps last.\n    this.setProps(props);\n  }\n\n  destroy(): void {\n    this.pipelineFactory.release(this.pipeline);\n  }\n\n  draw(renderPass: RenderPass): void {\n    this.pipeline.draw({\n      renderPass,\n      vertexCount: this.vertexCount,\n      instanceCount: this.instanceCount\n    });\n  }\n\n  setProps(props: ModelProps): void {\n    if (props.indices) {\n      this.setIndexBuffer(props.indices);\n    }\n    if (props.attributes) {\n      this.setAttributes(props.attributes);\n    }\n    if (props.bindings) {\n      this.setBindings(props.bindings);\n    }\n    if (props.uniforms) {\n      this.setUniforms(props.uniforms);\n    }\n    if (props.moduleSettings) {\n      this.updateModuleSettings(props.moduleSettings);\n    }\n  }\n\n  updateModuleSettings(props: Record<string, any>): void {\n    const uniforms = this._getModuleUniforms(props);\n    this.setUniforms(uniforms);\n  }\n\n  setIndexBuffer(indices: Buffer): void {\n    this.pipeline.setIndexBuffer(indices);\n    // this._indices = indices;\n  }\n\n  setAttributes(bufferAttributes: Record<string, Buffer>): void {\n    if (bufferAttributes.indices) {\n      log.warn(`Model:${this.id} setAttributes() - indices should be set using setIndexBuffer()`);\n    }\n\n    this.pipeline.setAttributes(bufferAttributes);\n    Object.assign(this.bufferAttributes, bufferAttributes);\n  }\n\n  setConstantAttributes(constantAttributes: Record<string, TypedArray>): void {\n    // TODO - this doesn't work under WebGPU, we'll need to create buffers or inject uniforms\n    this.pipeline.setConstantAttributes(constantAttributes);\n    Object.assign(this.constantAttributes, constantAttributes);\n  }\n\n  /** Set the bindings */\n  setBindings(bindings: Record<string, Binding>): void {\n    this.pipeline.setBindings(bindings);\n    Object.assign(this.bindings, bindings);\n  }\n\n  setUniforms(uniforms: Record<string, any>): void {\n    this.pipeline.setUniforms(uniforms);\n    Object.assign(this.uniforms, uniforms);\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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"}
+{"version":3,"file":"model.js","names":["log","RenderPipeline","getAttributeBuffersFromGeometry","getIndexBufferFromGeometry","PipelineFactory","DEFAULT_MODEL_PROPS","defaultProps","vs","fs","id","handle","undefined","userData","defines","modules","moduleSettings","geometry","pipelineFactory","vertexCount","instanceCount","Model","constructor","device","props","_defineProperty","Object","assign","Error","getShaderSource","topology","getDefaultPipelineFactory","pipeline","getUniforms","createRenderPipeline","parameters","shaderLayout","_getModuleUniforms","_setGeometry","setUniforms","setProps","destroy","release","draw","renderPass","indices","setIndexBuffer","attributes","setAttributes","bindings","setBindings","uniforms","updateModuleSettings","bufferAttributes","warn","concat","setConstantAttributes","constantAttributes","geometryBuffers","indexBuffer","shader","info","type","wgsl","glsl"],"sources":["../../src/model/model.ts"],"sourcesContent":["// luma.gl, MIT license\n\nimport {\n  Device,\n  Buffer,\n  RenderPipelineProps,\n  RenderPass,\n  Binding,\n  PrimitiveTopology,\n  log\n} from '@luma.gl/core';\nimport {RenderPipeline} from '@luma.gl/core';\nimport type {ShaderModule} from '@luma.gl/shadertools';\nimport type {Geometry} from '../geometry/geometry';\nimport {getAttributeBuffersFromGeometry, getIndexBufferFromGeometry} from './model-utils';\nimport {PipelineFactory} from '../lib/pipeline-factory';\nimport {TypedArray} from '@math.gl/core';\n\n/** @todo import type */\ntype UniformValue = unknown;\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  defines?: Record<string, string | number | boolean>;\n  modules?: ShaderModule[];\n  moduleSettings?: Record<string, Record<string, any>>;\n  geometry?: Geometry | null;\n  /** deprecated pipeline factory to use to create renderpipelines */\n  pipelineFactory?: PipelineFactory;\n  vertexCount?: number;\n  instanceCount?: number;\n};\n\nconst DEFAULT_MODEL_PROPS: 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  pipelineFactory: undefined,\n  vertexCount: 0,\n  instanceCount: 0\n};\n\n/** v9 API */\nexport class Model {\n  readonly device: Device;\n  readonly id: string;\n  readonly vs: string;\n  readonly fs: string | null = null;\n  readonly topology: PrimitiveTopology;\n  readonly pipelineFactory: PipelineFactory;\n  /** The underlying GPU \"program\". @note May be recreated if parameters change */\n  pipeline: RenderPipeline;\n  userData: {[key: string]: any} = {};\n\n  // readonly props: Required<ModelProps>;\n\n  /** Vertex count */\n  vertexCount: number;\n  /** instance count */\n  instanceCount: number = 0;\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  /** Uniforms */\n  uniforms: Record<string, UniformValue> = {};\n\n  private _getModuleUniforms: (props?: Record<string, Record<string, any>>) => Record<string, any>;\n\n  constructor(device: Device, props: ModelProps) {\n    props = {...DEFAULT_MODEL_PROPS, ...props};\n    this.id = props.id;\n    this.device = device;\n\n    Object.assign(this.userData, props.userData);\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 = props.vertexCount;\n    this.instanceCount = props.instanceCount;\n    this.topology = props.topology;\n\n    if (props.geometry) {\n      this.vertexCount = props.geometry.vertexCount;\n      this.topology = props.geometry.topology || 'triangle-list';\n    }\n\n    this.pipelineFactory =\n      props.pipelineFactory || PipelineFactory.getDefaultPipelineFactory(this.device);\n    const {pipeline, getUniforms} = this.pipelineFactory.createRenderPipeline({\n      ...props,\n      vs: this.vs,\n      fs: this.fs,\n      topology: this.topology,\n      defines: props.defines,\n      parameters: props.parameters,\n      shaderLayout: props.shaderLayout\n    });\n\n    this.pipeline = pipeline;\n    this._getModuleUniforms = getUniforms;\n\n    if (props.geometry) {\n      this._setGeometry(props.geometry);\n    }\n\n    this.setUniforms(this._getModuleUniforms()); // Get all default module uniforms\n\n    // Props can update any of the above, so call setProps last.\n    this.setProps(props);\n  }\n\n  destroy(): void {\n    this.pipelineFactory.release(this.pipeline);\n  }\n\n  draw(renderPass: RenderPass): void {\n    this.pipeline.draw({\n      renderPass,\n      vertexCount: this.vertexCount,\n      instanceCount: this.instanceCount\n    });\n  }\n\n  setProps(props: ModelProps): void {\n    if (props.indices) {\n      this.setIndexBuffer(props.indices);\n    }\n    if (props.attributes) {\n      this.setAttributes(props.attributes);\n    }\n    if (props.bindings) {\n      this.setBindings(props.bindings);\n    }\n    if (props.uniforms) {\n      this.setUniforms(props.uniforms);\n    }\n    if (props.moduleSettings) {\n      this.updateModuleSettings(props.moduleSettings);\n    }\n  }\n\n  updateModuleSettings(props: Record<string, any>): void {\n    const uniforms = this._getModuleUniforms(props);\n    this.setUniforms(uniforms);\n  }\n\n  setIndexBuffer(indices: Buffer | null): void {\n    this.pipeline.setIndexBuffer(indices);\n    // this._indices = indices;\n  }\n\n  setAttributes(bufferAttributes: Record<string, Buffer>): void {\n    if (bufferAttributes.indices) {\n      log.warn(`Model:${this.id} setAttributes() - indices should be set using setIndexBuffer()`);\n    }\n\n    this.pipeline.setAttributes(bufferAttributes);\n    Object.assign(this.bufferAttributes, bufferAttributes);\n  }\n\n  setConstantAttributes(constantAttributes: Record<string, TypedArray>): void {\n    // TODO - this doesn't work under WebGPU, we'll need to create buffers or inject uniforms\n    this.pipeline.setConstantAttributes(constantAttributes);\n    Object.assign(this.constantAttributes, constantAttributes);\n  }\n\n  /** Set the bindings */\n  setBindings(bindings: Record<string, Binding>): void {\n    this.pipeline.setBindings(bindings);\n    Object.assign(this.bindings, bindings);\n  }\n\n  setUniforms(uniforms: Record<string, any>): void {\n    this.pipeline.setUniforms(uniforms);\n    Object.assign(this.uniforms, uniforms);\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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"}