@loaders.gl/obj 4.0.0-alpha.5 → 4.0.0-alpha.7

package/dist/lib/parse-obj.d.ts

@@ -1,14 +1,3 @@
-import type { MeshAttributes } from '@loaders.gl/schema';
-export declare function parseOBJ(text: any, options: any): {
-    loaderData: {
-        header: {};
-    };
-    schema: import("@loaders.gl/schema").Schema;
-    header: {
-        vertexCount: number;
-        boundingBox: [[number, number, number], [number, number, number]];
-    };
-    mode: number;
-    attributes: MeshAttributes;
-};
+import type { Mesh } from '@loaders.gl/schema';
+export declare function parseOBJ(text: any, options: any): Mesh;
 //# sourceMappingURL=parse-obj.d.ts.map

package/dist/lib/parse-obj.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-obj.d.ts","sourceRoot":"","sources":["../../src/lib/parse-obj.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAKvD,wBAAgB,QAAQ,CAAC,IAAI,KAAA,EAAE,OAAO,KAAA;;;;;;;;;;;EAgCrC"}
+{"version":3,"file":"parse-obj.d.ts","sourceRoot":"","sources":["../../src/lib/parse-obj.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,IAAI,EAAiB,MAAM,oBAAoB,CAAC;AAK7D,wBAAgB,QAAQ,CAAC,IAAI,KAAA,EAAE,OAAO,KAAA,GAAG,IAAI,CAiC5C"}

package/dist/lib/parse-obj.js

@@ -1,92 +1,72 @@
-import { getMeshBoundingBox } from '@loaders.gl/schema';
-import { parseOBJMeshes } from './parse-obj-meshes';
-import { getOBJSchema } from './get-obj-schema';
-export function parseOBJ(text, options) {
-  const {
-    meshes
-  } = parseOBJMeshes(text);
-  const vertexCount = meshes.reduce((s, mesh) => s + mesh.header.vertexCount, 0);
-  const attributes = mergeAttributes(meshes, vertexCount);
-  const header = {
-    vertexCount,
-    boundingBox: getMeshBoundingBox(attributes)
-  };
-  const schema = getOBJSchema(attributes, {
-    mode: 4,
-    boundingBox: header.boundingBox
-  });
-  return {
-    loaderData: {
-      header: {}
-    },
-    schema,
-    header,
-    mode: 4,
-    attributes
-  };
+"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)
+    };
+    const schema = (0, get_obj_schema_1.getOBJSchema)(attributes, {
+        mode: 4,
+        boundingBox: header.boundingBox
+    });
+    return {
+        // Data return by this loader implementation
+        loaderData: {
+            header: {}
+        },
+        // Normalised data
+        schema,
+        header,
+        mode: 4,
+        topology: 'point-list',
+        attributes
+    };
 }
-
+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 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);
+        }
+        if (COLOR_0) {
+            colors = colors || new Float32Array(vertexCount * 3);
+            colors.set(COLOR_0.value, i * 3);
+        }
+        if (TEXCOORD_0) {
+            uvs = uvs || new Float32Array(vertexCount * 2);
+            uvs.set(TEXCOORD_0.value, i * 2);
+        }
+        i += POSITION.value.length / 3;
     }
-
-    if (COLOR_0) {
-      colors = colors || new Float32Array(vertexCount * 3);
-      colors.set(COLOR_0.value, i * 3);
+    const attributes = {};
+    attributes.POSITION = { value: positions, size: 3 };
+    if (normals) {
+        attributes.NORMAL = { value: normals, size: 3 };
     }
-
-    if (TEXCOORD_0) {
-      uvs = uvs || new Float32Array(vertexCount * 2);
-      uvs.set(TEXCOORD_0.value, i * 2);
+    if (colors) {
+        attributes.COLOR_0 = { value: colors, size: 3 };
     }
-
-    i += POSITION.value.length / 3;
-  }
-
-  const attributes = {};
-  attributes.POSITION = {
-    value: positions,
-    size: 3
-  };
-
-  if (normals) {
-    attributes.NORMAL = {
-      value: normals,
-      size: 3
-    };
-  }
-
-  if (colors) {
-    attributes.COLOR_0 = {
-      value: colors,
-      size: 3
-    };
-  }
-
-  if (uvs) {
-    attributes.TEXCOORD_0 = {
-      value: uvs,
-      size: 2
-    };
-  }
-
-  return attributes;
+    if (uvs) {
+        attributes.TEXCOORD_0 = { value: uvs, size: 2 };
+    }
+    return attributes;
 }
-//# sourceMappingURL=parse-obj.js.map

package/dist/mtl-loader.d.ts

@@ -1,24 +1,12 @@
 import type { Loader, LoaderOptions } from '@loaders.gl/loader-utils';
-import type { ParseMTLOptions } from './lib/parse-mtl';
-export declare type MTLLoaderOptions = LoaderOptions & {
+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: {
-    name: string;
-    id: string;
-    module: string;
-    version: any;
-    worker: boolean;
-    extensions: string[];
-    mimeTypes: string[];
-    testText: (text: string) => boolean;
-    options: {
-        mtl: {};
-    };
-};
+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

@@ -1 +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,eAAe,EAAC,MAAM,iBAAiB,CAAC;AAMrD,oBAAY,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE,eAAe,CAAC;CACvB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,SAAS;;;;;;;;qBAQH,MAAM,KAAG,OAAO;;;;CAIlC,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,MAAkB,CAAC"}
+{"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

@@ -1,16 +1,24 @@
-const VERSION = typeof "4.0.0-alpha.5" !== 'undefined' ? "4.0.0-alpha.5" : 'latest';
-export const MTLLoader = {
-  name: 'MTL',
-  id: 'mtl',
-  module: 'mtl',
-  version: VERSION,
-  worker: true,
-  extensions: ['mtl'],
-  mimeTypes: ['text/plain'],
-  testText: text => text.includes('newmtl'),
-  options: {
-    mtl: {}
-  }
+"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: {}
+    }
 };
-export const _typecheckMTLLoader = MTLLoader;
-//# sourceMappingURL=mtl-loader.js.map
+exports._typecheckMTLLoader = exports.MTLLoader;

package/dist/obj-loader.d.ts

@@ -1,24 +1,11 @@
 import type { Loader, LoaderOptions } from '@loaders.gl/loader-utils';
-export declare type OBJLoaderOptions = LoaderOptions & {
+import { Mesh } from '@loaders.gl/schema';
+export type OBJLoaderOptions = LoaderOptions & {
     obj?: {};
 };
 /**
  * Worker loader for the OBJ geometry format
  */
-export declare const OBJLoader: {
-    name: string;
-    id: string;
-    module: string;
-    version: any;
-    worker: boolean;
-    extensions: string[];
-    mimeTypes: string[];
-    testText: typeof testOBJFile;
-    options: {
-        obj: {};
-    };
-};
-declare function testOBJFile(text: string): boolean;
+export declare const OBJLoader: Loader<Mesh, never, OBJLoaderOptions>;
 export declare const _typecheckOBJLoader: Loader;
-export {};
 //# sourceMappingURL=obj-loader.d.ts.map

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

@@ -1 +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;AAMpE,oBAAY,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE,EAAE,CAAC;CACV,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS;;;;;;;;;;;;CAYrB,CAAC;AAEF,iBAAS,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAG1C;AAED,eAAO,MAAM,mBAAmB,EAAE,MAAkB,CAAC"}
+{"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.5" !== 'undefined' ? "4.0.0-alpha.5" : '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;