@loaders.gl/obj 4.0.0-alpha.9 → 4.0.0-beta.1

package/dist/index.d.ts

@@ -13,6 +13,4 @@ export declare const OBJLoader: LoaderWithParser<Mesh, never, OBJLoaderOptions>;
  * Loader for the MTL material format
  */
 export declare const MTLLoader: LoaderWithParser<MTLMaterial[], never, MTLLoaderOptions>;
-export declare const _typecheckOBJLoader: LoaderWithParser;
-export declare const _typecheckMTLLoader: LoaderWithParser;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,oBAAoB,CAAC;AAE7C,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AACnD,OAAO,EAAC,SAAS,IAAI,eAAe,EAAC,MAAM,cAAc,CAAC;AAE1D,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAEjD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAKnD,OAAO,EAAC,eAAe,EAAC,CAAC;AAEzB;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,gBAAgB,CAKrE,CAAC;AAIF;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,gBAAgB,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,gBAAgB,CAK9E,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,gBAA4B,CAAC;AAC/D,eAAO,MAAM,mBAAmB,EAAE,gBAA4B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,oBAAoB,CAAC;AAE7C,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AACnD,OAAO,EAAC,SAAS,IAAI,eAAe,EAAC,MAAM,cAAc,CAAC;AAE1D,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAEjD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAKnD,OAAO,EAAC,eAAe,EAAC,CAAC;AAEzB;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,gBAAgB,CAKrE,CAAC;AAIF;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,gBAAgB,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,gBAAgB,CAK9E,CAAC"}

package/dist/mtl-loader.d.ts

@@ -8,5 +8,4 @@ export type MTLLoaderOptions = LoaderOptions & {
  * 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

@@ -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,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"}
+{"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"}

package/dist/obj-loader.d.ts

@@ -7,5 +7,4 @@ export type OBJLoaderOptions = LoaderOptions & {
  * 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

@@ -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;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"}
+{"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"}

package/dist/obj-worker.js

@@ -125,7 +125,7 @@
               options,
               context: {
                 ...context,
-                parse: parseOnMainThread
+                _parse: parseOnMainThread
               }
             });
             WorkerBody.postMessage("done", { result });
@@ -138,7 +138,7 @@
       }
     };
   }
-  function parseOnMainThread(arrayBuffer, options) {
+  function parseOnMainThread(arrayBuffer, loader, options, context) {
     return new Promise((resolve, reject) => {
       const id = requestId++;
       const onMessage = (type, payload2) => {
@@ -162,7 +162,12 @@
       WorkerBody.postMessage("process", payload);
     });
   }
-  async function parseData({ loader, arrayBuffer, options, context }) {
+  async function parseData({
+    loader,
+    arrayBuffer,
+    options,
+    context
+  }) {
     let data;
     let parser;
     if (loader.parseSync || loader.parse) {
@@ -504,7 +509,7 @@
         switch (data[0]) {
           case "v":
             state.vertices.push(parseFloat(data[1]), parseFloat(data[2]), parseFloat(data[3]));
-            if (data.length === 8) {
+            if (data.length >= 7) {
               state.colors.push(parseFloat(data[4]), parseFloat(data[5]), parseFloat(data[6]));
             }
             break;
@@ -720,7 +725,7 @@
   }
 
   // src/obj-loader.ts
-  var VERSION = true ? "4.0.0-alpha.9" : "latest";
+  var VERSION = true ? "4.0.0-beta.1" : "latest";
   var OBJLoader = {
     name: "OBJ",
     id: "obj",
@@ -808,7 +813,7 @@
   }
 
   // src/mtl-loader.ts
-  var VERSION2 = true ? "4.0.0-alpha.9" : "latest";
+  var VERSION2 = true ? "4.0.0-beta.1" : "latest";
   var MTLLoader = {
     name: "MTL",
     id: "mtl",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/obj",
-  "version": "4.0.0-alpha.9",
+  "version": "4.0.0-beta.1",
   "description": "Framework-independent loader for the OBJ format",
   "license": "MIT",
   "publishConfig": {
@@ -34,8 +34,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.3.1",
-    "@loaders.gl/loader-utils": "4.0.0-alpha.9",
-    "@loaders.gl/schema": "4.0.0-alpha.9"
+    "@loaders.gl/loader-utils": "4.0.0-beta.1",
+    "@loaders.gl/schema": "4.0.0-beta.1"
   },
-  "gitHead": "03ff81ab468f20f3bddeec787aa88d477a7e1c72"
+  "gitHead": "35c625e67132b0784e597d9ddabae8aefea29ff2"
 }

package/src/index.ts

@@ -34,6 +34,3 @@ export const MTLLoader: LoaderWithParser<MTLMaterial[], never, MTLLoaderOptions>
     parseMTL(new TextDecoder().decode(arrayBuffer), options?.mtl),
   parseTextSync: (text: string, options?: MTLLoaderOptions) => parseMTL(text, options?.mtl)
 };
-
-export const _typecheckOBJLoader: LoaderWithParser = OBJLoader;
-export const _typecheckMTLLoader: LoaderWithParser = MTLLoader;

package/src/lib/parse-obj-meshes.ts

@@ -343,7 +343,7 @@ export function parseOBJMeshes(text) {
       switch (data[0]) {
         case 'v':
           state.vertices.push(parseFloat(data[1]), parseFloat(data[2]), parseFloat(data[3]));
-          if (data.length === 8) {
+          if (data.length >= 7) {
             state.colors.push(parseFloat(data[4]), parseFloat(data[5]), parseFloat(data[6]));
           }
           break;

package/src/mtl-loader.ts

@@ -27,5 +27,3 @@ export const MTLLoader: Loader<MTLMaterial[], never, LoaderOptions> = {
     mtl: {}
   }
 };
-
-export const _typecheckMTLLoader: Loader = MTLLoader;

package/src/obj-loader.ts

@@ -30,5 +30,3 @@ function testOBJFile(text: string): boolean {
   // TODO - There could be comment line first
   return text[0] === 'v';
 }
-
-export const _typecheckOBJLoader: Loader = OBJLoader;

package/dist/bundle.js

@@ -1,5 +0,0 @@
-"use strict";
-// @ts-nocheck
-const moduleExports = require('./index');
-globalThis.loaders = globalThis.loaders || {};
-module.exports = Object.assign(globalThis.loaders, moduleExports);

package/dist/index.js

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports._typecheckMTLLoader = exports._typecheckOBJLoader = exports.MTLLoader = exports.OBJLoader = exports.OBJWorkerLoader = void 0;
-const parse_obj_1 = require("./lib/parse-obj");
-const obj_loader_1 = require("./obj-loader");
-Object.defineProperty(exports, "OBJWorkerLoader", { enumerable: true, get: function () { return obj_loader_1.OBJLoader; } });
-const parse_mtl_1 = require("./lib/parse-mtl");
-const mtl_loader_1 = require("./mtl-loader");
-/**
- * Loader for the OBJ geometry format
- */
-exports.OBJLoader = {
-    ...obj_loader_1.OBJLoader,
-    parse: async (arrayBuffer, options) => (0, parse_obj_1.parseOBJ)(new TextDecoder().decode(arrayBuffer), options),
-    parseTextSync: (text, options) => (0, parse_obj_1.parseOBJ)(text, options)
-};
-// MTLLoader
-/**
- * Loader for the MTL material format
- */
-exports.MTLLoader = {
-    ...mtl_loader_1.MTLLoader,
-    parse: async (arrayBuffer, options) => (0, parse_mtl_1.parseMTL)(new TextDecoder().decode(arrayBuffer), options?.mtl),
-    parseTextSync: (text, options) => (0, parse_mtl_1.parseMTL)(text, options?.mtl)
-};
-exports._typecheckOBJLoader = exports.OBJLoader;
-exports._typecheckMTLLoader = exports.MTLLoader;

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

@@ -1,37 +0,0 @@
-"use strict";
-// loaders.gl, MIT license
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOBJSchema = void 0;
-const schema_1 = require("@loaders.gl/schema");
-/** Get Mesh Schema */
-function getOBJSchema(attributes, metadata = {}) {
-    const stringMetadata = {};
-    for (const key in metadata) {
-        if (key !== 'value') {
-            stringMetadata[key] = JSON.stringify(metadata[key]);
-        }
-    }
-    const fields = [];
-    for (const attributeName in attributes) {
-        const attribute = attributes[attributeName];
-        const field = getFieldFromAttribute(attributeName, attribute);
-        fields.push(field);
-    }
-    return { fields, metadata: stringMetadata };
-}
-exports.getOBJSchema = getOBJSchema;
-/** Get a Field describing the column from an OBJ attribute */
-function getFieldFromAttribute(name, attribute) {
-    const metadata = {};
-    for (const key in attribute) {
-        if (key !== 'value') {
-            metadata[key] = JSON.stringify(attribute[key]);
-        }
-    }
-    let { type } = (0, schema_1.getDataTypeFromArray)(attribute.value);
-    const isSingleValue = attribute.size === 1 || attribute.size === undefined;
-    if (!isSingleValue) {
-        type = { type: 'fixed-size-list', listSize: attribute.size, children: [{ name: 'values', type }] };
-    }
-    return { name, type, nullable: false, metadata };
-}

package/dist/lib/obj-types.js

@@ -1 +0,0 @@
-"use strict";

package/dist/lib/parse-mtl.js

@@ -1,201 +0,0 @@
-"use strict";
-// loaders.gl, MIT license
-// Forked from THREE.js under MIT license
-// https://github.com/mrdoob/three.js/blob/master/examples/jsm/loaders/MTLLoader.js
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseMTL = void 0;
-const DELIMITER_PATTERN = /\s+/;
-/**
- * Parses a MTL file.
- * Parses a Wavefront .mtl file specifying materials
- * http://paulbourke.net/dataformats/mtl/
- * https://www.loc.gov/preservation/digital/formats/fdd/fdd000508.shtml
- *
- * @param  text - Content of MTL file
- */
-// eslint-disable-next-line complexity
-function parseMTL(text, options) {
-    // const materialsInfo: Record<string, MTLMaterial> = {};
-    const materials = [];
-    let currentMaterial = { name: 'placeholder' };
-    const lines = text.split('\n');
-    for (let line of lines) {
-        line = line.trim();
-        if (line.length === 0 || line.charAt(0) === '#') {
-            // Blank line or comment ignore
-            continue; // eslint-disable-line no-continue
-        }
-        const pos = line.indexOf(' ');
-        let key = pos >= 0 ? line.substring(0, pos) : line;
-        key = key.toLowerCase();
-        let value = pos >= 0 ? line.substring(pos + 1) : '';
-        value = value.trim();
-        switch (key) {
-            case 'newmtl':
-                // New material
-                currentMaterial = { name: value };
-                // insert into map
-                materials.push(currentMaterial);
-                break;
-            case 'ka': // Ka
-                currentMaterial.ambientColor = parseColor(value);
-                break;
-            case 'kd':
-                // Kd: Diffuse color (color under white light) using RGB values
-                currentMaterial.diffuseColor = parseColor(value);
-                break;
-            case 'map_kd':
-                // Diffuse texture map
-                currentMaterial.diffuseTextureUrl = value;
-                //         setMapForType('map', value);
-                break;
-            case 'ks':
-                // Specular color (color when light is reflected from shiny surface) using RGB values
-                currentMaterial.specularColor = parseColor(value);
-                break;
-            case 'map_ks':
-                // Specular map
-                currentMaterial.specularTextureUrl = value;
-                // setMapForType('specularMap', value);
-                break;
-            case 'ke':
-                // Emissive using RGB values
-                currentMaterial.emissiveColor = parseColor(value);
-                break;
-            case 'map_ke':
-                // Emissive map
-                currentMaterial.emissiveTextureUrl = value;
-                // setMapForType('emissiveMap', value);
-                break;
-            case 'ns':
-                // Ns is material specular exponent (defines the focus of the specular highlight)
-                // A high exponent results in a tight, concentrated highlight. Ns values normally range from 0 to 1000.
-                currentMaterial.shininess = parseFloat(value);
-                break;
-            case 'map_ns':
-                // Ns is material specular exponent
-                // TODO?
-                // currentMaterial.shininessMap = parseFloat(value);
-                break;
-            case 'ni':
-                currentMaterial.refraction = parseFloat(value);
-                break;
-            case 'illum':
-                currentMaterial.illumination = parseFloat(value);
-                break;
-            default:
-                // log unknown message?
-                break;
-            /*
-            case 'norm':
-              setMapForType('normalMap', value);
-              break;
-      
-            case 'map_bump':
-            case 'bump':
-              // Bump texture map
-              setMapForType('bumpMap', value);
-              break;
-      
-            case 'd':
-              n = parseFloat(value);
-              if (n < 1) {
-                params.opacity = n;
-                params.transparent = true;
-              }
-              break;
-      
-            case 'map_d':
-              // Alpha map
-              setMapForType('alphaMap', value);
-              params.transparent = true;
-              break;
-      
-            case 'tr':
-              n = parseFloat(value);
-              if (this.options && this.options.invertTrProperty) n = 1 - n;
-              if (n > 0) {
-                params.opacity = 1 - n;
-                params.transparent = true;
-              }
-            */
-        }
-    }
-    return materials;
-}
-exports.parseMTL = parseMTL;
-function parseColor(value, options) {
-    const rgb = value.split(DELIMITER_PATTERN, 3);
-    const color = [
-        parseFloat(rgb[0]),
-        parseFloat(rgb[1]),
-        parseFloat(rgb[2])
-    ];
-    // TODO auto detect big values?
-    // if (this.options && this.options.normalizeRGB) {
-    //   value = [ value[ 0 ] / 255, value[ 1 ] / 255, value[ 2 ] / 255 ];
-    // }
-    // if (this.options && this.options.ignoreZeroRGBs) {
-    //   if (value[ 0 ] === 0 && value[ 1 ] === 0 && value[ 2 ] === 0) {
-    //     // ignore
-    //     save = false;
-    //   }
-    // }
-    return color;
-}
-/* TODO parse url options
-function parseTexture(value, matParams) {
-  const texParams = {
-    scale: new Vector2(1, 1),
-    offset: new Vector2(0, 0)
-  };
-
-  const items = value.split(/\s+/);
-  let pos;
-
-  pos = items.indexOf('-bm');
-  if (pos >= 0) {
-    matParams.bumpScale = parseFloat(items[ pos + 1 ]);
-    items.splice(pos, 2);
-  }
-
-  pos = items.indexOf('-s');
-  if (pos >= 0) {
-    texParams.scale.set(parseFloat(items[ pos + 1 ]), parseFloat(items[ pos + 2 ]));
-    items.splice(pos, 4); // we expect 3 parameters here!
-
-  }
-
-  pos = items.indexOf('-o');
-
-  if (pos >= 0) {
-    texParams.offset.set(parseFloat(items[ pos + 1 ]), parseFloat(items[ pos + 2 ]));
-    items.splice(pos, 4); // we expect 3 parameters here!
-  }
-
-  texParams.url = items.join(' ').trim();
-  return texParams;
-}
-
- *function resolveURL(baseUrl, url) {
- * baseUrl?: string;
-    // Absolute URL
-    if (/^https?:\/\//i.test(url)) return url;
-    return baseUrl + url;
-  }
-
-  function setMapForType(mapType, value) {
-    if (params[ mapType ]) return; // Keep the first encountered texture
-
-    const texParams = scope.getTextureParams(value, params);
-    const map = scope.loadTexture(resolveURL(scope.baseUrl, texParams.url));
-
-    map.repeat.copy(texParams.scale);
-    map.offset.copy(texParams.offset);
-
-    map.wrapS = scope.wrap;
-    map.wrapT = scope.wrap;
-
-    params[ mapType ] = map;
-  }
-*/