@luma.gl/engine 9.0.0-alpha.52 → 9.0.0-alpha.54

package/dist/debug/debug-shader-layout.d.ts

@@ -0,0 +1,9 @@
+import type { ShaderLayout } from '@luma.gl/core';
+/**
+ * Extracts a table suitable for `console.table()` from a shader layout to assist in debugging.
+ * @param layout shader layout
+ * @param name app should provide the most meaningful name, usually the model or pipeline name / id.
+ * @returns
+ */
+export declare function getDebugTableForShaderLayout(layout: ShaderLayout, name?: string): Record<string, Record<string, string>>;
+//# sourceMappingURL=debug-shader-layout.d.ts.map

package/dist/debug/debug-shader-layout.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"debug-shader-layout.d.ts","sourceRoot":"","sources":["../../src/debug/debug-shader-layout.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAEhD;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,YAAY,EACpB,IAAI,GAAE,MAAW,GAChB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAkBxC"}

package/dist/debug/debug-shader-layout.js

@@ -0,0 +1,21 @@
+export function getDebugTableForShaderLayout(layout) {
+  let name = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  const table = {};
+  const header = `Shader Layout for ${name}`;
+  for (const attributeDeclaration of layout.attributes) {
+    if (attributeDeclaration) {
+      const glslDeclaration = `${attributeDeclaration.location} ${attributeDeclaration.name}: ${attributeDeclaration.type}`;
+      table[`in ${glslDeclaration}`] = {
+        [header]: attributeDeclaration.stepMode || 'vertex'
+      };
+    }
+  }
+  for (const varyingDeclaration of layout.varyings || []) {
+    const glslDeclaration = `${varyingDeclaration.location} ${varyingDeclaration.name}`;
+    table[`out ${glslDeclaration}`] = {
+      [header]: JSON.stringify(varyingDeclaration.accessor)
+    };
+  }
+  return table;
+}
+//# sourceMappingURL=debug-shader-layout.js.map

package/dist/debug/debug-shader-layout.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"debug-shader-layout.js","names":["getDebugTableForShaderLayout","layout","name","arguments","length","undefined","table","header","attributeDeclaration","attributes","glslDeclaration","location","type","stepMode","varyingDeclaration","varyings","JSON","stringify","accessor"],"sources":["../../src/debug/debug-shader-layout.ts"],"sourcesContent":["// luma.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport type {ShaderLayout} from '@luma.gl/core';\n\n/**\n * Extracts a table suitable for `console.table()` from a shader layout to assist in debugging.\n * @param layout shader layout\n * @param name app should provide the most meaningful name, usually the model or pipeline name / id.\n * @returns \n */\nexport function getDebugTableForShaderLayout(\n  layout: ShaderLayout,\n  name: string = ''\n): Record<string, Record<string, string>> {\n  const table: Record<string, Record<string, string>> = {};\n\n  const header = `Shader Layout for ${name}`;\n\n  for (const attributeDeclaration of layout.attributes) {\n    if (attributeDeclaration) {\n      const glslDeclaration = `${attributeDeclaration.location} ${attributeDeclaration.name}: ${attributeDeclaration.type}`;\n      table[`in ${glslDeclaration}`] = {[header]: attributeDeclaration.stepMode || 'vertex'};\n    }\n  }\n\n  for (const varyingDeclaration of layout.varyings || []) {\n    const glslDeclaration = `${varyingDeclaration.location} ${varyingDeclaration.name}`;\n    table[`out ${glslDeclaration}`] = {[header]: JSON.stringify(varyingDeclaration.accessor)};\n  }\n\n  return table;\n}\n"],"mappings":"AAYA,OAAO,SAASA,4BAA4BA,CAC1CC,MAAoB,EAEoB;EAAA,IADxCC,IAAY,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,EAAE;EAEjB,MAAMG,KAA6C,GAAG,CAAC,CAAC;EAExD,MAAMC,MAAM,GAAI,qBAAoBL,IAAK,EAAC;EAE1C,KAAK,MAAMM,oBAAoB,IAAIP,MAAM,CAACQ,UAAU,EAAE;IACpD,IAAID,oBAAoB,EAAE;MACxB,MAAME,eAAe,GAAI,GAAEF,oBAAoB,CAACG,QAAS,IAAGH,oBAAoB,CAACN,IAAK,KAAIM,oBAAoB,CAACI,IAAK,EAAC;MACrHN,KAAK,CAAE,MAAKI,eAAgB,EAAC,CAAC,GAAG;QAAC,CAACH,MAAM,GAAGC,oBAAoB,CAACK,QAAQ,IAAI;MAAQ,CAAC;IACxF;EACF;EAEA,KAAK,MAAMC,kBAAkB,IAAIb,MAAM,CAACc,QAAQ,IAAI,EAAE,EAAE;IACtD,MAAML,eAAe,GAAI,GAAEI,kBAAkB,CAACH,QAAS,IAAGG,kBAAkB,CAACZ,IAAK,EAAC;IACnFI,KAAK,CAAE,OAAMI,eAAgB,EAAC,CAAC,GAAG;MAAC,CAACH,MAAM,GAAGS,IAAI,CAACC,SAAS,CAACH,kBAAkB,CAACI,QAAQ;IAAC,CAAC;EAC3F;EAEA,OAAOZ,KAAK;AACd"}

package/dist/dist.dev.js

@@ -764,7 +764,7 @@ var __exports__ = (() => {
     id: "@probe.gl/log"
   });
 
-  // ../core/src/lib/utils/log.ts
+  // ../core/src/utils/log.ts
   var log = new Log({
     id: "luma.gl"
   });
@@ -960,7 +960,7 @@ var __exports__ = (() => {
     }
   };
 
-  // ../core/src/lib/utils/stats-manager.ts
+  // ../core/src/utils/stats-manager.ts
   var StatsManager = class {
     stats = /* @__PURE__ */ new Map();
     getStats(name2) {
@@ -979,14 +979,14 @@ var __exports__ = (() => {
 
   // ../core/src/init.ts
   function initializeLuma() {
-    const VERSION3 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "untranspiled source";
+    const VERSION3 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "running from source";
     const STARTUP_MESSAGE = "set luma.log.level=1 (or higher) to trace rendering";
     if (globalThis.luma && globalThis.luma.VERSION !== VERSION3) {
       throw new Error(`luma.gl - multiple VERSIONs detected: ${globalThis.luma.VERSION} vs ${VERSION3}`);
     }
     if (!globalThis.luma) {
       if (isBrowser()) {
-        log.log(1, `luma.gl ${VERSION3} - ${STARTUP_MESSAGE}`)();
+        log.log(1, `${VERSION3} - ${STARTUP_MESSAGE}`)();
       }
       globalThis.luma = globalThis.luma || {
         VERSION: VERSION3,
@@ -999,7 +999,7 @@ var __exports__ = (() => {
   }
   var VERSION2 = initializeLuma();
 
-  // ../core/src/lib/utils/is-array.ts
+  // ../core/src/utils/is-array.ts
   function isTypedArray(value) {
     return ArrayBuffer.isView(value) && !(value instanceof DataView) ? value : null;
   }
@@ -1010,7 +1010,7 @@ var __exports__ = (() => {
     return isTypedArray(value);
   }
 
-  // ../core/src/lib/utils/utils.ts
+  // ../core/src/utils/utils.ts
   var uidCounters = {};
   function uid(id = "id") {
     uidCounters[id] = uidCounters[id] || 1;
@@ -1133,14 +1133,20 @@ var __exports__ = (() => {
       this.usage = props.usage || 0;
       this.indexType = deducedProps.indexType;
     }
-    write(data, byteOffset) {
+    readSyncWebGL2(byteOffset, byteLength) {
       throw new Error("not implemented");
     }
-    readAsync(byteOffset, byteLength) {
-      throw new Error("not implemented");
-    }
-    getData() {
-      throw new Error("not implemented");
+    debugData = new ArrayBuffer(0);
+    _setDebugData(data, byteOffset, byteLength) {
+      const buffer = ArrayBuffer.isView(data) ? data.buffer : data;
+      const debugDataLength = Math.min(data ? data.byteLength : byteLength, _Buffer.DEBUG_DATA_MAX_LENGTH);
+      if (data === null) {
+        this.debugData = new ArrayBuffer(debugDataLength);
+      } else if (byteOffset === 0 && byteLength === data.byteLength) {
+        this.debugData = buffer.slice(0, debugDataLength);
+      } else {
+        this.debugData = buffer.slice(byteOffset, byteOffset + debugDataLength);
+      }
     }
   };
   var Buffer2 = _Buffer;
@@ -1163,6 +1169,7 @@ var __exports__ = (() => {
   __publicField(Buffer2, "STORAGE", 128);
   __publicField(Buffer2, "INDIRECT", 256);
   __publicField(Buffer2, "QUERY_RESOLVE", 512);
+  __publicField(Buffer2, "DEBUG_DATA_MAX_LENGTH", 32);
 
   // ../core/src/adapter/device.ts
   var _Device = class {
@@ -1237,6 +1244,13 @@ var __exports__ = (() => {
   });
   __publicField(Device, "VERSION", VERSION2);
 
+  // ../core/src/utils/assert.ts
+  function assert2(condition, message) {
+    if (!condition) {
+      throw new Error(message || "luma.gl: assertion failed.");
+    }
+  }
+
   // ../core/src/lib/luma.ts
   var deviceList = /* @__PURE__ */ new Map();
   var luma = class {
@@ -1280,6 +1294,10 @@ var __exports__ = (() => {
           }
           break;
         case "best-available":
+          DeviceClass = deviceList.get("webgpu");
+          if (DeviceClass && DeviceClass.isSupported()) {
+            return await DeviceClass.create(props);
+          }
           DeviceClass = deviceList.get("webgl");
           if (DeviceClass && DeviceClass.isSupported()) {
             return await DeviceClass.create(props);
@@ -1553,13 +1571,6 @@ var __exports__ = (() => {
     return null;
   }
 
-  // ../core/src/lib/utils/assert.ts
-  function assert2(condition, message) {
-    if (!condition) {
-      throw new Error(message || "luma.gl: assertion failed.");
-    }
-  }
-
   // ../core/src/adapter/type-utils/decode-shader-types.ts
   var UNIFORM_FORMATS = {
     "f32": {
@@ -1663,7 +1674,7 @@ var __exports__ = (() => {
     }
   }
 
-  // ../core/src/lib/utils/array-utils-flat.ts
+  // ../core/src/utils/array-utils-flat.ts
   var arrayBuffer;
   function getScratchArrayBuffer(byteLength) {
     if (!arrayBuffer || arrayBuffer.byteLength < byteLength) {
@@ -1744,7 +1755,7 @@ var __exports__ = (() => {
     }
   };
 
-  // ../core/src/lib/utils/array-equal.ts
+  // ../core/src/utils/array-equal.ts
   function arrayEqual(a, b, limit = 16) {
     if (a !== b) {
       return false;
@@ -1926,6 +1937,30 @@ var __exports__ = (() => {
         throw new Error(type.constructor.name);
     }
   }
+  function getTypedArrayFromDataType(dataType) {
+    switch (dataType) {
+      case "float32":
+        return Float32Array;
+      case "uint32":
+        return Uint32Array;
+      case "sint32":
+        return Int32Array;
+      case "uint16":
+      case "unorm16":
+        return Uint16Array;
+      case "sint16":
+      case "snorm16":
+        return Int16Array;
+      case "uint8":
+      case "unorm8":
+        return Uint8Array;
+      case "sint8":
+      case "snorm8":
+        return Int8Array;
+      default:
+        throw new Error(dataType);
+    }
+  }
   function getVertexFormatFromAttribute(typedArray, size, normalized) {
     if (!size || size > 4) {
       throw new Error(`size ${size}`);
@@ -1976,7 +2011,7 @@ var __exports__ = (() => {
     return result;
   }
 
-  // ../core/src/lib/utils/deep-equal.ts
+  // ../core/src/utils/deep-equal.ts
   function deepEqual(a, b, depth) {
     if (a === b) {
       return true;
@@ -2017,7 +2052,7 @@ var __exports__ = (() => {
     return false;
   }
 
-  // ../core/src/lib/utils/request-animation-frame.ts
+  // ../core/src/utils/request-animation-frame.ts
   function requestAnimationFrame(callback) {
     return typeof window !== "undefined" && window.requestAnimationFrame ? window.requestAnimationFrame(callback) : setTimeout(callback, 1e3 / 60);
   }
@@ -2025,27 +2060,6 @@ var __exports__ = (() => {
     return typeof window !== "undefined" && window.cancelAnimationFrame ? window.cancelAnimationFrame(timerId) : clearTimeout(timerId);
   }
 
-  // ../core/src/lib/debug/debug-shader-layout.ts
-  function getDebugTableForShaderLayout(layout, name2 = "") {
-    const table = {};
-    const header = `Shader Layout for ${name2}`;
-    for (const attributeDeclaration of layout.attributes) {
-      if (attributeDeclaration) {
-        const glslDeclaration = `${attributeDeclaration.location} ${attributeDeclaration.name}: ${attributeDeclaration.type}`;
-        table[`in ${glslDeclaration}`] = {
-          [header]: attributeDeclaration.stepMode || "vertex"
-        };
-      }
-    }
-    for (const varyingDeclaration of layout.varyings || []) {
-      const glslDeclaration = `${varyingDeclaration.location} ${varyingDeclaration.name}`;
-      table[`out ${glslDeclaration}`] = {
-        [header]: JSON.stringify(varyingDeclaration.accessor)
-      };
-    }
-    return table;
-  }
-
   // ../core/src/index.ts
   var glsl = (x) => `${x}`;
 
@@ -5407,6 +5421,18 @@ void main() {
       }
       return bindings;
     }
+    getDebugTable() {
+      const table = {};
+      for (const [moduleName, module] of Object.entries(this.moduleUniforms)) {
+        for (const [key, value] of Object.entries(module)) {
+          table[`${moduleName}.${key}`] = {
+            type: this.modules[moduleName].uniformTypes?.[key],
+            value: String(value)
+          };
+        }
+      }
+      return table;
+    }
   };
 
   // src/geometry/gpu-geometry.ts
@@ -5487,6 +5513,9 @@ void main() {
         case "TEXCOORD_0":
           name2 = "texCoords";
           break;
+        case "COLOR_0":
+          name2 = "colors";
+          break;
       }
       attributes[name2] = device.createBuffer({
         data: attribute.value,
@@ -5603,6 +5632,27 @@ void main() {
     fs: void 0
   });
 
+  // src/debug/debug-shader-layout.ts
+  function getDebugTableForShaderLayout(layout, name2 = "") {
+    const table = {};
+    const header = `Shader Layout for ${name2}`;
+    for (const attributeDeclaration of layout.attributes) {
+      if (attributeDeclaration) {
+        const glslDeclaration = `${attributeDeclaration.location} ${attributeDeclaration.name}: ${attributeDeclaration.type}`;
+        table[`in ${glslDeclaration}`] = {
+          [header]: attributeDeclaration.stepMode || "vertex"
+        };
+      }
+    }
+    for (const varyingDeclaration of layout.varyings || []) {
+      const glslDeclaration = `${varyingDeclaration.location} ${varyingDeclaration.name}`;
+      table[`out ${glslDeclaration}`] = {
+        [header]: JSON.stringify(varyingDeclaration.accessor)
+      };
+    }
+    return table;
+  }
+
   // src/model/model.ts
   var LOG_DRAW_PRIORITY = 2;
   var LOG_DRAW_TIMEOUT = 1e4;
@@ -5684,7 +5734,7 @@ void main() {
         this.setUniforms(props.uniforms);
       }
       if (props.moduleSettings) {
-        console.warn("Model.props.moduleSettings is deprecated. Use Model.shaderInputs.setProps()");
+        log.warn("Model.props.moduleSettings is deprecated. Use Model.shaderInputs.setProps()")();
         this.updateModuleSettings(props.moduleSettings);
       }
       if (props.transformFeedback) {
@@ -5728,7 +5778,7 @@ void main() {
     }
     _setGeometryAttributes(gpuGeometry) {
       this.vertexCount = gpuGeometry.vertexCount;
-      this.setAttributes(gpuGeometry.attributes);
+      this.setAttributes(gpuGeometry.attributes, "ignore-unknown");
       this.setIndexBuffer(gpuGeometry.indices);
     }
     setTopology(topology) {
@@ -5772,7 +5822,7 @@ void main() {
       this._uniformStore.setUniforms(this.shaderInputs.getUniformValues());
     }
     updateModuleSettings(props) {
-      console.warn("Model.updateModuleSettings is deprecated. Use Model.shaderInputs.setProps()");
+      log.warn("Model.updateModuleSettings is deprecated. Use Model.shaderInputs.setProps()")();
       const {
         bindings,
         uniforms
@@ -5793,17 +5843,17 @@ void main() {
     setTransformFeedback(transformFeedback) {
       this.transformFeedback = transformFeedback;
     }
-    setAttributes(buffers) {
+    setAttributes(buffers, _option) {
       if (buffers.indices) {
-        log.warn(`Model:${this.id} setAttributes() - indexBuffer should be set using setIndexBuffer()`);
+        log.warn(`Model:${this.id} setAttributes() - indexBuffer should be set using setIndexBuffer()`)();
       }
       for (const [bufferName, buffer] of Object.entries(buffers)) {
-        const bufferLayout = this.bufferLayout.find((layout) => layout.name === bufferName);
+        const bufferLayout = this.bufferLayout.find((layout) => getAttributeNames(layout).includes(bufferName));
         if (!bufferLayout) {
           log.warn(`Model(${this.id}): Missing layout for buffer "${bufferName}".`)();
           continue;
         }
-        const attributeNames = bufferLayout.attributes ? bufferLayout.attributes?.map((layout) => layout.attribute) : [bufferLayout.name];
+        const attributeNames = getAttributeNames(bufferLayout);
         let set = false;
         for (const attributeName of attributeNames) {
           const attributeInfo = this._attributeInfos[attributeName];
@@ -5812,7 +5862,7 @@ void main() {
             set = true;
           }
         }
-        if (!set) {
+        if (!set && _option !== "ignore-unknown") {
           log.warn(`Model(${this.id}): Ignoring buffer "${buffer.id}" for unknown attribute "${bufferName}"`)();
         }
       }
@@ -5873,10 +5923,47 @@ void main() {
       if (this._logOpen) {
         const shaderLayoutTable = getDebugTableForShaderLayout(this.pipeline.shaderLayout);
         log.table(LOG_DRAW_PRIORITY, shaderLayoutTable)();
+        const uniformTable = this.shaderInputs.getDebugTable();
+        for (const [name2, value] of Object.entries(this.uniforms)) {
+          uniformTable[name2] = {
+            value
+          };
+        }
+        log.table(LOG_DRAW_PRIORITY, uniformTable)();
+        const attributeTable = this._getAttributeDebugTable();
+        log.table(LOG_DRAW_PRIORITY, this._attributeInfos)();
+        log.table(LOG_DRAW_PRIORITY, attributeTable)();
         log.groupEnd(LOG_DRAW_PRIORITY)();
         this._logOpen = false;
       }
     }
+    _getAttributeDebugTable() {
+      const table = {};
+      for (const [name2, attributeInfo] of Object.entries(this._attributeInfos)) {
+        table[attributeInfo.location] = {
+          name: name2,
+          type: attributeInfo.shaderType,
+          values: this._getBufferOrConstantValues(this.vertexArray.attributes[attributeInfo.location], attributeInfo.bufferDataType)
+        };
+      }
+      if (this.vertexArray.indexBuffer) {
+        const {
+          indexBuffer
+        } = this.vertexArray;
+        const values = indexBuffer.indexType === "uint32" ? new Uint32Array(indexBuffer.debugData) : new Uint16Array(indexBuffer.debugData);
+        table.indices = {
+          name: "indices",
+          type: indexBuffer.indexType,
+          values: values.toString()
+        };
+      }
+      return table;
+    }
+    _getBufferOrConstantValues(attribute, dataType) {
+      const TypedArrayConstructor = getTypedArrayFromDataType(dataType);
+      const typedArray = attribute instanceof Buffer2 ? new TypedArrayConstructor(attribute.debugData) : attribute;
+      return typedArray.toString();
+    }
   };
   var Model = _Model;
   __publicField(Model, "defaultProps", {
@@ -5920,6 +6007,9 @@ void main() {
       features: device.features
     };
   }
+  function getAttributeNames(bufferLayout) {
+    return bufferLayout.attributes ? bufferLayout.attributes?.map((layout) => layout.attribute) : [bufferLayout.name];
+  }
 
   // src/transform/buffer-transform.ts
   var BufferTransform = class {

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

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

package/dist/geometry/gpu-geometry.js

@@ -82,6 +82,9 @@ export function getAttributeBuffersFromGeometry(device, geometry) {
       case 'TEXCOORD_0':
         name = 'texCoords';
         break;
+      case 'COLOR_0':
+        name = 'colors';
+        break;
     }
     attributes[name] = device.createBuffer({
       data: attribute.value,

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

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