@luma.gl/engine 9.0.0-alpha.32 → 9.0.0-alpha.34

package/dist/index.cjs

@@ -667,20 +667,8 @@ var GPUGeometry = class {
     this.topology = props.topology;
     this.indices = props.indices || null;
     this.attributes = props.attributes;
-    this.vertexCount = props.vertexCount || this._calculateVertexCount(this.attributes.positions);
+    this.vertexCount = props.vertexCount;
     this.bufferLayout = props.bufferLayout || [];
-    if (!this.bufferLayout.find((layout) => layout.name === "positions")) {
-      this.bufferLayout.push({ name: "positions", format: "float32x3" });
-    }
-    if (!this.bufferLayout.find((layout) => layout.name === "normals")) {
-      this.bufferLayout.push({ name: "normals", format: "float32x3" });
-    }
-    if (!this.bufferLayout.find((layout) => layout.name === "texCoords")) {
-      this.bufferLayout.push({ name: "texCoords", format: "float32x2" });
-    }
-    if (!this.bufferLayout.find((layout) => layout.name === "colors")) {
-      this.bufferLayout.push({ name: "colors", format: "float32x3" });
-    }
     if (this.indices) {
       (0, import_core4.assert)(this.indices.usage === import_core4.Buffer.INDEX);
     }
@@ -712,9 +700,10 @@ function makeGPUGeometry(device, geometry) {
     return geometry;
   }
   const indices = getIndexBufferFromGeometry(device, geometry);
-  const attributes = getAttributeBuffersFromGeometry(device, geometry);
+  const { attributes, bufferLayout } = getAttributeBuffersFromGeometry(device, geometry);
   return new GPUGeometry({
-    topology: geometry.topology,
+    topology: geometry.topology || "triangle-list",
+    bufferLayout,
     vertexCount: geometry.vertexCount,
     indices,
     attributes
@@ -724,23 +713,30 @@ function getIndexBufferFromGeometry(device, geometry) {
   if (!geometry.indices) {
     return void 0;
   }
-  const data = geometry.indices.value || geometry.indices;
-  (0, import_core4.assert)(
-    data instanceof Uint16Array || data instanceof Uint32Array,
-    'attribute array for "indices" must be of integer type'
-  );
+  const data = geometry.indices.value;
   return device.createBuffer({ usage: import_core4.Buffer.INDEX, data });
 }
 function getAttributeBuffersFromGeometry(device, geometry) {
-  const positions = geometry.attributes.positions || geometry.attributes.POSITION;
-  const normals = geometry.attributes.normals || geometry.attributes.NORMAL;
-  const texCoords = geometry.attributes.texCoords || geometry.attributes.TEXCOORD_0;
-  const buffers = {
-    positions: device.createBuffer({ data: positions.value, id: "positions-buffer" }),
-    normals: device.createBuffer({ data: normals.value, id: "normals-buffer" }),
-    texCoords: device.createBuffer({ data: texCoords.value, id: "texCoords-buffer" })
-  };
-  return buffers;
+  const bufferLayout = [];
+  const attributes = {};
+  for (const [attributeName, attribute] of Object.entries(geometry.attributes)) {
+    let name = attributeName;
+    switch (attributeName) {
+      case "POSITION":
+        name = "positions";
+        break;
+      case "NORMAL":
+        name = "normals";
+        break;
+      case "TEXCOORD_0":
+        name = "texCoords";
+        break;
+    }
+    attributes[name] = device.createBuffer({ data: attribute.value, id: `${attributeName}-buffer` });
+    bufferLayout.push({ name, format: `float32x${attribute.size}` });
+  }
+  const vertexCount = geometry._calculateVertexCount(geometry.attributes, geometry.indices);
+  return { attributes, bufferLayout, vertexCount };
 }
 
 // src/lib/pipeline-factory.ts
@@ -796,10 +792,15 @@ var _PipelineFactory = class {
   _hashRenderPipeline(props) {
     const vsHash = this._getHash(props.vs);
     const fsHash = props.fs ? this._getHash(props.fs) : 0;
-    const parameterHash = this._getHash(JSON.stringify(props.parameters));
-    const bufferLayoutHash = this._getHash(JSON.stringify(props.bufferLayout));
     const varyingHash = "-";
-    return `${vsHash}/${fsHash}V${varyingHash}T${props.topology}P${parameterHash}BL${bufferLayoutHash}}`;
+    switch (this.device.info.type) {
+      case "webgpu":
+        const parameterHash = this._getHash(JSON.stringify(props.parameters));
+        const bufferLayoutHash = this._getHash(JSON.stringify(props.bufferLayout));
+        return `${vsHash}/${fsHash}V${varyingHash}T${props.topology}P${parameterHash}BL${bufferLayoutHash}}`;
+      default:
+        return `${vsHash}/${fsHash}V${varyingHash}`;
+    }
   }
   _getHash(key) {
     if (this._hashes[key] === void 0) {
@@ -814,41 +815,6 @@ PipelineFactory.defaultProps = __spreadProps(__spreadValues({}, import_core5.Ren
   fs: void 0
 });
 
-// src/model/model-shaders.ts
-function buildShaders(device, props) {
-  if (!props.vs) {
-    throw new Error("no vertex shader");
-  }
-  const vs = getShaderSource(device, props.vs);
-  let fs;
-  if (props.fs) {
-    fs = getShaderSource(device, props.fs);
-  }
-  const platformInfo = {
-    type: device.info.type,
-    gpu: device.info.gpu,
-    features: device.features
-  };
-  return props.shaderAssembler.assembleShaders(platformInfo, __spreadProps(__spreadValues({}, props), { fs, vs }));
-}
-function getShaderSource(device, shader) {
-  if (typeof shader === "string") {
-    return shader;
-  }
-  switch (device.info.type) {
-    case "webgpu":
-      if (shader == null ? void 0 : shader.wgsl) {
-        return shader.wgsl;
-      }
-      throw new Error("WebGPU does not support GLSL shaders");
-    default:
-      if (shader == null ? void 0 : shader.glsl) {
-        return shader.glsl;
-      }
-      throw new Error("WebGL does not support WGSL shaders");
-  }
-}
-
 // src/model/model.ts
 var _Model = class {
   constructor(device, props) {
@@ -871,7 +837,13 @@ var _Model = class {
     this.id = props.id || (0, import_core6.uid)("model");
     this.device = device;
     Object.assign(this.userData, props.userData);
-    const { vs, fs, getUniforms } = buildShaders(device, this.props);
+    const platformInfo = {
+      type: device.info.type,
+      shaderLanguage: device.info.shadingLanguages[0],
+      gpu: device.info.gpu,
+      features: device.features
+    };
+    const { vs, fs, getUniforms } = this.props.shaderAssembler.assembleShaders(platformInfo, this.props);
     this.vs = vs;
     this.fs = fs;
     this._getModuleUniforms = getUniforms;
@@ -880,9 +852,8 @@ var _Model = class {
     this.topology = this.props.topology;
     this.bufferLayout = this.props.bufferLayout;
     this.parameters = this.props.parameters;
-    const gpuGeometry = props.geometry && makeGPUGeometry(device, props.geometry);
-    if (gpuGeometry) {
-      this.setGeometry(gpuGeometry);
+    if (props.geometry) {
+      this.setGeometry(props.geometry);
     }
     this.pipelineFactory = props.pipelineFactory || PipelineFactory.getDefaultPipelineFactory(this.device);
     this.pipeline = this._updatePipeline();
@@ -930,14 +901,16 @@ var _Model = class {
   // Update fixed fields (can trigger pipeline rebuild)
   /** 
    * Updates the optional geometry
+  * Geometry, sets several attributes, indices, and also vertex count and topology
    * @note Can trigger a pipeline rebuild / pipeline cache fetch on WebGPU
    */
   setGeometry(geometry) {
-    this.setTopology(geometry.topology || "triangle-list");
-    this.bufferLayout = mergeBufferLayouts(this.bufferLayout, geometry.bufferLayout);
-    this.vertexCount = geometry.vertexCount;
-    this.setAttributes(geometry.attributes);
-    this.setIndexBuffer(geometry.indices);
+    const gpuGeometry = geometry && makeGPUGeometry(this.device, geometry);
+    this.setTopology(gpuGeometry.topology || "triangle-list");
+    this.bufferLayout = mergeBufferLayouts(this.bufferLayout, gpuGeometry.bufferLayout);
+    this.vertexCount = gpuGeometry.vertexCount;
+    this.setAttributes(gpuGeometry.attributes);
+    this.setIndexBuffer(gpuGeometry.indices);
   }
   /** 
    * Updates the primitive topology ('triangle-list', 'triangle-strip' etc). 
@@ -946,9 +919,7 @@ var _Model = class {
   setTopology(topology) {
     if (topology !== this.topology) {
       this.topology = topology;
-      if (this.device.info.type === "webgpu") {
-        this._setPipelineNeedsUpdate("topology");
-      }
+      this._setPipelineNeedsUpdate("topology");
     }
   }
   /** 
@@ -958,9 +929,7 @@ var _Model = class {
   setBufferLayout(bufferLayout) {
     if (bufferLayout !== this.bufferLayout) {
       this.bufferLayout = bufferLayout;
-      if (this.device.info.type === "webgpu") {
-        this._setPipelineNeedsUpdate("bufferLayout");
-      }
+      this._setPipelineNeedsUpdate("bufferLayout");
     }
   }
   /**
@@ -971,9 +940,7 @@ var _Model = class {
   setParameters(parameters) {
     if (!(0, import_core6.deepEqual)(parameters, this.parameters, 2)) {
       this.parameters = parameters;
-      if (this.device.info.type === "webgpu") {
-        this._setPipelineNeedsUpdate("parameters");
-      }
+      this._setPipelineNeedsUpdate("parameters");
     }
   }
   // Update dynamic fields
@@ -1208,7 +1175,10 @@ var Geometry = class {
   getVertexCount() {
     return this.vertexCount;
   }
-  // Return an object with all attributes plus indices added as a field.
+  /** 
+   * Return an object with all attributes plus indices added as a field.
+   * TODO Geometry types are a mess
+   */
   getAttributes() {
     return this.indices ? __spreadValues({ indices: this.indices }, this.attributes) : this.attributes;
   }
@@ -1216,11 +1186,17 @@ var Geometry = class {
   _print(attributeName) {
     return `Geometry ${this.id} attribute ${attributeName}`;
   }
-  // GeometryAttribute
-  // value: typed array
-  // type: indices, vertices, uvs
-  // size: elements per vertex
-  // target: WebGL buffer type (string or constant)
+  /**
+   * GeometryAttribute
+   * value: typed array
+   * type: indices, vertices, uvs
+   * size: elements per vertex
+   * target: WebGL buffer type (string or constant)
+   * 
+   * @param attributes 
+   * @param indices 
+   * @returns 
+   */
   _setAttributes(attributes, indices) {
     return this;
   }
@@ -1229,8 +1205,7 @@ var Geometry = class {
       return indices.value.length;
     }
     let vertexCount = Infinity;
-    for (const attributeName in attributes) {
-      const attribute = attributes[attributeName];
+    for (const attribute of Object.values(attributes)) {
       const { value, size, constant } = attribute;
       if (!constant && value && size >= 1) {
         vertexCount = Math.min(vertexCount, value.length / size);

package/dist/lib/clip-space.js

@@ -1,10 +1,23 @@
-import _taggedTemplateLiteral from "@babel/runtime/helpers/esm/taggedTemplateLiteral";
-var _templateObject;
 import { glsl } from '@luma.gl/core';
 import { WebGLDevice } from '@luma.gl/webgl';
 import { Model } from "../model/model.js";
 import { Geometry } from "../geometry/geometry.js";
-const CLIPSPACE_VERTEX_SHADER = glsl(_templateObject || (_templateObject = _taggedTemplateLiteral(["attribute vec2 aClipSpacePosition;\nattribute vec2 aTexCoord;\nattribute vec2 aCoordinate;\n\nvarying vec2 position;\nvarying vec2 coordinate;\nvarying vec2 uv;\n\nvoid main(void) {\n  gl_Position = vec4(aClipSpacePosition, 0., 1.);\n  position = aClipSpacePosition;\n  coordinate = aCoordinate;\n  uv = aTexCoord;\n}\n"], ["\\\nattribute vec2 aClipSpacePosition;\nattribute vec2 aTexCoord;\nattribute vec2 aCoordinate;\n\nvarying vec2 position;\nvarying vec2 coordinate;\nvarying vec2 uv;\n\nvoid main(void) {\n  gl_Position = vec4(aClipSpacePosition, 0., 1.);\n  position = aClipSpacePosition;\n  coordinate = aCoordinate;\n  uv = aTexCoord;\n}\n"])));
+const CLIPSPACE_VERTEX_SHADER = glsl`\
+attribute vec2 aClipSpacePosition;
+attribute vec2 aTexCoord;
+attribute vec2 aCoordinate;
+
+varying vec2 position;
+varying vec2 coordinate;
+varying vec2 uv;
+
+void main(void) {
+  gl_Position = vec4(aClipSpacePosition, 0., 1.);
+  position = aClipSpacePosition;
+  coordinate = aCoordinate;
+  uv = aTexCoord;
+}
+`;
 const POSITIONS = [-1, -1, 1, -1, -1, 1, 1, 1];
 export class ClipSpace extends Model {
   constructor(device, opts) {

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

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

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,mBAAmB,EAAC,MAAM,eAAe,CAAC;AACvD,OAAO,EAAC,MAAM,EAAE,cAAc,EAAC,MAAM,eAAe,CAAC;AAErD,mDAAmD;AACnD,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,mBAAmB,EAAE,IAAI,GAAG,IAAI,CAAC,GAAG;IAE1E,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF;;GAEG;AACH,qBAAa,eAAe;IAC1B,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAIlD;IAED,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8B;IACtD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA8B;IACzD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAsC;IAErE,MAAM,CAAC,yBAAyB,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe;gBAKrD,MAAM,EAAE,MAAM;IAI1B,oBAAoB,CAAC,OAAO,EAAE,oBAAoB,GAAG,cAAc;IAsBnE,OAAO,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAYvC,qBAAqB,CAAC,KAAK,EAAE,oBAAoB,GAAG,cAAc;IAclE,qEAAqE;IACrE,mBAAmB,CAAC,KAAK,EAAE,oBAAoB,GAAG,MAAM;IAqBxD,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;CAM9B"}
+{"version":3,"file":"pipeline-factory.d.ts","sourceRoot":"","sources":["../../src/lib/pipeline-factory.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,eAAe,CAAC;AACvD,OAAO,EAAC,MAAM,EAAE,cAAc,EAAC,MAAM,eAAe,CAAC;AAErD,mDAAmD;AACnD,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,mBAAmB,EAAE,IAAI,GAAG,IAAI,CAAC,GAAG;IAE1E,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF;;GAEG;AACH,qBAAa,eAAe;IAC1B,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAIlD;IAED,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8B;IACtD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA8B;IACzD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAsC;IAErE,MAAM,CAAC,yBAAyB,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe;gBAKrD,MAAM,EAAE,MAAM;IAI1B,oBAAoB,CAAC,OAAO,EAAE,oBAAoB,GAAG,cAAc;IAsBnE,OAAO,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAYvC,qBAAqB,CAAC,KAAK,EAAE,oBAAoB,GAAG,cAAc;IAclE,qEAAqE;IACrE,mBAAmB,CAAC,KAAK,EAAE,oBAAoB,GAAG,MAAM;IAuBxD,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;CAM9B"}

package/dist/lib/pipeline-factory.js

@@ -1,4 +1,3 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { RenderPipeline } from '@luma.gl/core';
 export class PipelineFactory {
   static getDefaultPipelineFactory(device) {
@@ -6,11 +5,11 @@ export class PipelineFactory {
     return device._lumaData.defaultPipelineFactory;
   }
   constructor(device) {
-    _defineProperty(this, "device", void 0);
-    _defineProperty(this, "_hashCounter", 0);
-    _defineProperty(this, "_hashes", {});
-    _defineProperty(this, "_useCounts", {});
-    _defineProperty(this, "_pipelineCache", {});
+    this.device = void 0;
+    this._hashCounter = 0;
+    this._hashes = {};
+    this._useCounts = {};
+    this._pipelineCache = {};
     this.device = device;
   }
   createRenderPipeline(options) {
@@ -69,10 +68,15 @@ export class PipelineFactory {
   _hashRenderPipeline(props) {
     const vsHash = this._getHash(props.vs);
     const fsHash = props.fs ? this._getHash(props.fs) : 0;
-    const parameterHash = this._getHash(JSON.stringify(props.parameters));
-    const bufferLayoutHash = this._getHash(JSON.stringify(props.bufferLayout));
     const varyingHash = '-';
-    return "".concat(vsHash, "/").concat(fsHash, "V").concat(varyingHash, "T").concat(props.topology, "P").concat(parameterHash, "BL").concat(bufferLayoutHash, "}");
+    switch (this.device.info.type) {
+      case 'webgpu':
+        const parameterHash = this._getHash(JSON.stringify(props.parameters));
+        const bufferLayoutHash = this._getHash(JSON.stringify(props.bufferLayout));
+        return `${vsHash}/${fsHash}V${varyingHash}T${props.topology}P${parameterHash}BL${bufferLayoutHash}}`;
+      default:
+        return `${vsHash}/${fsHash}V${varyingHash}`;
+    }
   }
   _getHash(key) {
     if (this._hashes[key] === undefined) {
@@ -81,9 +85,9 @@ export class PipelineFactory {
     return this._hashes[key];
   }
 }
-_defineProperty(PipelineFactory, "defaultProps", {
+PipelineFactory.defaultProps = {
   ...RenderPipeline.defaultProps,
   vs: undefined,
   fs: undefined
-});
+};
 //# sourceMappingURL=pipeline-factory.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"pipeline-factory.js","names":["RenderPipeline","PipelineFactory","getDefaultPipelineFactory","device","_lumaData","defaultPipelineFactory","constructor","_defineProperty","createRenderPipeline","options","props","defaultProps","hash","_hashRenderPipeline","_pipelineCache","pipeline","vs","createShader","stage","source","fs","_useCounts","release","destroy","_createRenderPipeline","Error","vsHash","_getHash","fsHash","parameterHash","JSON","stringify","parameters","bufferLayoutHash","bufferLayout","varyingHash","concat","topology","key","_hashes","undefined","_hashCounter"],"sources":["../../src/lib/pipeline-factory.ts"],"sourcesContent":["import type {RenderPipelineProps} from '@luma.gl/core';\nimport {Device, RenderPipeline} from '@luma.gl/core';\n\n/** Todo - should be same as RenderPipelineProps */\nexport type PipelineFactoryProps = Omit<RenderPipelineProps, 'vs' | 'fs'> & {\n  // Only accepts string shaders\n  vs: string;\n  fs: string;\n};\n\n/** \n * Efficiently creates / caches pipelines\n */\nexport class PipelineFactory {\n  static defaultProps: Required<PipelineFactoryProps> = {\n    ...RenderPipeline.defaultProps,\n    vs: undefined!,\n    fs: undefined!\n  }\n\n  readonly device: Device;\n\n  private _hashCounter: number = 0;\n  private readonly _hashes: Record<string, number> = {};\n  private readonly _useCounts: Record<string, number> = {};\n  private readonly _pipelineCache: Record<string, RenderPipeline> = {};\n\n  static getDefaultPipelineFactory(device: Device): PipelineFactory {\n    device._lumaData.defaultPipelineFactory = device._lumaData.defaultPipelineFactory || new PipelineFactory(device);\n    return device._lumaData.defaultPipelineFactory as PipelineFactory;\n  }\n\n  constructor(device: Device) {\n    this.device = device;\n  }\n\n  createRenderPipeline(options: PipelineFactoryProps): RenderPipeline {\n    const props: Required<PipelineFactoryProps> = {...PipelineFactory.defaultProps, ...options};\n\n    const hash = this._hashRenderPipeline({...props});\n\n    if (!this._pipelineCache[hash]) {\n      const pipeline = this.device.createRenderPipeline({\n        ...props,\n        vs: this.device.createShader({stage: 'vertex', source: props.vs}),\n        fs: props.fs ? this.device.createShader({stage: 'fragment', source: props.fs}) : null,\n      });\n\n      pipeline.hash = hash;\n      this._pipelineCache[hash] = pipeline;\n      this._useCounts[hash] = 0;\n    }\n\n    this._useCounts[hash]++;\n\n    return this._pipelineCache[hash];\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._useCounts[hash];\n    }\n  }\n\n  // PRIVATE\n\n  _createRenderPipeline(props: PipelineFactoryProps): RenderPipeline {\n    if (!props.fs) {\n      throw new Error('fs');\n    }\n\n    const pipeline = this.device.createRenderPipeline({\n      ...props,\n      vs: this.device.createShader({stage: 'vertex', source: props.vs}),\n      fs: props.fs ? this.device.createShader({stage: 'fragment', source: props.fs}) : null,\n    });\n\n    return pipeline;\n  }\n\n  /** Calculate a hash based on all the inputs for a render pipeline */\n  _hashRenderPipeline(props: PipelineFactoryProps): string {\n    const vsHash = this._getHash(props.vs);\n    const fsHash = props.fs ? this._getHash(props.fs) : 0;\n\n    // TODO - Can json.stringify() generate different strings for equivalent objects if order of params is different?\n    // create a deepHash() to deduplicate?\n\n    // hash parameters\n    const parameterHash = this._getHash(JSON.stringify(props.parameters));\n\n    // hash buffer layouts\n    const bufferLayoutHash = this._getHash(JSON.stringify(props.bufferLayout));\n\n    // WebGL specific\n    // const {varyings = [], bufferMode = {}} = props;\n    // const varyingHashes = varyings.map((v) => this._getHash(v));\n    const varyingHash = '-'; // `${varyingHashes.join('/')}B${bufferMode}`\n\n    return `${vsHash}/${fsHash}V${varyingHash}T${props.topology}P${parameterHash}BL${bufferLayoutHash}}`;\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\n"],"mappings":";AACA,SAAgBA,cAAc,QAAO,eAAe;AAYpD,OAAO,MAAMC,eAAe,CAAC;EAc3B,OAAOC,yBAAyBA,CAACC,MAAc,EAAmB;IAChEA,MAAM,CAACC,SAAS,CAACC,sBAAsB,GAAGF,MAAM,CAACC,SAAS,CAACC,sBAAsB,IAAI,IAAIJ,eAAe,CAACE,MAAM,CAAC;IAChH,OAAOA,MAAM,CAACC,SAAS,CAACC,sBAAsB;EAChD;EAEAC,WAAWA,CAACH,MAAc,EAAE;IAAAI,eAAA;IAAAA,eAAA,uBAVG,CAAC;IAAAA,eAAA,kBACmB,CAAC,CAAC;IAAAA,eAAA,qBACC,CAAC,CAAC;IAAAA,eAAA,yBACU,CAAC,CAAC;IAQlE,IAAI,CAACJ,MAAM,GAAGA,MAAM;EACtB;EAEAK,oBAAoBA,CAACC,OAA6B,EAAkB;IAClE,MAAMC,KAAqC,GAAG;MAAC,GAAGT,eAAe,CAACU,YAAY;MAAE,GAAGF;IAAO,CAAC;IAE3F,MAAMG,IAAI,GAAG,IAAI,CAACC,mBAAmB,CAAC;MAAC,GAAGH;IAAK,CAAC,CAAC;IAEjD,IAAI,CAAC,IAAI,CAACI,cAAc,CAACF,IAAI,CAAC,EAAE;MAC9B,MAAMG,QAAQ,GAAG,IAAI,CAACZ,MAAM,CAACK,oBAAoB,CAAC;QAChD,GAAGE,KAAK;QACRM,EAAE,EAAE,IAAI,CAACb,MAAM,CAACc,YAAY,CAAC;UAACC,KAAK,EAAE,QAAQ;UAAEC,MAAM,EAAET,KAAK,CAACM;QAAE,CAAC,CAAC;QACjEI,EAAE,EAAEV,KAAK,CAACU,EAAE,GAAG,IAAI,CAACjB,MAAM,CAACc,YAAY,CAAC;UAACC,KAAK,EAAE,UAAU;UAAEC,MAAM,EAAET,KAAK,CAACU;QAAE,CAAC,CAAC,GAAG;MACnF,CAAC,CAAC;MAEFL,QAAQ,CAACH,IAAI,GAAGA,IAAI;MACpB,IAAI,CAACE,cAAc,CAACF,IAAI,CAAC,GAAGG,QAAQ;MACpC,IAAI,CAACM,UAAU,CAACT,IAAI,CAAC,GAAG,CAAC;IAC3B;IAEA,IAAI,CAACS,UAAU,CAACT,IAAI,CAAC,EAAE;IAEvB,OAAO,IAAI,CAACE,cAAc,CAACF,IAAI,CAAC;EAClC;EAEAU,OAAOA,CAACP,QAAwB,EAAQ;IACtC,MAAMH,IAAI,GAAGG,QAAQ,CAACH,IAAI;IAC1B,IAAI,CAACS,UAAU,CAACT,IAAI,CAAC,EAAE;IACvB,IAAI,IAAI,CAACS,UAAU,CAACT,IAAI,CAAC,KAAK,CAAC,EAAE;MAC/B,IAAI,CAACE,cAAc,CAACF,IAAI,CAAC,CAACW,OAAO,CAAC,CAAC;MACnC,OAAO,IAAI,CAACT,cAAc,CAACF,IAAI,CAAC;MAChC,OAAO,IAAI,CAACS,UAAU,CAACT,IAAI,CAAC;IAC9B;EACF;EAIAY,qBAAqBA,CAACd,KAA2B,EAAkB;IACjE,IAAI,CAACA,KAAK,CAACU,EAAE,EAAE;MACb,MAAM,IAAIK,KAAK,CAAC,IAAI,CAAC;IACvB;IAEA,MAAMV,QAAQ,GAAG,IAAI,CAACZ,MAAM,CAACK,oBAAoB,CAAC;MAChD,GAAGE,KAAK;MACRM,EAAE,EAAE,IAAI,CAACb,MAAM,CAACc,YAAY,CAAC;QAACC,KAAK,EAAE,QAAQ;QAAEC,MAAM,EAAET,KAAK,CAACM;MAAE,CAAC,CAAC;MACjEI,EAAE,EAAEV,KAAK,CAACU,EAAE,GAAG,IAAI,CAACjB,MAAM,CAACc,YAAY,CAAC;QAACC,KAAK,EAAE,UAAU;QAAEC,MAAM,EAAET,KAAK,CAACU;MAAE,CAAC,CAAC,GAAG;IACnF,CAAC,CAAC;IAEF,OAAOL,QAAQ;EACjB;EAGAF,mBAAmBA,CAACH,KAA2B,EAAU;IACvD,MAAMgB,MAAM,GAAG,IAAI,CAACC,QAAQ,CAACjB,KAAK,CAACM,EAAE,CAAC;IACtC,MAAMY,MAAM,GAAGlB,KAAK,CAACU,EAAE,GAAG,IAAI,CAACO,QAAQ,CAACjB,KAAK,CAACU,EAAE,CAAC,GAAG,CAAC;IAMrD,MAAMS,aAAa,GAAG,IAAI,CAACF,QAAQ,CAACG,IAAI,CAACC,SAAS,CAACrB,KAAK,CAACsB,UAAU,CAAC,CAAC;IAGrE,MAAMC,gBAAgB,GAAG,IAAI,CAACN,QAAQ,CAACG,IAAI,CAACC,SAAS,CAACrB,KAAK,CAACwB,YAAY,CAAC,CAAC;IAK1E,MAAMC,WAAW,GAAG,GAAG;IAEvB,UAAAC,MAAA,CAAUV,MAAM,OAAAU,MAAA,CAAIR,MAAM,OAAAQ,MAAA,CAAID,WAAW,OAAAC,MAAA,CAAI1B,KAAK,CAAC2B,QAAQ,OAAAD,MAAA,CAAIP,aAAa,QAAAO,MAAA,CAAKH,gBAAgB;EACnG;EAEAN,QAAQA,CAACW,GAAW,EAAU;IAC5B,IAAI,IAAI,CAACC,OAAO,CAACD,GAAG,CAAC,KAAKE,SAAS,EAAE;MACnC,IAAI,CAACD,OAAO,CAACD,GAAG,CAAC,GAAG,IAAI,CAACG,YAAY,EAAE;IACzC;IACA,OAAO,IAAI,CAACF,OAAO,CAACD,GAAG,CAAC;EAC1B;AACF;AAAC/B,eAAA,CAnGYN,eAAe,kBAC4B;EACpD,GAAGD,cAAc,CAACW,YAAY;EAC9BK,EAAE,EAAEwB,SAAU;EACdpB,EAAE,EAAEoB;AACN,CAAC"}
+{"version":3,"file":"pipeline-factory.js","names":["RenderPipeline","PipelineFactory","getDefaultPipelineFactory","device","_lumaData","defaultPipelineFactory","constructor","_hashCounter","_hashes","_useCounts","_pipelineCache","createRenderPipeline","options","props","defaultProps","hash","_hashRenderPipeline","pipeline","vs","createShader","stage","source","fs","release","destroy","_createRenderPipeline","Error","vsHash","_getHash","fsHash","varyingHash","info","type","parameterHash","JSON","stringify","parameters","bufferLayoutHash","bufferLayout","topology","key","undefined"],"sources":["../../src/lib/pipeline-factory.ts"],"sourcesContent":["// luma.gl, MIT license\nimport type {RenderPipelineProps} from '@luma.gl/core';\nimport {Device, RenderPipeline} from '@luma.gl/core';\n\n/** Todo - should be same as RenderPipelineProps */\nexport type PipelineFactoryProps = Omit<RenderPipelineProps, 'vs' | 'fs'> & {\n  // Only accepts string shaders\n  vs: string;\n  fs: string;\n};\n\n/** \n * Efficiently creates / caches pipelines\n */\nexport class PipelineFactory {\n  static defaultProps: Required<PipelineFactoryProps> = {\n    ...RenderPipeline.defaultProps,\n    vs: undefined!,\n    fs: undefined!\n  }\n\n  readonly device: Device;\n\n  private _hashCounter: number = 0;\n  private readonly _hashes: Record<string, number> = {};\n  private readonly _useCounts: Record<string, number> = {};\n  private readonly _pipelineCache: Record<string, RenderPipeline> = {};\n\n  static getDefaultPipelineFactory(device: Device): PipelineFactory {\n    device._lumaData.defaultPipelineFactory = device._lumaData.defaultPipelineFactory || new PipelineFactory(device);\n    return device._lumaData.defaultPipelineFactory as PipelineFactory;\n  }\n\n  constructor(device: Device) {\n    this.device = device;\n  }\n\n  createRenderPipeline(options: PipelineFactoryProps): RenderPipeline {\n    const props: Required<PipelineFactoryProps> = {...PipelineFactory.defaultProps, ...options};\n\n    const hash = this._hashRenderPipeline({...props});\n\n    if (!this._pipelineCache[hash]) {\n      const pipeline = this.device.createRenderPipeline({\n        ...props,\n        vs: this.device.createShader({stage: 'vertex', source: props.vs}),\n        fs: props.fs ? this.device.createShader({stage: 'fragment', source: props.fs}) : null,\n      });\n\n      pipeline.hash = hash;\n      this._pipelineCache[hash] = pipeline;\n      this._useCounts[hash] = 0;\n    }\n\n    this._useCounts[hash]++;\n\n    return this._pipelineCache[hash];\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._useCounts[hash];\n    }\n  }\n\n  // PRIVATE\n\n  _createRenderPipeline(props: PipelineFactoryProps): RenderPipeline {\n    if (!props.fs) {\n      throw new Error('fs');\n    }\n\n    const pipeline = this.device.createRenderPipeline({\n      ...props,\n      vs: this.device.createShader({stage: 'vertex', source: props.vs}),\n      fs: props.fs ? this.device.createShader({stage: 'fragment', source: props.fs}) : null,\n    });\n\n    return pipeline;\n  }\n\n  /** Calculate a hash based on all the inputs for a render pipeline */\n  _hashRenderPipeline(props: PipelineFactoryProps): string {\n    const vsHash = this._getHash(props.vs);\n    const fsHash = props.fs ? this._getHash(props.fs) : 0;\n\n    // WebGL specific\n    // const {varyings = [], bufferMode = {}} = props;\n    // const varyingHashes = varyings.map((v) => this._getHash(v));\n    const varyingHash = '-'; // `${varyingHashes.join('/')}B${bufferMode}`\n\n    switch (this.device.info.type) {\n      case 'webgpu':\n        // On WebGPU we need to rebuild the pipeline if topology, parameters or bufferLayout change\n        const parameterHash = this._getHash(JSON.stringify(props.parameters));\n        const bufferLayoutHash = this._getHash(JSON.stringify(props.bufferLayout));\n        // TODO - Can json.stringify() generate different strings for equivalent objects if order of params is different?\n        // create a deepHash() to deduplicate?\n        return `${vsHash}/${fsHash}V${varyingHash}T${props.topology}P${parameterHash}BL${bufferLayoutHash}}`;\n      default:\n        // WebGL is more dynamic\n        return `${vsHash}/${fsHash}V${varyingHash}`;\n    }\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\n"],"mappings":"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"}

package/dist/model/model.d.ts

@@ -82,9 +82,10 @@ export declare class Model {
     draw(renderPass: RenderPass): void;
     /**
      * Updates the optional geometry
+    * Geometry, sets several attributes, indices, and also vertex count and topology
      * @note Can trigger a pipeline rebuild / pipeline cache fetch on WebGPU
      */
-    setGeometry(geometry: GPUGeometry): void;
+    setGeometry(geometry: GPUGeometry | Geometry): void;
     /**
      * Updates the primitive topology ('triangle-list', 'triangle-strip' etc).
      * @note Triggers a pipeline rebuild / pipeline cache fetch on WebGPU

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,31 +1,29 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { RenderPipeline, log, uid, deepEqual } from '@luma.gl/core';
 import { ShaderAssembler } from '@luma.gl/shadertools';
 import { makeGPUGeometry } from "../geometry/gpu-geometry.js";
 import { PipelineFactory } from "../lib/pipeline-factory.js";
-import { buildShaders } from "./model-shaders.js";
 export class Model {
   constructor(device, props) {
-    _defineProperty(this, "device", void 0);
-    _defineProperty(this, "id", void 0);
-    _defineProperty(this, "vs", void 0);
-    _defineProperty(this, "fs", void 0);
-    _defineProperty(this, "pipelineFactory", void 0);
-    _defineProperty(this, "userData", {});
-    _defineProperty(this, "parameters", void 0);
-    _defineProperty(this, "topology", void 0);
-    _defineProperty(this, "bufferLayout", void 0);
-    _defineProperty(this, "vertexCount", void 0);
-    _defineProperty(this, "instanceCount", 0);
-    _defineProperty(this, "indices", null);
-    _defineProperty(this, "bufferAttributes", {});
-    _defineProperty(this, "constantAttributes", {});
-    _defineProperty(this, "bindings", {});
-    _defineProperty(this, "uniforms", {});
-    _defineProperty(this, "pipeline", void 0);
-    _defineProperty(this, "_pipelineNeedsUpdate", 'newly created');
-    _defineProperty(this, "_getModuleUniforms", void 0);
-    _defineProperty(this, "props", void 0);
+    this.device = void 0;
+    this.id = void 0;
+    this.vs = void 0;
+    this.fs = void 0;
+    this.pipelineFactory = void 0;
+    this.userData = {};
+    this.parameters = void 0;
+    this.topology = void 0;
+    this.bufferLayout = void 0;
+    this.vertexCount = void 0;
+    this.instanceCount = 0;
+    this.indices = null;
+    this.bufferAttributes = {};
+    this.constantAttributes = {};
+    this.bindings = {};
+    this.uniforms = {};
+    this.pipeline = void 0;
+    this._pipelineNeedsUpdate = 'newly created';
+    this._getModuleUniforms = void 0;
+    this.props = void 0;
     this.props = {
       ...Model.defaultProps,
       ...props
@@ -34,11 +32,17 @@ export class Model {
     this.id = props.id || uid('model');
     this.device = device;
     Object.assign(this.userData, props.userData);
+    const platformInfo = {
+      type: device.info.type,
+      shaderLanguage: device.info.shadingLanguages[0],
+      gpu: device.info.gpu,
+      features: device.features
+    };
     const {
       vs,
       fs,
       getUniforms
-    } = buildShaders(device, this.props);
+    } = this.props.shaderAssembler.assembleShaders(platformInfo, this.props);
     this.vs = vs;
     this.fs = fs;
     this._getModuleUniforms = getUniforms;
@@ -47,9 +51,8 @@ export class Model {
     this.topology = this.props.topology;
     this.bufferLayout = this.props.bufferLayout;
     this.parameters = this.props.parameters;
-    const gpuGeometry = props.geometry && makeGPUGeometry(device, props.geometry);
-    if (gpuGeometry) {
-      this.setGeometry(gpuGeometry);
+    if (props.geometry) {
+      this.setGeometry(props.geometry);
     }
     this.pipelineFactory = props.pipelineFactory || PipelineFactory.getDefaultPipelineFactory(this.device);
     this.pipeline = this._updatePipeline();
@@ -94,34 +97,29 @@ export class Model {
     });
   }
   setGeometry(geometry) {
-    this.setTopology(geometry.topology || 'triangle-list');
-    this.bufferLayout = mergeBufferLayouts(this.bufferLayout, geometry.bufferLayout);
-    this.vertexCount = geometry.vertexCount;
-    this.setAttributes(geometry.attributes);
-    this.setIndexBuffer(geometry.indices);
+    const gpuGeometry = geometry && makeGPUGeometry(this.device, geometry);
+    this.setTopology(gpuGeometry.topology || 'triangle-list');
+    this.bufferLayout = mergeBufferLayouts(this.bufferLayout, gpuGeometry.bufferLayout);
+    this.vertexCount = gpuGeometry.vertexCount;
+    this.setAttributes(gpuGeometry.attributes);
+    this.setIndexBuffer(gpuGeometry.indices);
   }
   setTopology(topology) {
     if (topology !== this.topology) {
       this.topology = topology;
-      if (this.device.info.type === 'webgpu') {
-        this._setPipelineNeedsUpdate('topology');
-      }
+      this._setPipelineNeedsUpdate('topology');
     }
   }
   setBufferLayout(bufferLayout) {
     if (bufferLayout !== this.bufferLayout) {
       this.bufferLayout = bufferLayout;
-      if (this.device.info.type === 'webgpu') {
-        this._setPipelineNeedsUpdate('bufferLayout');
-      }
+      this._setPipelineNeedsUpdate('bufferLayout');
     }
   }
   setParameters(parameters) {
     if (!deepEqual(parameters, this.parameters, 2)) {
       this.parameters = parameters;
-      if (this.device.info.type === 'webgpu') {
-        this._setPipelineNeedsUpdate('parameters');
-      }
+      this._setPipelineNeedsUpdate('parameters');
     }
   }
   setVertexCount(vertexCount) {
@@ -142,7 +140,7 @@ export class Model {
   }
   setAttributes(bufferAttributes) {
     if (bufferAttributes.indices) {
-      log.warn("Model:".concat(this.id, " setAttributes() - indices should be set using setIndexBuffer()"));
+      log.warn(`Model:${this.id} setAttributes() - indices should be set using setIndexBuffer()`);
     }
     Object.assign(this.bufferAttributes, bufferAttributes);
   }
@@ -161,7 +159,7 @@ export class Model {
   }
   _updatePipeline() {
     if (this._pipelineNeedsUpdate) {
-      log.log(1, "Model ".concat(this.id, ": Recreating pipeline because \"").concat(this._pipelineNeedsUpdate, "\"."))();
+      log.log(1, `Model ${this.id}: Recreating pipeline because "${this._pipelineNeedsUpdate}".`)();
       this._pipelineNeedsUpdate = false;
       this.pipeline = this.device.createRenderPipeline({
         ...this.props,
@@ -181,7 +179,7 @@ export class Model {
     return this.pipeline;
   }
 }
-_defineProperty(Model, "defaultProps", {
+Model.defaultProps = {
   ...RenderPipeline.defaultProps,
   vs: null,
   fs: null,
@@ -194,7 +192,7 @@ _defineProperty(Model, "defaultProps", {
   geometry: null,
   pipelineFactory: undefined,
   shaderAssembler: ShaderAssembler.getDefaultShaderAssembler()
-});
+};
 function mergeBufferLayouts(layouts1, layouts2) {
   const layouts = [...layouts1];
   for (const attribute of layouts2) {