@loaders.gl/obj 4.0.0-alpha.4 → 4.0.0-alpha.6

package/src/lib/parse-obj.ts

@@ -1,525 +1,84 @@
-// OBJ Loader, adapted from THREE.js (MIT license)
-//
-// Attributions per original THREE.js source file:
-//
-// @author mrdoob / http://mrdoob.com/
-
-// @ts-nocheck
-
-// o object_name | g group_name
-const OBJECT_RE = /^[og]\s*(.+)?/;
-// mtllib file_reference
-const MATERIAL_RE = /^mtllib /;
-// usemtl material_name
-const MATERIAL_USE_RE = /^usemtl /;
-
-class MeshMaterial {
-  constructor({index, name = '', mtllib, smooth, groupStart}) {
-    this.index = index;
-    this.name = name;
-    this.mtllib = mtllib;
-    this.smooth = smooth;
-    this.groupStart = groupStart;
-    this.groupEnd = -1;
-    this.groupCount = -1;
-    this.inherited = false;
-  }
-
-  clone(index = this.index) {
-    return new MeshMaterial({
-      index,
-      name: this.name,
-      mtllib: this.mtllib,
-      smooth: this.smooth,
-      groupStart: 0
-    });
-  }
+import type {Mesh, MeshAttributes} from '@loaders.gl/schema';
+import {getMeshBoundingBox} from '@loaders.gl/schema';
+import {parseOBJMeshes} from './parse-obj-meshes';
+import {getOBJSchema} from './get-obj-schema';
+
+export function parseOBJ(text, options): Mesh {
+  const {meshes} = parseOBJMeshes(text);
+
+  // @ts-expect-error
+  const vertexCount = meshes.reduce((s, mesh) => s + mesh.header.vertexCount, 0);
+  // TODO - render objects separately
+  const attributes = mergeAttributes(meshes, vertexCount);
+
+  const header = {
+    vertexCount,
+    // @ts-ignore Need to export Attributes type
+    boundingBox: getMeshBoundingBox(attributes)
+  };
+
+  const schema = getOBJSchema(attributes, {
+    mode: 4,
+    boundingBox: header.boundingBox
+  });
+
+  return {
+    // Data return by this loader implementation
+    loaderData: {
+      header: {}
+    },
+
+    // Normalised data
+    schema,
+    header,
+    mode: 4, // TRIANGLES
+    topology: 'point-list',
+
+    attributes
+  };
 }
 
-class MeshObject {
-  constructor(name = '') {
-    this.name = name;
-
-    this.geometry = {
-      vertices: [],
-      normals: [],
-      colors: [],
-      uvs: []
-    };
+// eslint-disable-next-line max-statements
+function mergeAttributes(meshes, vertexCount): MeshAttributes {
+  const positions = new Float32Array(vertexCount * 3);
+  let normals;
+  let colors;
+  let uvs;
+  let i = 0;
 
-    this.materials = [];
-    this.smooth = true;
-
-    this.fromDeclaration = null;
-  }
+  for (const mesh of meshes) {
+    const {POSITION, NORMAL, COLOR_0, TEXCOORD_0} = mesh.attributes;
 
-  startMaterial(name, libraries) {
-    const previous = this._finalize(false);
+    positions.set(POSITION.value, i * 3);
 
-    // New usemtl declaration overwrites an inherited material, except if faces were declared
-    // after the material, then it must be preserved for proper MultiMaterial continuation.
-    if (previous && (previous.inherited || previous.groupCount <= 0)) {
-      this.materials.splice(previous.index, 1);
+    if (NORMAL) {
+      normals = normals || new Float32Array(vertexCount * 3);
+      normals.set(NORMAL.value, i * 3);
     }
-
-    const material = new MeshMaterial({
-      index: this.materials.length,
-      name,
-      mtllib:
-        Array.isArray(libraries) && libraries.length > 0 ? libraries[libraries.length - 1] : '',
-      smooth: previous !== undefined ? previous.smooth : this.smooth,
-      groupStart: previous !== undefined ? previous.groupEnd : 0
-    });
-
-    this.materials.push(material);
-
-    return material;
-  }
-
-  currentMaterial() {
-    if (this.materials.length > 0) {
-      return this.materials[this.materials.length - 1];
+    if (COLOR_0) {
+      colors = colors || new Float32Array(vertexCount * 3);
+      colors.set(COLOR_0.value, i * 3);
     }
-
-    return undefined;
-  }
-
-  _finalize(end) {
-    const lastMultiMaterial = this.currentMaterial();
-    if (lastMultiMaterial && lastMultiMaterial.groupEnd === -1) {
-      lastMultiMaterial.groupEnd = this.geometry.vertices.length / 3;
-      lastMultiMaterial.groupCount = lastMultiMaterial.groupEnd - lastMultiMaterial.groupStart;
-      lastMultiMaterial.inherited = false;
+    if (TEXCOORD_0) {
+      uvs = uvs || new Float32Array(vertexCount * 2);
+      uvs.set(TEXCOORD_0.value, i * 2);
     }
 
-    // Ignore objects tail materials if no face declarations followed them before a new o/g started.
-    if (end && this.materials.length > 1) {
-      for (let mi = this.materials.length - 1; mi >= 0; mi--) {
-        if (this.materials[mi].groupCount <= 0) {
-          this.materials.splice(mi, 1);
-        }
-      }
-    }
-
-    // Guarantee at least one empty material, this makes the creation later more straight forward.
-    if (end && this.materials.length === 0) {
-      this.materials.push({
-        name: '',
-        smooth: this.smooth
-      });
-    }
-
-    return lastMultiMaterial;
+    i += POSITION.value.length / 3;
   }
-}
-
-class ParserState {
-  constructor() {
-    this.objects = [];
-    this.object = null;
 
-    this.vertices = [];
-    this.normals = [];
-    this.colors = [];
-    this.uvs = [];
+  const attributes: MeshAttributes = {};
+  attributes.POSITION = {value: positions, size: 3};
 
-    this.materialLibraries = [];
-
-    this.startObject('', false);
+  if (normals) {
+    attributes.NORMAL = {value: normals, size: 3};
   }
-
-  startObject(name, fromDeclaration = true) {
-    // If the current object (initial from reset) is not from a g/o declaration in the parsed
-    // file. We need to use it for the first parsed g/o to keep things in sync.
-    if (this.object && !this.object.fromDeclaration) {
-      this.object.name = name;
-      this.object.fromDeclaration = fromDeclaration;
-      return;
-    }
-
-    const previousMaterial =
-      this.object && typeof this.object.currentMaterial === 'function'
-        ? this.object.currentMaterial()
-        : undefined;
-
-    if (this.object && typeof this.object._finalize === 'function') {
-      this.object._finalize(true);
-    }
-
-    this.object = new MeshObject(name);
-    this.object.fromDeclaration = fromDeclaration;
-
-    // Inherit previous objects material.
-    // Spec tells us that a declared material must be set to all objects until a new material is declared.
-    // If a usemtl declaration is encountered while this new object is being parsed, it will
-    // overwrite the inherited material. Exception being that there was already face declarations
-    // to the inherited material, then it will be preserved for proper MultiMaterial continuation.
-    if (previousMaterial && previousMaterial.name && typeof previousMaterial.clone === 'function') {
-      const declared = previousMaterial.clone(0);
-      declared.inherited = true;
-      this.object.materials.push(declared);
-    }
-
-    this.objects.push(this.object);
+  if (colors) {
+    attributes.COLOR_0 = {value: colors, size: 3};
   }
-
-  finalize() {
-    if (this.object && typeof this.object._finalize === 'function') {
-      this.object._finalize(true);
-    }
+  if (uvs) {
+    attributes.TEXCOORD_0 = {value: uvs, size: 2};
   }
 
-  parseVertexIndex(value, len) {
-    const index = parseInt(value);
-    return (index >= 0 ? index - 1 : index + len / 3) * 3;
-  }
-
-  parseNormalIndex(value, len) {
-    const index = parseInt(value);
-    return (index >= 0 ? index - 1 : index + len / 3) * 3;
-  }
-
-  parseUVIndex(value, len) {
-    const index = parseInt(value);
-    return (index >= 0 ? index - 1 : index + len / 2) * 2;
-  }
-
-  addVertex(a, b, c) {
-    const src = this.vertices;
-    const dst = this.object.geometry.vertices;
-
-    dst.push(src[a + 0], src[a + 1], src[a + 2]);
-    dst.push(src[b + 0], src[b + 1], src[b + 2]);
-    dst.push(src[c + 0], src[c + 1], src[c + 2]);
-  }
-
-  addVertexPoint(a) {
-    const src = this.vertices;
-    const dst = this.object.geometry.vertices;
-
-    dst.push(src[a + 0], src[a + 1], src[a + 2]);
-  }
-
-  addVertexLine(a) {
-    const src = this.vertices;
-    const dst = this.object.geometry.vertices;
-
-    dst.push(src[a + 0], src[a + 1], src[a + 2]);
-  }
-
-  addNormal(a, b, c) {
-    const src = this.normals;
-    const dst = this.object.geometry.normals;
-
-    dst.push(src[a + 0], src[a + 1], src[a + 2]);
-    dst.push(src[b + 0], src[b + 1], src[b + 2]);
-    dst.push(src[c + 0], src[c + 1], src[c + 2]);
-  }
-
-  addColor(a, b, c) {
-    const src = this.colors;
-    const dst = this.object.geometry.colors;
-
-    dst.push(src[a + 0], src[a + 1], src[a + 2]);
-    dst.push(src[b + 0], src[b + 1], src[b + 2]);
-    dst.push(src[c + 0], src[c + 1], src[c + 2]);
-  }
-
-  addUV(a, b, c) {
-    const src = this.uvs;
-    const dst = this.object.geometry.uvs;
-
-    dst.push(src[a + 0], src[a + 1]);
-    dst.push(src[b + 0], src[b + 1]);
-    dst.push(src[c + 0], src[c + 1]);
-  }
-
-  addUVLine(a) {
-    const src = this.uvs;
-    const dst = this.object.geometry.uvs;
-
-    dst.push(src[a + 0], src[a + 1]);
-  }
-
-  // eslint-disable-next-line max-params
-  addFace(a, b, c, ua, ub, uc, na, nb, nc) {
-    const vLen = this.vertices.length;
-
-    let ia = this.parseVertexIndex(a, vLen);
-    let ib = this.parseVertexIndex(b, vLen);
-    let ic = this.parseVertexIndex(c, vLen);
-
-    this.addVertex(ia, ib, ic);
-
-    if (ua !== undefined && ua !== '') {
-      const uvLen = this.uvs.length;
-      ia = this.parseUVIndex(ua, uvLen);
-      ib = this.parseUVIndex(ub, uvLen);
-      ic = this.parseUVIndex(uc, uvLen);
-      this.addUV(ia, ib, ic);
-    }
-
-    if (na !== undefined && na !== '') {
-      // Normals are many times the same. If so, skip function call and parseInt.
-      const nLen = this.normals.length;
-      ia = this.parseNormalIndex(na, nLen);
-
-      ib = na === nb ? ia : this.parseNormalIndex(nb, nLen);
-      ic = na === nc ? ia : this.parseNormalIndex(nc, nLen);
-
-      this.addNormal(ia, ib, ic);
-    }
-
-    if (this.colors.length > 0) {
-      this.addColor(ia, ib, ic);
-    }
-  }
-
-  addPointGeometry(vertices) {
-    this.object.geometry.type = 'Points';
-
-    const vLen = this.vertices.length;
-
-    for (const vertex of vertices) {
-      this.addVertexPoint(this.parseVertexIndex(vertex, vLen));
-    }
-  }
-
-  addLineGeometry(vertices, uvs) {
-    this.object.geometry.type = 'Line';
-
-    const vLen = this.vertices.length;
-    const uvLen = this.uvs.length;
-
-    for (const vertex of vertices) {
-      this.addVertexLine(this.parseVertexIndex(vertex, vLen));
-    }
-
-    for (const uv of uvs) {
-      this.addUVLine(this.parseUVIndex(uv, uvLen));
-    }
-  }
+  return attributes;
 }
-
-// eslint-disable-next-line max-statements, complexity
-export default (text) => {
-  const state = new ParserState();
-
-  if (text.indexOf('\r\n') !== -1) {
-    // This is faster than String.split with regex that splits on both
-    text = text.replace(/\r\n/g, '\n');
-  }
-
-  if (text.indexOf('\\\n') !== -1) {
-    // join lines separated by a line continuation character (\)
-    text = text.replace(/\\\n/g, '');
-  }
-
-  const lines = text.split('\n');
-  let line = '';
-  let lineFirstChar = '';
-  let lineLength = 0;
-  let result = [];
-
-  // Faster to just trim left side of the line. Use if available.
-  const trimLeft = typeof ''.trimLeft === 'function';
-
-  /* eslint-disable no-continue, max-depth */
-  for (let i = 0, l = lines.length; i < l; i++) {
-    line = lines[i];
-    line = trimLeft ? line.trimLeft() : line.trim();
-    lineLength = line.length;
-
-    if (lineLength === 0) continue;
-
-    lineFirstChar = line.charAt(0);
-
-    // @todo invoke passed in handler if any
-    if (lineFirstChar === '#') continue;
-
-    if (lineFirstChar === 'v') {
-      const data = line.split(/\s+/);
-
-      switch (data[0]) {
-        case 'v':
-          state.vertices.push(parseFloat(data[1]), parseFloat(data[2]), parseFloat(data[3]));
-          if (data.length === 8) {
-            state.colors.push(parseFloat(data[4]), parseFloat(data[5]), parseFloat(data[6]));
-          }
-          break;
-        case 'vn':
-          state.normals.push(parseFloat(data[1]), parseFloat(data[2]), parseFloat(data[3]));
-          break;
-        case 'vt':
-          state.uvs.push(parseFloat(data[1]), parseFloat(data[2]));
-          break;
-        default:
-      }
-    } else if (lineFirstChar === 'f') {
-      const lineData = line.substr(1).trim();
-      const vertexData = lineData.split(/\s+/);
-      const faceVertices = [];
-
-      // Parse the face vertex data into an easy to work with format
-
-      for (let j = 0, jl = vertexData.length; j < jl; j++) {
-        const vertex = vertexData[j];
-
-        if (vertex.length > 0) {
-          const vertexParts = vertex.split('/');
-          faceVertices.push(vertexParts);
-        }
-      }
-
-      // Draw an edge between the first vertex and all subsequent vertices to form an n-gon
-
-      const v1 = faceVertices[0];
-
-      for (let j = 1, jl = faceVertices.length - 1; j < jl; j++) {
-        const v2 = faceVertices[j];
-        const v3 = faceVertices[j + 1];
-
-        state.addFace(v1[0], v2[0], v3[0], v1[1], v2[1], v3[1], v1[2], v2[2], v3[2]);
-      }
-    } else if (lineFirstChar === 'l') {
-      const lineParts = line.substring(1).trim().split(' ');
-      let lineVertices;
-      const lineUVs = [];
-
-      if (line.indexOf('/') === -1) {
-        lineVertices = lineParts;
-      } else {
-        lineVertices = [];
-        for (let li = 0, llen = lineParts.length; li < llen; li++) {
-          const parts = lineParts[li].split('/');
-
-          if (parts[0] !== '') lineVertices.push(parts[0]);
-          if (parts[1] !== '') lineUVs.push(parts[1]);
-        }
-      }
-      state.addLineGeometry(lineVertices, lineUVs);
-    } else if (lineFirstChar === 'p') {
-      const lineData = line.substr(1).trim();
-      const pointData = lineData.split(' ');
-
-      state.addPointGeometry(pointData);
-    } else if ((result = OBJECT_RE.exec(line)) !== null) {
-      // o object_name
-      // or
-      // g group_name
-
-      // WORKAROUND: https://bugs.chromium.org/p/v8/issues/detail?id=2869
-      // var name = result[ 0 ].substr( 1 ).trim();
-      const name = (' ' + result[0].substr(1).trim()).substr(1); // eslint-disable-line
-
-      state.startObject(name);
-    } else if (MATERIAL_USE_RE.test(line)) {
-      // material
-
-      state.object.startMaterial(line.substring(7).trim(), state.materialLibraries);
-    } else if (MATERIAL_RE.test(line)) {
-      // mtl file
-
-      state.materialLibraries.push(line.substring(7).trim());
-    } else if (lineFirstChar === 's') {
-      result = line.split(' ');
-
-      // smooth shading
-
-      // @todo Handle files that have varying smooth values for a set of faces inside one geometry,
-      // but does not define a usemtl for each face set.
-      // This should be detected and a dummy material created (later MultiMaterial and geometry groups).
-      // This requires some care to not create extra material on each smooth value for "normal" obj files.
-      // where explicit usemtl defines geometry groups.
-      // Example asset: examples/models/obj/cerberus/Cerberus.obj
-
-      /*
-       * http://paulbourke.net/dataformats/obj/
-       * or
-       * http://www.cs.utah.edu/~boulos/cs3505/obj_spec.pdf
-       *
-       * From chapter "Grouping" Syntax explanation "s group_number":
-       * "group_number is the smoothing group number. To turn off smoothing groups, use a value of 0 or off.
-       * Polygonal elements use group numbers to put elements in different smoothing groups. For free-form
-       * surfaces, smoothing groups are either turned on or off; there is no difference between values greater
-       * than 0."
-       */
-      if (result.length > 1) {
-        const value = result[1].trim().toLowerCase();
-        state.object.smooth = value !== '0' && value !== 'off';
-      } else {
-        // ZBrush can produce "s" lines #11707
-        state.object.smooth = true;
-      }
-      const material = state.object.currentMaterial();
-      if (material) material.smooth = state.object.smooth;
-    } else {
-      // Handle null terminated files without exception
-      if (line === '\0') continue;
-
-      throw new Error(`Unexpected line: "${line}"`);
-    }
-  }
-
-  state.finalize();
-
-  const meshes = [];
-  const materials = [];
-
-  for (const object of state.objects) {
-    const {geometry} = object;
-
-    // Skip o/g line declarations that did not follow with any faces
-    if (geometry.vertices.length === 0) continue;
-
-    const mesh = {
-      header: {
-        vertexCount: geometry.vertices.length / 3
-      },
-      attributes: {}
-    };
-
-    switch (geometry.type) {
-      case 'Points':
-        mesh.mode = 0; // GL.POINTS
-        break;
-      case 'Line':
-        mesh.mode = 1; // GL.LINES
-        break;
-      default:
-        mesh.mode = 4; // GL.TRIANGLES
-        break;
-    }
-
-    mesh.attributes.POSITION = {value: new Float32Array(geometry.vertices), size: 3};
-
-    if (geometry.normals.length > 0) {
-      mesh.attributes.NORMAL = {value: new Float32Array(geometry.normals), size: 3};
-    }
-
-    if (geometry.colors.length > 0) {
-      mesh.attributes.COLOR_0 = {value: new Float32Array(geometry.colors), size: 3};
-    }
-
-    if (geometry.uvs.length > 0) {
-      mesh.attributes.TEXCOORD_0 = {value: new Float32Array(geometry.uvs), size: 2};
-    }
-
-    // Create materials
-    mesh.materials = [];
-    for (const sourceMaterial of object.materials) {
-      // TODO - support full spec
-      const _material = {
-        name: sourceMaterial.name,
-        flatShading: !sourceMaterial.smooth
-      };
-      mesh.materials.push(_material);
-      materials.push(_material);
-    }
-
-    mesh.name = object.name;
-    meshes.push(mesh);
-  }
-
-  return {meshes, materials};
-};

package/src/mtl-loader.ts

@@ -0,0 +1,31 @@
+// loaders.gl, MIT license
+import type {Loader, LoaderOptions} from '@loaders.gl/loader-utils';
+import type {MTLMaterial, ParseMTLOptions} from './lib/parse-mtl';
+
+// __VERSION__ is injected by babel-plugin-version-inline
+// @ts-ignore TS2304: Cannot find name '__VERSION__'.
+const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
+
+export type MTLLoaderOptions = LoaderOptions & {
+  mtl?: ParseMTLOptions;
+};
+
+/**
+ * Loader for the MTL material format
+ * Parses a Wavefront .mtl file specifying materials
+ */
+export const MTLLoader: Loader<MTLMaterial[], never, LoaderOptions> = {
+  name: 'MTL',
+  id: 'mtl',
+  module: 'mtl',
+  version: VERSION,
+  worker: true,
+  extensions: ['mtl'],
+  mimeTypes: ['text/plain'],
+  testText: (text: string): boolean => text.includes('newmtl'),
+  options: {
+    mtl: {}
+  }
+};
+
+export const _typecheckMTLLoader: Loader = MTLLoader;

package/src/obj-loader.ts

@@ -1,13 +1,18 @@
-import type {Loader} from '@loaders.gl/loader-utils';
+import type {Loader, LoaderOptions} from '@loaders.gl/loader-utils';
+import {Mesh} from '@loaders.gl/schema';
 
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
 const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 
+export type OBJLoaderOptions = LoaderOptions & {
+  obj?: {};
+};
+
 /**
  * Worker loader for the OBJ geometry format
  */
-export const OBJLoader = {
+export const OBJLoader: Loader<Mesh, never, OBJLoaderOptions> = {
   name: 'OBJ',
   id: 'obj',
   module: 'obj',
@@ -21,7 +26,7 @@ export const OBJLoader = {
   }
 };
 
-function testOBJFile(text) {
+function testOBJFile(text: string): boolean {
   // TODO - There could be comment line first
   return text[0] === 'v';
 }

package/dist/bundle.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/bundle.ts"],"names":["moduleExports","require","globalThis","loaders","module","exports","Object","assign"],"mappings":"AACA,MAAMA,aAAa,GAAGC,OAAO,CAAC,SAAD,CAA7B;;AACAC,UAAU,CAACC,OAAX,GAAqBD,UAAU,CAACC,OAAX,IAAsB,EAA3C;AACAC,MAAM,CAACC,OAAP,GAAiBC,MAAM,CAACC,MAAP,CAAcL,UAAU,CAACC,OAAzB,EAAkCH,aAAlC,CAAjB","sourcesContent":["// @ts-nocheck\nconst moduleExports = require('./index');\nglobalThis.loaders = globalThis.loaders || {};\nmodule.exports = Object.assign(globalThis.loaders, moduleExports);\n"],"file":"bundle.js"}

package/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/index.ts"],"names":["loadOBJ","OBJLoader","OBJWorkerLoader","parse","arrayBuffer","options","TextDecoder","decode","parseTextSync","_typecheckOBJLoader"],"mappings":"AACA,OAAOA,OAAP,MAAoB,gBAApB;AACA,SAAQC,SAAS,IAAIC,eAArB,QAA2C,cAA3C;AAIA,SAAQA,eAAR;AAKA,OAAO,MAAMD,SAAS,GAAG,EACvB,GAAGC,eADoB;AAEvBC,EAAAA,KAAK,EAAE,OAAOC,WAAP,EAAoBC,OAApB,KAAgCL,OAAO,CAAC,IAAIM,WAAJ,GAAkBC,MAAlB,CAAyBH,WAAzB,CAAD,EAAwCC,OAAxC,CAFvB;AAGvBG,EAAAA,aAAa,EAAER;AAHQ,CAAlB;AAMP,OAAO,MAAMS,mBAAqC,GAAGR,SAA9C","sourcesContent":["import type {LoaderWithParser} from '@loaders.gl/loader-utils';\nimport loadOBJ from './lib/load-obj';\nimport {OBJLoader as OBJWorkerLoader} from './obj-loader';\n\n// OBJLoader\n\nexport {OBJWorkerLoader};\n\n/**\n * Loader for the OBJ geometry format\n */\nexport const OBJLoader = {\n  ...OBJWorkerLoader,\n  parse: async (arrayBuffer, options) => loadOBJ(new TextDecoder().decode(arrayBuffer), options),\n  parseTextSync: loadOBJ\n};\n\nexport const _typecheckOBJLoader: LoaderWithParser = OBJLoader;\n"],"file":"index.js"}

package/dist/lib/get-obj-schema.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/lib/get-obj-schema.ts"],"names":["Schema","Field","FixedSizeList","getArrowTypeFromTypedArray","getOBJSchema","attributes","metadata","metadataMap","key","Map","set","JSON","stringify","fields","attributeName","attribute","field","getArrowFieldFromAttribute","push","type","value","isSingleValue","size"],"mappings":"AAAA,SAAQA,MAAR,EAAgBC,KAAhB,EAAuBC,aAAvB,EAAsCC,0BAAtC,QAAuE,oBAAvE;AAEA,OAAO,SAASC,YAAT,CAAsBC,UAAtB,EAAkCC,QAAQ,GAAG,EAA7C,EAAiD;AACtD,MAAIC,WAAJ;;AACA,OAAK,MAAMC,GAAX,IAAkBF,QAAlB,EAA4B;AAC1BC,IAAAA,WAAW,GAAGA,WAAW,IAAI,IAAIE,GAAJ,EAA7B;;AACA,QAAID,GAAG,KAAK,OAAZ,EAAqB;AACnBD,MAAAA,WAAW,CAACG,GAAZ,CAAgBF,GAAhB,EAAqBG,IAAI,CAACC,SAAL,CAAeN,QAAQ,CAACE,GAAD,CAAvB,CAArB;AACD;AACF;;AAED,QAAMK,MAAe,GAAG,EAAxB;;AACA,OAAK,MAAMC,aAAX,IAA4BT,UAA5B,EAAwC;AACtC,UAAMU,SAAS,GAAGV,UAAU,CAACS,aAAD,CAA5B;AACA,UAAME,KAAK,GAAGC,0BAA0B,CAACH,aAAD,EAAgBC,SAAhB,CAAxC;AACAF,IAAAA,MAAM,CAACK,IAAP,CAAYF,KAAZ;AACD;;AACD,SAAO,IAAIhB,MAAJ,CAAWa,MAAX,EAAmBN,WAAnB,CAAP;AACD;;AAED,SAASU,0BAAT,CAAoCH,aAApC,EAAmDC,SAAnD,EAA8D;AAC5D,QAAMR,WAAW,GAAG,IAAIE,GAAJ,EAApB;;AACA,OAAK,MAAMD,GAAX,IAAkBO,SAAlB,EAA6B;AAC3B,QAAIP,GAAG,KAAK,OAAZ,EAAqB;AACnBD,MAAAA,WAAW,CAACG,GAAZ,CAAgBF,GAAhB,EAAqBG,IAAI,CAACC,SAAL,CAAeG,SAAS,CAACP,GAAD,CAAxB,CAArB;AACD;AACF;;AAED,QAAMW,IAAI,GAAGhB,0BAA0B,CAACY,SAAS,CAACK,KAAX,CAAvC;AACA,QAAMC,aAAa,GAAG,EAAE,UAAUN,SAAZ,KAA0BA,SAAS,CAACO,IAAV,KAAmB,CAAnE;AACA,SAAOD,aAAa,GAChB,IAAIpB,KAAJ,CAAUa,aAAV,EAAyBK,IAAzB,EAA+B,KAA/B,EAAsCZ,WAAtC,CADgB,GAEhB,IAAIN,KAAJ,CACAa,aADA,EAEA,IAAIZ,aAAJ,CAAkBa,SAAS,CAACO,IAA5B,EAAkC,IAAIrB,KAAJ,CAAU,OAAV,EAAmBkB,IAAnB,CAAlC,CAFA,EAGA,KAHA,EAIAZ,WAJA,CAFJ;AAQD","sourcesContent":["import {Schema, Field, FixedSizeList, getArrowTypeFromTypedArray} from '@loaders.gl/schema';\n\nexport function getOBJSchema(attributes, metadata = {}) {\n  let metadataMap;\n  for (const key in metadata) {\n    metadataMap = metadataMap || new Map();\n    if (key !== 'value') {\n      metadataMap.set(key, JSON.stringify(metadata[key]));\n    }\n  }\n\n  const fields: Field[] = [];\n  for (const attributeName in attributes) {\n    const attribute = attributes[attributeName];\n    const field = getArrowFieldFromAttribute(attributeName, attribute);\n    fields.push(field);\n  }\n  return new Schema(fields, metadataMap);\n}\n\nfunction getArrowFieldFromAttribute(attributeName, attribute) {\n  const metadataMap = new Map();\n  for (const key in attribute) {\n    if (key !== 'value') {\n      metadataMap.set(key, JSON.stringify(attribute[key]));\n    }\n  }\n\n  const type = getArrowTypeFromTypedArray(attribute.value);\n  const isSingleValue = !('size' in attribute) || attribute.size === 1;\n  return isSingleValue\n    ? new Field(attributeName, type, false, metadataMap)\n    : new Field(\n      attributeName,\n      new FixedSizeList(attribute.size, new Field('value', type)),\n      false,\n      metadataMap\n    );\n}\n"],"file":"get-obj-schema.js"}

package/dist/lib/load-obj.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/lib/load-obj.ts"],"names":["getMeshBoundingBox","parseOBJ","getOBJSchema","loadOBJ","text","options","meshes","vertexCount","reduce","s","mesh","header","attributes","mergeAttributes","boundingBox","schema","mode","loaderData","positions","Float32Array","normals","colors","uvs","i","POSITION","NORMAL","COLOR_0","TEXCOORD_0","set","value","length","size"],"mappings":"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","sourcesContent":["import type {MeshAttributes} from '@loaders.gl/schema';\nimport {getMeshBoundingBox} from '@loaders.gl/schema';\nimport parseOBJ from './parse-obj';\nimport {getOBJSchema} from './get-obj-schema';\n\nexport default function loadOBJ(text, options) {\n  const {meshes} = parseOBJ(text);\n\n  // @ts-expect-error\n  const vertexCount = meshes.reduce((s, mesh) => s + mesh.header.vertexCount, 0);\n  // TODO - render objects separately\n  const attributes = mergeAttributes(meshes, vertexCount);\n\n  const header = {\n    vertexCount,\n    // @ts-ignore Need to export Attributes type\n    boundingBox: getMeshBoundingBox(attributes)\n  };\n\n  const schema = getOBJSchema(attributes, {\n    mode: 4,\n    boundingBox: header.boundingBox\n  });\n\n  return {\n    // Data return by this loader implementation\n    loaderData: {\n      header: {}\n    },\n\n    // Normalised data\n    schema,\n    header,\n    mode: 4, // TRIANGLES\n\n    attributes\n  };\n}\n\n// eslint-disable-next-line max-statements\nfunction mergeAttributes(meshes, vertexCount) {\n  const positions = new Float32Array(vertexCount * 3);\n  let normals;\n  let colors;\n  let uvs;\n  let i = 0;\n\n  for (const mesh of meshes) {\n    const {POSITION, NORMAL, COLOR_0, TEXCOORD_0} = mesh.attributes;\n\n    positions.set(POSITION.value, i * 3);\n\n    if (NORMAL) {\n      normals = normals || new Float32Array(vertexCount * 3);\n      normals.set(NORMAL.value, i * 3);\n    }\n    if (COLOR_0) {\n      colors = colors || new Float32Array(vertexCount * 3);\n      colors.set(COLOR_0.value, i * 3);\n    }\n    if (TEXCOORD_0) {\n      uvs = uvs || new Float32Array(vertexCount * 2);\n      uvs.set(TEXCOORD_0.value, i * 2);\n    }\n\n    i += POSITION.value.length / 3;\n  }\n\n  const attributes: MeshAttributes = {};\n  attributes.POSITION = {value: positions, size: 3};\n\n  if (normals) {\n    attributes.NORMAL = {value: normals, size: 3};\n  }\n  if (colors) {\n    attributes.COLOR_0 = {value: colors, size: 3};\n  }\n  if (uvs) {\n    attributes.TEXCOORD_0 = {value: uvs, size: 2};\n  }\n\n  return attributes;\n}\n"],"file":"load-obj.js"}