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

package/dist/dist.dev.js

@@ -3888,6 +3888,40 @@ ${isVertex ? "" : FRAGMENT_SHADER_PROLOGUE}
     return result;
   }
 
+  // ../shadertools/src/lib/shader-assembly/select-shaders.ts
+  function selectShaders(platformInfo, props) {
+    if (!props.vs) {
+      throw new Error("no vertex shader");
+    }
+    const vs = getShaderSource(platformInfo, props.vs);
+    let fs;
+    if (props.fs) {
+      fs = getShaderSource(platformInfo, props.fs);
+    }
+    return {
+      ...props,
+      vs,
+      fs
+    };
+  }
+  function getShaderSource(platformInfo, shader) {
+    if (typeof shader === "string") {
+      return shader;
+    }
+    switch (platformInfo.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");
+    }
+  }
+
   // ../shadertools/src/lib/shader-assembler.ts
   var ShaderAssembler = class {
     /** Default ShaderAssembler instance */
@@ -3940,8 +3974,9 @@ ${isVertex ? "" : FRAGMENT_SHADER_PROLOGUE}
     assembleShaders(platformInfo, props) {
       const modules = this._getModuleList(props.modules);
       const hookFunctions = this._hookFunctions;
+      const options = selectShaders(platformInfo, props);
       const assembled = assembleShaders(platformInfo, {
-        ...props,
+        ...options,
         modules,
         hookFunctions
       });
@@ -5954,7 +5989,7 @@ void main() {
       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({
@@ -5962,19 +5997,19 @@ void main() {
           format: "float32x3"
         });
       }
-      if (!this.bufferLayout.find((layout) => layout.name === "normals")) {
+      if (this.attributes.normals && !this.bufferLayout.find((layout) => layout.name === "normals")) {
         this.bufferLayout.push({
           name: "normals",
           format: "float32x3"
         });
       }
-      if (!this.bufferLayout.find((layout) => layout.name === "texCoords")) {
+      if (this.attributes.texCoords && !this.bufferLayout.find((layout) => layout.name === "texCoords")) {
         this.bufferLayout.push({
           name: "texCoords",
           format: "float32x2"
         });
       }
-      if (!this.bufferLayout.find((layout) => layout.name === "colors")) {
+      if (this.attributes.colors && !this.bufferLayout.find((layout) => layout.name === "colors")) {
         this.bufferLayout.push({
           name: "colors",
           format: "float32x3"
@@ -6010,9 +6045,13 @@ void main() {
       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
@@ -6022,7 +6061,7 @@ void main() {
     if (!geometry.indices) {
       return void 0;
     }
-    const data = geometry.indices.value || geometry.indices;
+    const data = geometry.indices.value;
     assert2(data instanceof Uint16Array || data instanceof Uint32Array, 'attribute array for "indices" must be of integer type');
     return device.createBuffer({
       usage: Buffer2.INDEX,
@@ -6033,21 +6072,42 @@ void main() {
     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 = {
+    const attributes = {
       positions: device.createBuffer({
         data: positions.value,
         id: "positions-buffer"
-      }),
-      normals: device.createBuffer({
+      })
+    };
+    const bufferLayout = [{
+      name: "positions",
+      format: `float32x${positions.size}`
+    }];
+    if (normals) {
+      attributes.normals = device.createBuffer({
         data: normals.value,
         id: "normals-buffer"
-      }),
-      texCoords: device.createBuffer({
+      });
+      bufferLayout.push({
+        name: "normals",
+        format: `float32x${normals.size}`
+      });
+    }
+    if (texCoords) {
+      attributes.texCoords = device.createBuffer({
         data: texCoords.value,
         id: "texCoords-buffer"
-      })
+      });
+      bufferLayout.push({
+        name: "texCoords",
+        format: `float32x${texCoords.size}`
+      });
+    }
+    const vertexCount = geometry._calculateVertexCount(geometry.attributes, geometry.indices);
+    return {
+      attributes,
+      bufferLayout,
+      vertexCount
     };
-    return buffers;
   }
 
   // src/lib/pipeline-factory.ts
@@ -6140,45 +6200,6 @@ void main() {
     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, {
-      ...props,
-      fs,
-      vs
-    });
-  }
-  function getShaderSource(device, shader) {
-    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");
-    }
-  }
-
   // src/model/model.ts
   var _Model = class {
     userData = {};
@@ -6211,11 +6232,17 @@ void main() {
       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;
@@ -6224,9 +6251,8 @@ void main() {
       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();
@@ -6274,14 +6300,16 @@ void main() {
     // 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). 
@@ -14079,7 +14107,10 @@ ${formattedLog}`)();
     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 ? {
         indices: this.indices,
@@ -14090,11 +14121,17 @@ ${formattedLog}`)();
     _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;
     }
@@ -14103,8 +14140,7 @@ ${formattedLog}`)();
         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,

package/dist/geometry/geometry.d.ts

@@ -13,8 +13,8 @@ export type GeometryAttributes = {
     NORMAL: GeometryAttribute;
     TEXCOORD_0: GeometryAttribute;
     COLOR_0?: GeometryAttribute;
-    indices?: {
-        size?: number;
+    indices?: GeometryAttribute & {
+        size: 1;
         value: Uint32Array | Uint16Array;
     };
 };
@@ -28,7 +28,7 @@ export declare class Geometry {
     /** Determines how vertices are read from the 'vertex' attributes */
     readonly topology?: PrimitiveTopology;
     readonly vertexCount: number;
-    readonly indices?: Uint16Array | Uint32Array;
+    readonly indices?: GeometryAttribute;
     readonly attributes: {
         POSITION: GeometryAttribute;
         NORMAL: GeometryAttribute;
@@ -39,9 +39,24 @@ export declare class Geometry {
     userData: Record<string, unknown>;
     constructor(props: GeometryProps);
     getVertexCount(): number;
+    /**
+     * Return an object with all attributes plus indices added as a field.
+     * TODO Geometry types are a mess
+     */
     getAttributes(): GeometryAttributes;
     _print(attributeName: string): string;
+    /**
+     * 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: Record<string, GeometryAttribute>, indices: any): this;
-    _calculateVertexCount(attributes: any, indices: any): number;
+    _calculateVertexCount(attributes: GeometryAttributes, indices: GeometryAttribute): number;
 }
 //# sourceMappingURL=geometry.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"geometry.d.ts","sourceRoot":"","sources":["../../src/geometry/geometry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,iBAAiB,EAAE,UAAU,EAAC,MAAM,eAAe,CAAC;AAGjE,MAAM,MAAM,aAAa,GAAG;IAC1B,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,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,GAAG,UAAU,CAAC,CAAC;IAC5D,OAAO,CAAC,EAAE,iBAAiB,GAAG,UAAU,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,MAAM,EAAE,iBAAiB,CAAC;IAC1B,UAAU,EAAE,iBAAiB,CAAC;IAC9B,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAC5B,OAAO,CAAC,EAAE;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,WAAW,GAAG,WAAW,CAAA;KAAC,CAAC;CAC7D,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,UAAU,CAAC;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAEF,qBAAa,QAAQ;IACnB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,oEAAoE;IACpE,QAAQ,CAAC,QAAQ,CAAC,EAAE,iBAAiB,CAAC;IACtC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,WAAW,CAAC;IAC7C,QAAQ,CAAC,UAAU,EAAE;QACnB,QAAQ,EAAE,iBAAiB,CAAC;QAC5B,MAAM,EAAE,iBAAiB,CAAC;QAC1B,UAAU,EAAE,iBAAiB,CAAC;QAC9B,OAAO,CAAC,EAAE,iBAAiB,CAAC;QAC5B,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS,CAAC;KAC9C,CAAC;IAEF,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM;gBAE3B,KAAK,EAAE,aAAa;IAiDhC,cAAc,IAAI,MAAM;IAKxB,aAAa,IAAI,kBAAkB;IAOnC,MAAM,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM;IASrC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAE,OAAO,EAAE,GAAG,GAAG,IAAI;IAIjF,qBAAqB,CAAC,UAAU,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,GAAG,MAAM;CAgB7D"}
+{"version":3,"file":"geometry.d.ts","sourceRoot":"","sources":["../../src/geometry/geometry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,iBAAiB,EAAE,UAAU,EAAC,MAAM,eAAe,CAAC;AAGjE,MAAM,MAAM,aAAa,GAAG;IAC1B,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,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,GAAG,UAAU,CAAC,CAAC;IAC5D,OAAO,CAAC,EAAE,iBAAiB,GAAG,UAAU,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,MAAM,EAAE,iBAAiB,CAAC;IAC1B,UAAU,EAAE,iBAAiB,CAAC;IAC9B,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAC5B,OAAO,CAAC,EAAE,iBAAiB,GAAG;QAAC,IAAI,EAAE,CAAC,CAAC;QAAC,KAAK,EAAE,WAAW,GAAG,WAAW,CAAA;KAAC,CAAC;CAC3E,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,UAAU,CAAC;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAEF,qBAAa,QAAQ;IACnB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,oEAAoE;IACpE,QAAQ,CAAC,QAAQ,CAAC,EAAE,iBAAiB,CAAC;IACtC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,OAAO,CAAC,EAAE,iBAAiB,CAAC;IACrC,QAAQ,CAAC,UAAU,EAAE;QACnB,QAAQ,EAAE,iBAAiB,CAAC;QAC5B,MAAM,EAAE,iBAAiB,CAAC;QAC1B,UAAU,EAAE,iBAAiB,CAAC;QAC9B,OAAO,CAAC,EAAE,iBAAiB,CAAC;QAC5B,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS,CAAC;KAC9C,CAAC;IAEF,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM;gBAE3B,KAAK,EAAE,aAAa;IA6ChC,cAAc,IAAI,MAAM;IAIxB;;;OAGG;IACH,aAAa,IAAI,kBAAkB;IAMnC,MAAM,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM;IAIrC;;;;;;;;;;OAUG;IACH,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAE,OAAO,EAAE,GAAG,GAAG,IAAI;IAIjF,qBAAqB,CAAC,UAAU,EAAE,kBAAkB,EAAE,OAAO,EAAE,iBAAiB,GAAG,MAAM;CAe1F"}

package/dist/geometry/geometry.js

@@ -63,8 +63,7 @@ export class Geometry {
       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,

package/dist/geometry/geometry.js.map

@@ -1 +1 @@
-{"version":3,"file":"geometry.js","names":["uid","assert","Geometry","constructor","props","_defineProperty","attributes","indices","vertexCount","id","topology","ArrayBuffer","isView","value","size","attributeName","attributeValue","Object","entries","attribute","concat","_print","isIndexed","undefined","assign","_calculateVertexCount","getVertexCount","getAttributes","_setAttributes","length","Infinity","constant","Math","min","Number","isFinite"],"sources":["../../src/geometry/geometry.ts"],"sourcesContent":["// luma.gl, MIT license\nimport type {PrimitiveTopology, TypedArray} from '@luma.gl/core';\nimport {uid, assert} from '@luma.gl/core';\n\nexport type GeometryProps = {\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  attributes?: Record<string, GeometryAttribute | TypedArray>;\n  indices?: GeometryAttribute | TypedArray;\n};\n\nexport type GeometryAttributes = {\n  POSITION: GeometryAttribute;\n  NORMAL: GeometryAttribute;\n  TEXCOORD_0: GeometryAttribute;\n  COLOR_0?: GeometryAttribute;\n  indices?: {size?: number; value: Uint32Array | Uint16Array};\n};\n\nexport type GeometryAttribute = {\n  size?: number;\n  value: TypedArray;\n  [key: string]: any;\n};\n\nexport class Geometry {\n  readonly id: string;\n  /** Determines how vertices are read from the 'vertex' attributes */\n  readonly topology?: PrimitiveTopology;\n  readonly vertexCount: number;\n  readonly indices?: Uint16Array | Uint32Array;\n  readonly attributes: {\n    POSITION: GeometryAttribute;\n    NORMAL: GeometryAttribute;\n    TEXCOORD_0: GeometryAttribute;\n    COLOR_0?: GeometryAttribute;\n    [key: string]: GeometryAttribute | undefined;\n  };\n\n  userData: Record<string, unknown> = {};\n\n  constructor(props: GeometryProps) {\n    const {attributes = {}, indices = null, vertexCount = null} = props;\n\n    this.id = props.id || uid('geometry');\n    this.topology = props.topology;\n\n    if (indices) {\n      // @ts-expect-error\n      this.indices = ArrayBuffer.isView(indices) ? {value: indices, size: 1} : indices;\n    }\n\n    // @ts-expect-error\n    this.attributes = {};\n\n    for (const [attributeName, attributeValue] of Object.entries(attributes)) {\n      // Wrap \"unwrapped\" arrays and try to autodetect their type\n      const attribute: GeometryAttribute = ArrayBuffer.isView(attributeValue)\n        ? {value: attributeValue}\n        : attributeValue;\n\n      assert(\n        ArrayBuffer.isView(attribute.value),\n        `${this._print(attributeName)}: must be typed array or object with value as typed array`\n      );\n\n      if ((attributeName === 'POSITION' || attributeName === 'positions') && !attribute.size) {\n        attribute.size = 3;\n      }\n\n      // Move indices to separate field\n      if (attributeName === 'indices') {\n        assert(!this.indices);\n        // @ts-expect-error\n        this.indices = attribute;\n      } else {\n        this.attributes[attributeName] = attribute;\n      }\n    }\n\n    // @ts-expect-error\n    if (this.indices && this.indices.isIndexed !== undefined) {\n      this.indices = Object.assign({}, this.indices);\n      // @ts-expect-error\n      delete this.indices.isIndexed;\n    }\n\n    this.vertexCount = vertexCount || this._calculateVertexCount(this.attributes, this.indices);\n  }\n\n  getVertexCount(): number {\n    return this.vertexCount;\n  }\n\n  // Return an object with all attributes plus indices added as a field.\n  getAttributes(): GeometryAttributes {\n    // @ts-expect-error Geometry types are a mess\n    return this.indices ? {indices: this.indices, ...this.attributes} : this.attributes;\n  }\n\n  // PRIVATE\n\n  _print(attributeName: string): string {\n    return `Geometry ${this.id} attribute ${attributeName}`;\n  }\n\n  // GeometryAttribute\n  // value: typed array\n  // type: indices, vertices, uvs\n  // size: elements per vertex\n  // target: WebGL buffer type (string or constant)\n  _setAttributes(attributes: Record<string, GeometryAttribute>, indices: any): this {\n    return this;\n  }\n\n  _calculateVertexCount(attributes: any, indices: any): number {\n    if (indices) {\n      return indices.value.length;\n    }\n    let vertexCount = Infinity;\n    for (const attributeName in attributes) {\n      const attribute = attributes[attributeName];\n      const {value, size, constant} = attribute;\n      if (!constant && value && size >= 1) {\n        vertexCount = Math.min(vertexCount, value.length / size);\n      }\n    }\n\n    assert(Number.isFinite(vertexCount));\n    return vertexCount;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"geometry.js","names":["uid","assert","Geometry","constructor","props","_defineProperty","attributes","indices","vertexCount","id","topology","ArrayBuffer","isView","value","size","attributeName","attributeValue","Object","entries","attribute","concat","_print","isIndexed","undefined","assign","_calculateVertexCount","getVertexCount","getAttributes","_setAttributes","length","Infinity","values","constant","Math","min","Number","isFinite"],"sources":["../../src/geometry/geometry.ts"],"sourcesContent":["// luma.gl, MIT license\nimport type {PrimitiveTopology, TypedArray} from '@luma.gl/core';\nimport {uid, assert} from '@luma.gl/core';\n\nexport type GeometryProps = {\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  attributes?: Record<string, GeometryAttribute | TypedArray>;\n  indices?: GeometryAttribute | TypedArray;\n};\n\nexport type GeometryAttributes = {\n  POSITION: GeometryAttribute;\n  NORMAL: GeometryAttribute;\n  TEXCOORD_0: GeometryAttribute;\n  COLOR_0?: GeometryAttribute;\n  indices?: GeometryAttribute & {size: 1; value: Uint32Array | Uint16Array};\n};\n\nexport type GeometryAttribute = {\n  size?: number;\n  value: TypedArray;\n  [key: string]: any;\n};\n\nexport class Geometry {\n  readonly id: string;\n  /** Determines how vertices are read from the 'vertex' attributes */\n  readonly topology?: PrimitiveTopology;\n  readonly vertexCount: number;\n  readonly indices?: GeometryAttribute;\n  readonly attributes: {\n    POSITION: GeometryAttribute;\n    NORMAL: GeometryAttribute;\n    TEXCOORD_0: GeometryAttribute;\n    COLOR_0?: GeometryAttribute;\n    [key: string]: GeometryAttribute | undefined;\n  };\n\n  userData: Record<string, unknown> = {};\n\n  constructor(props: GeometryProps) {\n    const {attributes = {}, indices = null, vertexCount = null} = props;\n\n    this.id = props.id || uid('geometry');\n    this.topology = props.topology;\n\n    if (indices) {\n      this.indices = ArrayBuffer.isView(indices) ? {value: indices, size: 1} : indices;\n    }\n\n    // @ts-expect-error\n    this.attributes = {};\n\n    for (const [attributeName, attributeValue] of Object.entries(attributes)) {\n      // Wrap \"unwrapped\" arrays and try to autodetect their type\n      const attribute: GeometryAttribute = ArrayBuffer.isView(attributeValue)\n        ? {value: attributeValue}\n        : attributeValue;\n\n      assert(\n        ArrayBuffer.isView(attribute.value),\n        `${this._print(attributeName)}: must be typed array or object with value as typed array`\n      );\n\n      if ((attributeName === 'POSITION' || attributeName === 'positions') && !attribute.size) {\n        attribute.size = 3;\n      }\n\n      // Move indices to separate field\n      if (attributeName === 'indices') {\n        assert(!this.indices);\n        this.indices = attribute;\n      } else {\n        this.attributes[attributeName] = attribute;\n      }\n    }\n\n    if (this.indices && this.indices.isIndexed !== undefined) {\n      this.indices = Object.assign({}, this.indices);\n      delete this.indices.isIndexed;\n    }\n\n    this.vertexCount = vertexCount || this._calculateVertexCount(this.attributes, this.indices);\n  }\n\n  getVertexCount(): number {\n    return this.vertexCount;\n  }\n\n  /** \n   * Return an object with all attributes plus indices added as a field.\n   * TODO Geometry types are a mess\n   */\n  getAttributes(): GeometryAttributes {\n    return this.indices ? {indices: this.indices, ...this.attributes} : this.attributes;\n  }\n\n  // PRIVATE\n\n  _print(attributeName: string): string {\n    return `Geometry ${this.id} attribute ${attributeName}`;\n  }\n\n  /**\n   * GeometryAttribute\n   * value: typed array\n   * type: indices, vertices, uvs\n   * size: elements per vertex\n   * target: WebGL buffer type (string or constant)\n   * \n   * @param attributes \n   * @param indices \n   * @returns \n   */\n  _setAttributes(attributes: Record<string, GeometryAttribute>, indices: any): this {\n    return this;\n  }\n\n  _calculateVertexCount(attributes: GeometryAttributes, indices: GeometryAttribute): number {\n    if (indices) {\n      return indices.value.length;\n    }\n    let vertexCount = Infinity;\n    for (const attribute of Object.values(attributes)) {\n      const {value, size, constant} = attribute;\n      if (!constant && value && size >= 1) {\n        vertexCount = Math.min(vertexCount, value.length / size);\n      }\n    }\n\n    assert(Number.isFinite(vertexCount));\n    return vertexCount;\n  }\n}\n"],"mappings":"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"}

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

@@ -6,15 +6,15 @@ export type GPUGeometryProps = {
     /** Determines how vertices are read from the 'vertex' attributes */
     topology: 'point-list' | 'line-list' | 'line-strip' | 'line-loop-webgl' | 'triangle-list' | 'triangle-strip' | 'triangle-fan-webgl';
     /** Auto calculated from attributes if not provided */
-    vertexCount?: number;
-    bufferLayout?: BufferLayout[];
+    vertexCount: number;
+    bufferLayout: BufferLayout[];
     indices?: Buffer | null;
     attributes: GPUGeometryAttributes;
 };
 export type GPUGeometryAttributes = {
     positions: Buffer;
-    normals: Buffer;
-    texCoords: Buffer;
+    normals?: Buffer;
+    texCoords?: Buffer;
     colors?: Buffer;
 };
 export declare class GPUGeometry {
@@ -27,8 +27,8 @@ export declare class GPUGeometry {
     readonly indices?: Buffer | null;
     readonly attributes: {
         positions: Buffer;
-        normals: Buffer;
-        texCoords: Buffer;
+        normals?: Buffer;
+        texCoords?: Buffer;
         colors?: Buffer;
     };
     constructor(props: GPUGeometryProps);
@@ -40,6 +40,9 @@ export declare class GPUGeometry {
 }
 export declare function makeGPUGeometry(device: Device, geometry: Geometry | GPUGeometry): GPUGeometry;
 export declare function getIndexBufferFromGeometry(device: Device, geometry: Geometry): Buffer | undefined;
-export declare function getAttributeBuffersFromGeometry(device: Device, geometry: Geometry): GPUGeometryAttributes;
-export declare function mapAttributeName(name: string): string;
+export declare function getAttributeBuffersFromGeometry(device: Device, geometry: Geometry): {
+    attributes: GPUGeometryAttributes;
+    bufferLayout: BufferLayout[];
+    vertexCount: number;
+};
 //# sourceMappingURL=gpu-geometry.d.ts.map

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,EAAc,MAAM,eAAe,CAAC;AAC1D,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,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,YAAY,EAAE,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,qBAAqB,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,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;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;QAClB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;gBAEU,KAAK,EAAE,gBAAgB;IA6BnC,OAAO,IAAI,IAAI;IAQf,cAAc,IAAI,MAAM;IAIxB,aAAa,IAAI,qBAAqB;IAItC,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,CAa7F;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,MAAM,GAAG,SAAS,CAYjG;AAED,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,qBAAqB,CAYzG;AAYD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAGrD"}
+{"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,EAAc,MAAM,eAAe,CAAC;AAC1D,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,qBAAqB,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,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;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;gBAEU,KAAK,EAAE,gBAAgB;IA6BnC,OAAO,IAAI,IAAI;IAQf,cAAc,IAAI,MAAM;IAIxB,aAAa,IAAI,qBAAqB;IAItC,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,CAWjG;AAED,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,GACjB;IAAC,UAAU,EAAE,qBAAqB,CAAC;IAAC,YAAY,EAAE,YAAY,EAAE,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAC,CAuBxF"}

package/dist/geometry/gpu-geometry.js

@@ -13,7 +13,7 @@ export class GPUGeometry {
     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({
@@ -21,19 +21,19 @@ export class GPUGeometry {
         format: 'float32x3'
       });
     }
-    if (!this.bufferLayout.find(layout => layout.name === 'normals')) {
+    if (this.attributes.normals && !this.bufferLayout.find(layout => layout.name === 'normals')) {
       this.bufferLayout.push({
         name: 'normals',
         format: 'float32x3'
       });
     }
-    if (!this.bufferLayout.find(layout => layout.name === 'texCoords')) {
+    if (this.attributes.texCoords && !this.bufferLayout.find(layout => layout.name === 'texCoords')) {
       this.bufferLayout.push({
         name: 'texCoords',
         format: 'float32x2'
       });
     }
-    if (!this.bufferLayout.find(layout => layout.name === 'colors')) {
+    if (this.attributes.colors && !this.bufferLayout.find(layout => layout.name === 'colors')) {
       this.bufferLayout.push({
         name: 'colors',
         format: 'float32x3'
@@ -70,9 +70,13 @@ export 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
@@ -82,7 +86,7 @@ export function getIndexBufferFromGeometry(device, geometry) {
   if (!geometry.indices) {
     return undefined;
   }
-  const data = geometry.indices.value || geometry.indices;
+  const data = geometry.indices.value;
   assert(data instanceof Uint16Array || data instanceof Uint32Array, 'attribute array for "indices" must be of integer type');
   return device.createBuffer({
     usage: Buffer.INDEX,
@@ -93,31 +97,41 @@ export 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 = {
+  const attributes = {
     positions: device.createBuffer({
       data: positions.value,
       id: 'positions-buffer'
-    }),
-    normals: device.createBuffer({
+    })
+  };
+  const bufferLayout = [{
+    name: 'positions',
+    format: "float32x".concat(positions.size)
+  }];
+  if (normals) {
+    attributes.normals = device.createBuffer({
       data: normals.value,
       id: 'normals-buffer'
-    }),
-    texCoords: device.createBuffer({
+    });
+    bufferLayout.push({
+      name: 'normals',
+      format: "float32x".concat(normals.size)
+    });
+  }
+  if (texCoords) {
+    attributes.texCoords = device.createBuffer({
       data: texCoords.value,
       id: 'texCoords-buffer'
-    })
+    });
+    bufferLayout.push({
+      name: 'texCoords',
+      format: "float32x".concat(texCoords.size)
+    });
+  }
+  const vertexCount = geometry._calculateVertexCount(geometry.attributes, geometry.indices);
+  return {
+    attributes,
+    bufferLayout,
+    vertexCount
   };
-  return buffers;
-}
-const GLTF_TO_LUMA_ATTRIBUTE_MAP = {
-  POSITION: 'positions',
-  NORMAL: 'normals',
-  COLOR_0: 'colors',
-  TEXCOORD_0: 'texCoords',
-  TEXCOORD_1: 'texCoords1',
-  TEXCOORD_2: 'texCoords2'
-};
-export function mapAttributeName(name) {
-  return GLTF_TO_LUMA_ATTRIBUTE_MAP[name] || name;
 }
 //# sourceMappingURL=gpu-geometry.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"gpu-geometry.js","names":["Buffer","uid","assert","GPUGeometry","constructor","props","_defineProperty","id","topology","indices","attributes","vertexCount","_calculateVertexCount","positions","bufferLayout","find","layout","name","push","format","usage","INDEX","destroy","_this$attributes$colo","normals","texCoords","colors","getVertexCount","getAttributes","getIndexes","byteLength","makeGPUGeometry","device","geometry","getIndexBufferFromGeometry","getAttributeBuffersFromGeometry","undefined","data","value","Uint16Array","Uint32Array","createBuffer","POSITION","NORMAL","TEXCOORD_0","buffers","GLTF_TO_LUMA_ATTRIBUTE_MAP","COLOR_0","TEXCOORD_1","TEXCOORD_2","mapAttributeName"],"sources":["../../src/geometry/gpu-geometry.ts"],"sourcesContent":["import type {PrimitiveTopology, BufferLayout} from '@luma.gl/core';\nimport {Device, Buffer, uid, assert} 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: GPUGeometryAttributes;\n};\n\nexport type GPUGeometryAttributes = {\n  positions: Buffer;\n  normals: Buffer;\n  texCoords: Buffer;\n  colors?: 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: {\n    positions: Buffer;\n    normals: Buffer;\n    texCoords: Buffer;\n    colors?: Buffer;\n  };\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    // \n    this.vertexCount = props.vertexCount || this._calculateVertexCount(this.attributes.positions);\n\n    // Populate default bufferLayout\n    this.bufferLayout = props.bufferLayout || [];\n    if (!this.bufferLayout.find(layout => layout.name === 'positions')) {\n      this.bufferLayout.push({name: 'positions', format: 'float32x3'});\n    }\n    if (!this.bufferLayout.find(layout => layout.name === 'normals')) {\n      this.bufferLayout.push({name: 'normals', format: 'float32x3'});\n    }\n    if (!this.bufferLayout.find(layout => layout.name === 'texCoords')) {\n      this.bufferLayout.push({name: 'texCoords', format: 'float32x2'});\n    }\n    if (!this.bufferLayout.find(layout => layout.name === 'colors')) {\n      this.bufferLayout.push({name: 'colors', format: 'float32x3'});\n    }\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(): GPUGeometryAttributes {\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 = getAttributeBuffersFromGeometry(device, geometry);\n  return new GPUGeometry({\n    topology: geometry.topology, \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\n  // @ts-expect-error\n  const data = geometry.indices.value || geometry.indices;\n  assert(\n    data instanceof Uint16Array || data instanceof Uint32Array,\n    'attribute array for \"indices\" must be of integer type'\n  );\n  return device.createBuffer({usage: Buffer.INDEX, data});\n}\n\nexport function getAttributeBuffersFromGeometry(device: Device, geometry: Geometry): GPUGeometryAttributes {\n  const positions = geometry.attributes.positions || geometry.attributes.POSITION;\n  const normals = geometry.attributes.normals || geometry.attributes.NORMAL;\n  const texCoords = geometry.attributes.texCoords || geometry.attributes.TEXCOORD_0;\n\n  const buffers: GPUGeometryAttributes = {\n    positions: device.createBuffer({data: positions.value, id: 'positions-buffer'}),\n    normals: device.createBuffer({data: normals.value, id: 'normals-buffer'}),\n    texCoords: device.createBuffer({data: texCoords.value, id: 'texCoords-buffer'})\n  };\n\n  return buffers;\n}\n\n// Support for mapping new geometries with glTF attribute names to \"classic\" luma.gl shader names\nconst GLTF_TO_LUMA_ATTRIBUTE_MAP = {\n  POSITION: 'positions',\n  NORMAL: 'normals',\n  COLOR_0: 'colors',\n  TEXCOORD_0: 'texCoords',\n  TEXCOORD_1: 'texCoords1',\n  TEXCOORD_2: 'texCoords2'\n};\n\nexport function mapAttributeName(name: string): string {\n  // @ts-ignore-error\n  return GLTF_TO_LUMA_ATTRIBUTE_MAP[name] || name;\n}\n"],"mappings":"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"}
+{"version":3,"file":"gpu-geometry.js","names":["Buffer","uid","assert","GPUGeometry","constructor","props","_defineProperty","id","topology","indices","attributes","vertexCount","bufferLayout","find","layout","name","push","format","normals","texCoords","colors","usage","INDEX","destroy","_this$attributes$colo","positions","getVertexCount","getAttributes","getIndexes","_calculateVertexCount","byteLength","makeGPUGeometry","device","geometry","getIndexBufferFromGeometry","getAttributeBuffersFromGeometry","undefined","data","value","Uint16Array","Uint32Array","createBuffer","POSITION","NORMAL","TEXCOORD_0","concat","size"],"sources":["../../src/geometry/gpu-geometry.ts"],"sourcesContent":["import type {PrimitiveTopology, BufferLayout} from '@luma.gl/core';\nimport {Device, Buffer, uid, assert} 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: GPUGeometryAttributes;\n};\n\nexport type GPUGeometryAttributes = {\n  positions: Buffer;\n  normals?: Buffer;\n  texCoords?: Buffer;\n  colors?: 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: {\n    positions: Buffer;\n    normals?: Buffer;\n    texCoords?: Buffer;\n    colors?: Buffer;\n  };\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    //\n    this.vertexCount = props.vertexCount;\n\n    // Populate default bufferLayout\n    this.bufferLayout = props.bufferLayout || [];\n    if (!this.bufferLayout.find(layout => layout.name === 'positions')) {\n      this.bufferLayout.push({name: 'positions', format: 'float32x3'});\n    }\n    if (this.attributes.normals && !this.bufferLayout.find(layout => layout.name === 'normals')) {\n      this.bufferLayout.push({name: 'normals', format: 'float32x3'});\n    }\n    if (this.attributes.texCoords && !this.bufferLayout.find(layout => layout.name === 'texCoords')) {\n      this.bufferLayout.push({name: 'texCoords', format: 'float32x2'});\n    }\n    if (this.attributes.colors && !this.bufferLayout.find(layout => layout.name === 'colors')) {\n      this.bufferLayout.push({name: 'colors', format: 'float32x3'});\n    }\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(): GPUGeometryAttributes {\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\n  const data = geometry.indices.value;\n  assert(\n    data instanceof Uint16Array || data instanceof Uint32Array,\n    'attribute array for \"indices\" must be of integer type'\n  );\n  return device.createBuffer({usage: Buffer.INDEX, data});\n}\n\nexport function getAttributeBuffersFromGeometry(\n  device: Device,\n  geometry: Geometry\n): {attributes: GPUGeometryAttributes, bufferLayout: BufferLayout[], vertexCount: number} {\n  const positions = geometry.attributes.positions || geometry.attributes.POSITION;\n  const normals = geometry.attributes.normals || geometry.attributes.NORMAL;\n  const texCoords = geometry.attributes.texCoords || geometry.attributes.TEXCOORD_0;\n\n  const attributes: GPUGeometryAttributes = {\n    positions: device.createBuffer({data: positions.value, id: 'positions-buffer'})\n  };\n  const bufferLayout: BufferLayout[] = [\n    {name: 'positions', format: `float32x${positions.size as 2 | 3 | 4}`}\n  ];\n  if (normals) {\n    attributes.normals = device.createBuffer({data: normals.value, id: 'normals-buffer'});\n    bufferLayout.push({name: 'normals', format: `float32x${normals.size as 2 | 3 | 4}`});\n  }\n  if (texCoords) {\n    attributes.texCoords = device.createBuffer({data: texCoords.value, id: 'texCoords-buffer'});\n    bufferLayout.push({name: 'texCoords', format: `float32x${texCoords.size as 2 | 3 | 4}`});\n  }\n\n  const vertexCount = geometry._calculateVertexCount(geometry.attributes, geometry.indices)\n\n  return {attributes, bufferLayout, vertexCount};\n}\n"],"mappings":"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"}