@loaders.gl/obj 4.0.0-alpha.1 → 4.0.0-alpha.11

package/dist/lib/parse-obj.js

@@ -1,458 +1,72 @@
-const OBJECT_RE = /^[og]\s*(.+)?/;
-const MATERIAL_RE = /^mtllib /;
-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
-    });
-  }
-
-}
-
-class MeshObject {
-  constructor(name = '') {
-    this.name = name;
-    this.geometry = {
-      vertices: [],
-      normals: [],
-      colors: [],
-      uvs: []
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseOBJ = void 0;
+const schema_1 = require("@loaders.gl/schema");
+const parse_obj_meshes_1 = require("./parse-obj-meshes");
+const get_obj_schema_1 = require("./get-obj-schema");
+function parseOBJ(text, options) {
+    const { meshes } = (0, parse_obj_meshes_1.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: (0, schema_1.getMeshBoundingBox)(attributes)
     };
-    this.materials = [];
-    this.smooth = true;
-    this.fromDeclaration = null;
-  }
-
-  startMaterial(name, libraries) {
-    const previous = this._finalize(false);
-
-    if (previous && (previous.inherited || previous.groupCount <= 0)) {
-      this.materials.splice(previous.index, 1);
-    }
-
-    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
+    const schema = (0, get_obj_schema_1.getOBJSchema)(attributes, {
+        mode: 4,
+        boundingBox: header.boundingBox
     });
-    this.materials.push(material);
-    return material;
-  }
-
-  currentMaterial() {
-    if (this.materials.length > 0) {
-      return this.materials[this.materials.length - 1];
-    }
-
-    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 (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);
-        }
-      }
-    }
-
-    if (end && this.materials.length === 0) {
-      this.materials.push({
-        name: '',
-        smooth: this.smooth
-      });
-    }
-
-    return lastMultiMaterial;
-  }
-
-}
-
-class ParserState {
-  constructor() {
-    this.objects = [];
-    this.object = null;
-    this.vertices = [];
-    this.normals = [];
-    this.colors = [];
-    this.uvs = [];
-    this.materialLibraries = [];
-    this.startObject('', false);
-  }
-
-  startObject(name, fromDeclaration = true) {
-    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;
-
-    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);
-  }
-
-  finalize() {
-    if (this.object && typeof this.object._finalize === 'function') {
-      this.object._finalize(true);
-    }
-  }
-
-  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]);
-  }
-
-  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 !== '') {
-      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 {
+        // Data return by this loader implementation
+        loaderData: {
+            header: {}
+        },
+        // Normalised data
+        schema,
+        header,
+        mode: 4,
+        topology: 'point-list',
+        attributes
+    };
 }
-
-export default (text => {
-  const state = new ParserState();
-
-  if (text.indexOf('\r\n') !== -1) {
-    text = text.replace(/\r\n/g, '\n');
-  }
-
-  if (text.indexOf('\\\n') !== -1) {
-    text = text.replace(/\\\n/g, '');
-  }
-
-  const lines = text.split('\n');
-  let line = '';
-  let lineFirstChar = '';
-  let lineLength = 0;
-  let result = [];
-  const trimLeft = typeof ''.trimLeft === 'function';
-
-  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);
-    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 = [];
-
-      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);
+exports.parseOBJ = parseOBJ;
+// eslint-disable-next-line max-statements
+function mergeAttributes(meshes, vertexCount) {
+    const positions = new Float32Array(vertexCount * 3);
+    let normals;
+    let colors;
+    let uvs;
+    let i = 0;
+    for (const mesh of meshes) {
+        const { POSITION, NORMAL, COLOR_0, TEXCOORD_0 } = mesh.attributes;
+        positions.set(POSITION.value, i * 3);
+        if (NORMAL) {
+            normals = normals || new Float32Array(vertexCount * 3);
+            normals.set(NORMAL.value, i * 3);
         }
-      }
-
-      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]);
+        if (COLOR_0) {
+            colors = colors || new Float32Array(vertexCount * 3);
+            colors.set(COLOR_0.value, i * 3);
         }
-      }
-
-      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) {
-      const name = (' ' + result[0].substr(1).trim()).substr(1);
-      state.startObject(name);
-    } else if (MATERIAL_USE_RE.test(line)) {
-      state.object.startMaterial(line.substring(7).trim(), state.materialLibraries);
-    } else if (MATERIAL_RE.test(line)) {
-      state.materialLibraries.push(line.substring(7).trim());
-    } else if (lineFirstChar === 's') {
-      result = line.split(' ');
-
-      if (result.length > 1) {
-        const value = result[1].trim().toLowerCase();
-        state.object.smooth = value !== '0' && value !== 'off';
-      } else {
-        state.object.smooth = true;
-      }
-
-      const material = state.object.currentMaterial();
-      if (material) material.smooth = state.object.smooth;
-    } else {
-      if (line === '\0') continue;
-      throw new Error("Unexpected line: \"".concat(line, "\""));
-    }
-  }
-
-  state.finalize();
-  const meshes = [];
-  const materials = [];
-
-  for (const object of state.objects) {
-    const {
-      geometry
-    } = object;
-    if (geometry.vertices.length === 0) continue;
-    const mesh = {
-      header: {
-        vertexCount: geometry.vertices.length / 3
-      },
-      attributes: {}
-    };
-
-    switch (geometry.type) {
-      case 'Points':
-        mesh.mode = 0;
-        break;
-
-      case 'Line':
-        mesh.mode = 1;
-        break;
-
-      default:
-        mesh.mode = 4;
-        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 (TEXCOORD_0) {
+            uvs = uvs || new Float32Array(vertexCount * 2);
+            uvs.set(TEXCOORD_0.value, i * 2);
+        }
+        i += POSITION.value.length / 3;
     }
-
-    if (geometry.colors.length > 0) {
-      mesh.attributes.COLOR_0 = {
-        value: new Float32Array(geometry.colors),
-        size: 3
-      };
+    const attributes = {};
+    attributes.POSITION = { value: positions, size: 3 };
+    if (normals) {
+        attributes.NORMAL = { value: normals, size: 3 };
     }
-
-    if (geometry.uvs.length > 0) {
-      mesh.attributes.TEXCOORD_0 = {
-        value: new Float32Array(geometry.uvs),
-        size: 2
-      };
+    if (colors) {
+        attributes.COLOR_0 = { value: colors, size: 3 };
     }
-
-    mesh.materials = [];
-
-    for (const sourceMaterial of object.materials) {
-      const _material = {
-        name: sourceMaterial.name,
-        flatShading: !sourceMaterial.smooth
-      };
-      mesh.materials.push(_material);
-      materials.push(_material);
+    if (uvs) {
+        attributes.TEXCOORD_0 = { value: uvs, size: 2 };
     }
-
-    mesh.name = object.name;
-    meshes.push(mesh);
-  }
-
-  return {
-    meshes,
-    materials
-  };
-});
-//# sourceMappingURL=parse-obj.js.map
+    return attributes;
+}

package/dist/mtl-loader.d.ts

@@ -0,0 +1,12 @@
+import type { Loader, LoaderOptions } from '@loaders.gl/loader-utils';
+import type { MTLMaterial, ParseMTLOptions } from './lib/parse-mtl';
+export type MTLLoaderOptions = LoaderOptions & {
+    mtl?: ParseMTLOptions;
+};
+/**
+ * Loader for the MTL material format
+ * Parses a Wavefront .mtl file specifying materials
+ */
+export declare const MTLLoader: Loader<MTLMaterial[], never, LoaderOptions>;
+export declare const _typecheckMTLLoader: Loader;
+//# sourceMappingURL=mtl-loader.d.ts.map

package/dist/mtl-loader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mtl-loader.d.ts","sourceRoot":"","sources":["../src/mtl-loader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACpE,OAAO,KAAK,EAAC,WAAW,EAAE,eAAe,EAAC,MAAM,iBAAiB,CAAC;AAMlE,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE,eAAe,CAAC;CACvB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,SAAS,EAAE,MAAM,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,aAAa,CAYjE,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,MAAkB,CAAC"}

package/dist/mtl-loader.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports._typecheckMTLLoader = exports.MTLLoader = void 0;
+// __VERSION__ is injected by babel-plugin-version-inline
+// @ts-ignore TS2304: Cannot find name '__VERSION__'.
+const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
+/**
+ * Loader for the MTL material format
+ * Parses a Wavefront .mtl file specifying materials
+ */
+exports.MTLLoader = {
+    name: 'MTL',
+    id: 'mtl',
+    module: 'mtl',
+    version: VERSION,
+    worker: true,
+    extensions: ['mtl'],
+    mimeTypes: ['text/plain'],
+    testText: (text) => text.includes('newmtl'),
+    options: {
+        mtl: {}
+    }
+};
+exports._typecheckMTLLoader = exports.MTLLoader;

package/dist/obj-loader.d.ts

@@ -0,0 +1,11 @@
+import type { Loader, LoaderOptions } from '@loaders.gl/loader-utils';
+import { Mesh } from '@loaders.gl/schema';
+export type OBJLoaderOptions = LoaderOptions & {
+    obj?: {};
+};
+/**
+ * Worker loader for the OBJ geometry format
+ */
+export declare const OBJLoader: Loader<Mesh, never, OBJLoaderOptions>;
+export declare const _typecheckOBJLoader: Loader;
+//# sourceMappingURL=obj-loader.d.ts.map

package/dist/obj-loader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"obj-loader.d.ts","sourceRoot":"","sources":["../src/obj-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAC,IAAI,EAAC,MAAM,oBAAoB,CAAC;AAMxC,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE,EAAE,CAAC;CACV,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,gBAAgB,CAY3D,CAAC;AAOF,eAAO,MAAM,mBAAmB,EAAE,MAAkB,CAAC"}

package/dist/obj-loader.js

@@ -1,21 +1,27 @@
-const VERSION = typeof "4.0.0-alpha.1" !== 'undefined' ? "4.0.0-alpha.1" : 'latest';
-export const OBJLoader = {
-  name: 'OBJ',
-  id: 'obj',
-  module: 'obj',
-  version: VERSION,
-  worker: true,
-  extensions: ['obj'],
-  mimeTypes: ['text/plain'],
-  testText: testOBJFile,
-  options: {
-    obj: {}
-  }
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports._typecheckOBJLoader = exports.OBJLoader = void 0;
+// __VERSION__ is injected by babel-plugin-version-inline
+// @ts-ignore TS2304: Cannot find name '__VERSION__'.
+const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
+/**
+ * Worker loader for the OBJ geometry format
+ */
+exports.OBJLoader = {
+    name: 'OBJ',
+    id: 'obj',
+    module: 'obj',
+    version: VERSION,
+    worker: true,
+    extensions: ['obj'],
+    mimeTypes: ['text/plain'],
+    testText: testOBJFile,
+    options: {
+        obj: {}
+    }
 };
-
 function testOBJFile(text) {
-  return text[0] === 'v';
+    // TODO - There could be comment line first
+    return text[0] === 'v';
 }
-
-export const _typecheckOBJLoader = OBJLoader;
-//# sourceMappingURL=obj-loader.js.map
+exports._typecheckOBJLoader = exports.OBJLoader;