@luma.gl/engine 9.0.0-alpha.15 → 9.0.0-alpha.16

package/dist/lib/model.js

@@ -1,182 +1,138 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+// luma.gl, MIT license
 import { RenderPipeline } from '@luma.gl/api';
-import { getAttributeBuffersFromGeometry, getIndexBufferFromGeometry } from './model-utils';
-import { PipelineFactory } from './pipeline-factory';
-const DEFAULT_MODEL_PROPS = { ...RenderPipeline._DEFAULT_PROPS,
-  vs: null,
-  fs: null,
-  id: 'unnamed',
-  handle: undefined,
-  userData: {},
-  modules: [],
-  moduleSettings: {},
-  geometry: null
+import { getAttributeBuffersFromGeometry, getIndexBufferFromGeometry } from './model-utils.js';
+import { PipelineFactory } from './pipeline-factory.js';
+const DEFAULT_MODEL_PROPS = {
+    ...RenderPipeline._DEFAULT_PROPS,
+    vs: null,
+    fs: null,
+    id: 'unnamed',
+    handle: undefined,
+    userData: {},
+    modules: [],
+    moduleSettings: {},
+    geometry: null
 };
+/** v9 API */
 export class Model {
-  constructor(device, props) {
-    _defineProperty(this, "device", void 0);
-
-    _defineProperty(this, "pipeline", void 0);
-
-    _defineProperty(this, "id", void 0);
-
-    _defineProperty(this, "vs", void 0);
-
-    _defineProperty(this, "fs", null);
-
-    _defineProperty(this, "topology", void 0);
-
-    _defineProperty(this, "vertexCount", void 0);
-
-    _defineProperty(this, "props", void 0);
-
-    _defineProperty(this, "_getModuleUniforms", void 0);
-
-    this.props = { ...DEFAULT_MODEL_PROPS,
-      ...props
-    };
-    props = this.props;
-    this.id = this.props.id;
-    this.device = device;
-
-    if (!props.vs) {
-      throw new Error('no vertex shader');
+    constructor(device, props) {
+        this.fs = null;
+        this.props = { ...DEFAULT_MODEL_PROPS, ...props };
+        props = this.props;
+        this.id = this.props.id;
+        this.device = device;
+        // Create the pipeline
+        if (!props.vs) {
+            throw new Error('no vertex shader');
+        }
+        this.vs = getShaderSource(this.device, props.vs);
+        if (props.fs) {
+            this.fs = getShaderSource(this.device, props.fs);
+        }
+        this.vertexCount = this.props.vertexCount;
+        this.topology = this.props.topology;
+        if (this.props.geometry) {
+            this.vertexCount = this.props.geometry.vertexCount;
+            this.topology = this.props.geometry.topology || 'triangle-list';
+        }
+        const pipelineFactory = PipelineFactory.getDefaultPipelineFactory(this.device);
+        const { pipeline, getUniforms } = pipelineFactory.createRenderPipeline({
+            ...this.props,
+            vs: this.vs,
+            fs: this.fs,
+            topology: this.topology,
+            parameters: props.parameters,
+            layout: props.layout
+        });
+        this.pipeline = pipeline;
+        this._getModuleUniforms = getUniforms;
+        if (this.props.geometry) {
+            this._setGeometry(this.props.geometry);
+        }
+        this.setUniforms(this._getModuleUniforms()); // Get all default module uniforms
+        this.setProps(this.props);
     }
-
-    this.vs = getShaderSource(this.device, props.vs);
-
-    if (props.fs) {
-      this.fs = getShaderSource(this.device, props.fs);
+    destroy() {
+        this.pipeline.destroy();
     }
-
-    this.vertexCount = this.props.vertexCount;
-    this.topology = this.props.topology;
-
-    if (this.props.geometry) {
-      this.vertexCount = this.props.geometry.vertexCount;
-      this.topology = this.props.geometry.topology || 'triangle-list';
+    draw(renderPass) {
+        this.pipeline.draw({
+            renderPass,
+            vertexCount: this.vertexCount,
+            instanceCount: this.props.instanceCount
+        });
+        return this;
     }
-
-    const pipelineFactory = PipelineFactory.getDefaultPipelineFactory(this.device);
-    const {
-      pipeline,
-      getUniforms
-    } = pipelineFactory.createRenderPipeline({ ...this.props,
-      vs: this.vs,
-      fs: this.fs,
-      topology: this.topology,
-      parameters: props.parameters,
-      layout: props.layout
-    });
-    this.pipeline = pipeline;
-    this._getModuleUniforms = getUniforms;
-
-    if (this.props.geometry) {
-      this._setGeometry(this.props.geometry);
+    setProps(props) {
+        if (props.indices) {
+            this.setIndexBuffer(props.indices);
+        }
+        if (props.attributes) {
+            this.setAttributes(props.attributes);
+        }
+        if (props.bindings) {
+            this.setBindings(props.bindings);
+        }
+        if (props.uniforms) {
+            this.setUniforms(props.uniforms);
+        }
+        if (props.moduleSettings) {
+            this.updateModuleSettings(props.moduleSettings);
+        }
+        return this;
     }
-
-    this.setUniforms(this._getModuleUniforms());
-    this.setProps(this.props);
-  }
-
-  destroy() {
-    this.pipeline.destroy();
-  }
-
-  draw(renderPass) {
-    this.pipeline.draw({
-      renderPass,
-      vertexCount: this.vertexCount,
-      instanceCount: this.props.instanceCount
-    });
-    return this;
-  }
-
-  setProps(props) {
-    if (props.indices) {
-      this.setIndexBuffer(props.indices);
+    updateModuleSettings(props) {
+        const uniforms = this._getModuleUniforms(props);
+        this.setUniforms(uniforms);
+        return this;
     }
-
-    if (props.attributes) {
-      this.setAttributes(props.attributes);
+    setIndexBuffer(indices) {
+        this.pipeline.setIndexBuffer(indices);
+        // this._indices = indices;
+        return this;
     }
-
-    if (props.bindings) {
-      this.setBindings(props.bindings);
+    setAttributes(attributes) {
+        this.pipeline.setAttributes(attributes);
+        Object.assign(this.props.attributes, attributes);
+        return this;
     }
-
-    if (props.uniforms) {
-      this.setUniforms(props.uniforms);
+    /** Set the bindings */
+    setBindings(bindings) {
+        this.pipeline.setBindings(bindings);
+        Object.assign(this.props.bindings, bindings);
+        return this;
     }
-
-    if (props.moduleSettings) {
-      this.updateModuleSettings(props.moduleSettings);
+    setUniforms(uniforms) {
+        this.pipeline.setUniforms(uniforms);
+        Object.assign(this.props.uniforms, uniforms);
+        return this;
     }
-
-    return this;
-  }
-
-  updateModuleSettings(props) {
-    const uniforms = this._getModuleUniforms(props);
-
-    this.setUniforms(uniforms);
-    return this;
-  }
-
-  setIndexBuffer(indices) {
-    this.pipeline.setIndexBuffer(indices);
-    return this;
-  }
-
-  setAttributes(attributes) {
-    this.pipeline.setAttributes(attributes);
-    Object.assign(this.props.attributes, attributes);
-    return this;
-  }
-
-  setBindings(bindings) {
-    this.pipeline.setBindings(bindings);
-    Object.assign(this.props.bindings, bindings);
-    return this;
-  }
-
-  setUniforms(uniforms) {
-    this.pipeline.setUniforms(uniforms);
-    Object.assign(this.props.uniforms, uniforms);
-    return this;
-  }
-
-  _setGeometry(geometry) {
-    const geometryBuffers = getAttributeBuffersFromGeometry(this.device, geometry);
-    this.setAttributes(geometryBuffers);
-    const indexBuffer = getIndexBufferFromGeometry(this.device, geometry);
-
-    if (indexBuffer) {
-      this.setIndexBuffer(indexBuffer);
+    _setGeometry(geometry) {
+        // this._deleteGeometryBuffers();
+        const geometryBuffers = getAttributeBuffersFromGeometry(this.device, geometry);
+        this.setAttributes(geometryBuffers);
+        const indexBuffer = getIndexBufferFromGeometry(this.device, geometry);
+        if (indexBuffer) {
+            this.setIndexBuffer(indexBuffer);
+        }
     }
-  }
-
 }
-
+/** Create a shader from the different overloads */
 function getShaderSource(device, shader) {
-  if (typeof shader === 'string') {
-    return shader;
-  }
-
-  switch (device.info.type) {
-    case 'webgpu':
-      if (shader !== null && shader !== void 0 && shader.wgsl) {
-        return shader.wgsl;
-      }
-
-      throw new Error('WebGPU does not support GLSL shaders');
-
-    default:
-      if (shader !== null && shader !== void 0 && shader.glsl) {
-        return shader.glsl;
-      }
-
-      throw new Error('WebGL does not support WGSL shaders');
-  }
+    // TODO - detect WGSL/GLSL and throw an error if not supported
+    if (typeof shader === 'string') {
+        return shader;
+    }
+    switch (device.info.type) {
+        case 'webgpu':
+            if (shader?.wgsl) {
+                return shader.wgsl;
+            }
+            throw new Error('WebGPU does not support GLSL shaders');
+        default:
+            if (shader?.glsl) {
+                return shader.glsl;
+            }
+            throw new Error('WebGL does not support WGSL shaders');
+    }
 }
-//# sourceMappingURL=model.js.map

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

@@ -1,7 +1,7 @@
 import type { RenderPipelineParameters, PrimitiveTopology, ShaderLayout } from '@luma.gl/api';
 import { Device, RenderPipeline } from '@luma.gl/api/';
 import type { ShaderModule } from '@luma.gl/shadertools';
-export declare type GetRenderPipelineOptions = {
+export type GetRenderPipelineOptions = {
     vs: string;
     fs: string | null;
     topology: PrimitiveTopology;
@@ -14,7 +14,7 @@ export declare type GetRenderPipelineOptions = {
     varyings?: string[];
     bufferMode?: number;
 };
-export declare type GetComputePipelineOptions = {
+export type GetComputePipelineOptions = {
     cs: string;
     parameters?: RenderPipelineParameters;
     modules?: ShaderModule[];
@@ -24,7 +24,7 @@ export declare type GetComputePipelineOptions = {
     varyings?: string[];
     bufferMode?: number;
 };
-declare type GetUniformsFunc = (props?: Record<string, any>) => Record<string, any>;
+type GetUniformsFunc = (props?: Record<string, any>) => Record<string, any>;
 /** Efficiently create shared pipelines with varying parameters */
 export declare class PipelineFactory {
     readonly device: Device;

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":"AAAA,OAAO,KAAK,EAAC,wBAAwB,EAAE,iBAAiB,EAAE,YAAY,EAAC,MAAM,cAAc,CAAC;AAC5F,OAAO,EAAC,MAAM,EAAE,cAAc,EAAC,MAAM,eAAe,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGzD,oBAAY,wBAAwB,GAAG;IACrC,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAClB,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,MAAM,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;IAC7B,UAAU,CAAC,EAAE,wBAAwB,CAAC;IAEtC,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;IACpD,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,oBAAY,yBAAyB,GAAG;IACtC,EAAE,EAAE,MAAM,CAAC;IACT,UAAU,CAAC,EAAE,wBAAwB,CAAC;IAExC,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAiBF,aAAK,eAAe,GAAG,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAE5E,kEAAkE;AAClE,qBAAa,eAAe;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,SAAS,EAAE,MAAM,CAAK;IACtB,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8B;IACtD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA8B;IAEzD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAsC;IAErE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAuC;IACpE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAa;IAC5C,OAAO,CAAC,eAAe,CAAa;IAGpC,MAAM,CAAC,yBAAyB,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe;gBAOrD,MAAM,EAAE,MAAM;IAI1B,gBAAgB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAO5C,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAM/C,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI;IAQ7C,oBAAoB,CAAC,OAAO,EAAE,wBAAwB,GAAG;QACvD,QAAQ,EAAE,cAAc,CAAC;QACzB,WAAW,EAAE,eAAe,CAAC;KAC9B;IAuBD,OAAO,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAWvC,WAAW,CAAC,QAAQ,EAAE,cAAc;IAMpC,qBAAqB,CAAC,KAAK,EAAE,wBAAwB,GAAG;QACtD,QAAQ,EAAE,cAAc,CAAC;QACzB,WAAW,EAAE,eAAe,CAAA;KAC7B;IAqBD,qEAAqE;IACrE,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,GAAG,MAAM;IAiC5D,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAQ7B,cAAc,CAAC,UAAU,GAAE,YAAY,EAAO,GAAG,YAAY,EAAE;CAyBhE"}
+{"version":3,"file":"pipeline-factory.d.ts","sourceRoot":"","sources":["../../src/lib/pipeline-factory.ts"],"names":[],"mappings":"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"}