@loaders.gl/obj 3.1.0-alpha.5 → 3.1.0-beta.4

package/dist/es5/obj-loader.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports._typecheckOBJLoader = exports.OBJLoader = void 0;
-const VERSION = typeof "3.1.0-alpha.5" !== 'undefined' ? "3.1.0-alpha.5" : 'latest';
+const VERSION = typeof "3.1.0-beta.4" !== 'undefined' ? "3.1.0-beta.4" : 'latest';
 const OBJLoader = {
   name: 'OBJ',
   id: 'obj',

package/dist/es5/obj-loader.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/obj-loader.ts"],"names":["VERSION","OBJLoader","name","id","module","version","worker","extensions","mimeTypes","testText","testOBJFile","options","obj","text","_typecheckOBJLoader"],"mappings":";;;;;;AAIA,MAAMA,OAAO,GAAG,2BAAuB,WAAvB,qBAAmD,QAAnE;AAKO,MAAMC,SAAS,GAAG;AACvBC,EAAAA,IAAI,EAAE,KADiB;AAEvBC,EAAAA,EAAE,EAAE,KAFmB;AAGvBC,EAAAA,MAAM,EAAE,KAHe;AAIvBC,EAAAA,OAAO,EAAEL,OAJc;AAKvBM,EAAAA,MAAM,EAAE,IALe;AAMvBC,EAAAA,UAAU,EAAE,CAAC,KAAD,CANW;AAOvBC,EAAAA,SAAS,EAAE,CAAC,YAAD,CAPY;AAQvBC,EAAAA,QAAQ,EAAEC,WARa;AASvBC,EAAAA,OAAO,EAAE;AACPC,IAAAA,GAAG,EAAE;AADE;AATc,CAAlB;;;AAcP,SAASF,WAAT,CAAqBG,IAArB,EAA2B;AAEzB,SAAOA,IAAI,CAAC,CAAD,CAAJ,KAAY,GAAnB;AACD;;AAEM,MAAMC,mBAA2B,GAAGb,SAApC","sourcesContent":["import type {Loader} from '@loaders.gl/loader-utils';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\n/**\n * Worker loader for the OBJ geometry format\n */\nexport const OBJLoader = {\n  name: 'OBJ',\n  id: 'obj',\n  module: 'obj',\n  version: VERSION,\n  worker: true,\n  extensions: ['obj'],\n  mimeTypes: ['text/plain'],\n  testText: testOBJFile,\n  options: {\n    obj: {}\n  }\n};\n\nfunction testOBJFile(text) {\n  // TODO - There could be comment line first\n  return text[0] === 'v';\n}\n\nexport const _typecheckOBJLoader: Loader = OBJLoader;\n"],"file":"obj-loader.js"}
+{"version":3,"sources":["../../src/obj-loader.ts"],"names":["VERSION","OBJLoader","name","id","module","version","worker","extensions","mimeTypes","testText","testOBJFile","options","obj","text","_typecheckOBJLoader"],"mappings":";;;;;;AAIA,MAAMA,OAAO,GAAG,0BAAuB,WAAvB,oBAAmD,QAAnE;AAKO,MAAMC,SAAS,GAAG;AACvBC,EAAAA,IAAI,EAAE,KADiB;AAEvBC,EAAAA,EAAE,EAAE,KAFmB;AAGvBC,EAAAA,MAAM,EAAE,KAHe;AAIvBC,EAAAA,OAAO,EAAEL,OAJc;AAKvBM,EAAAA,MAAM,EAAE,IALe;AAMvBC,EAAAA,UAAU,EAAE,CAAC,KAAD,CANW;AAOvBC,EAAAA,SAAS,EAAE,CAAC,YAAD,CAPY;AAQvBC,EAAAA,QAAQ,EAAEC,WARa;AASvBC,EAAAA,OAAO,EAAE;AACPC,IAAAA,GAAG,EAAE;AADE;AATc,CAAlB;;;AAcP,SAASF,WAAT,CAAqBG,IAArB,EAA2B;AAEzB,SAAOA,IAAI,CAAC,CAAD,CAAJ,KAAY,GAAnB;AACD;;AAEM,MAAMC,mBAA2B,GAAGb,SAApC","sourcesContent":["import type {Loader} from '@loaders.gl/loader-utils';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\n/**\n * Worker loader for the OBJ geometry format\n */\nexport const OBJLoader = {\n  name: 'OBJ',\n  id: 'obj',\n  module: 'obj',\n  version: VERSION,\n  worker: true,\n  extensions: ['obj'],\n  mimeTypes: ['text/plain'],\n  testText: testOBJFile,\n  options: {\n    obj: {}\n  }\n};\n\nfunction testOBJFile(text) {\n  // TODO - There could be comment line first\n  return text[0] === 'v';\n}\n\nexport const _typecheckOBJLoader: Loader = OBJLoader;\n"],"file":"obj-loader.js"}

package/dist/es5/workers/obj-worker.js

@@ -1,4 +1,8 @@
-import {createLoaderWorker} from '@loaders.gl/loader-utils';
-import {OBJLoader} from '../index';
+"use strict";
 
-createLoaderWorker(OBJLoader);
+var _loaderUtils = require("@loaders.gl/loader-utils");
+
+var _index = require("../index");
+
+(0, _loaderUtils.createLoaderWorker)(_index.OBJLoader);
+//# sourceMappingURL=obj-worker.js.map

package/dist/es5/workers/obj-worker.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/workers/obj-worker.ts"],"names":["OBJLoader"],"mappings":";;AAAA;;AACA;;AAEA,qCAAmBA,gBAAnB","sourcesContent":["import {createLoaderWorker} from '@loaders.gl/loader-utils';\nimport {OBJLoader} from '../index';\n\ncreateLoaderWorker(OBJLoader);\n"],"file":"obj-worker.js"}

package/dist/esm/obj-loader.js

@@ -1,4 +1,4 @@
-const VERSION = typeof "3.1.0-alpha.5" !== 'undefined' ? "3.1.0-alpha.5" : 'latest';
+const VERSION = typeof "3.1.0-beta.4" !== 'undefined' ? "3.1.0-beta.4" : 'latest';
 export const OBJLoader = {
   name: 'OBJ',
   id: 'obj',

package/dist/esm/obj-loader.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/obj-loader.ts"],"names":["VERSION","OBJLoader","name","id","module","version","worker","extensions","mimeTypes","testText","testOBJFile","options","obj","text","_typecheckOBJLoader"],"mappings":"AAIA,MAAMA,OAAO,GAAG,2BAAuB,WAAvB,qBAAmD,QAAnE;AAKA,OAAO,MAAMC,SAAS,GAAG;AACvBC,EAAAA,IAAI,EAAE,KADiB;AAEvBC,EAAAA,EAAE,EAAE,KAFmB;AAGvBC,EAAAA,MAAM,EAAE,KAHe;AAIvBC,EAAAA,OAAO,EAAEL,OAJc;AAKvBM,EAAAA,MAAM,EAAE,IALe;AAMvBC,EAAAA,UAAU,EAAE,CAAC,KAAD,CANW;AAOvBC,EAAAA,SAAS,EAAE,CAAC,YAAD,CAPY;AAQvBC,EAAAA,QAAQ,EAAEC,WARa;AASvBC,EAAAA,OAAO,EAAE;AACPC,IAAAA,GAAG,EAAE;AADE;AATc,CAAlB;;AAcP,SAASF,WAAT,CAAqBG,IAArB,EAA2B;AAEzB,SAAOA,IAAI,CAAC,CAAD,CAAJ,KAAY,GAAnB;AACD;;AAED,OAAO,MAAMC,mBAA2B,GAAGb,SAApC","sourcesContent":["import type {Loader} from '@loaders.gl/loader-utils';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\n/**\n * Worker loader for the OBJ geometry format\n */\nexport const OBJLoader = {\n  name: 'OBJ',\n  id: 'obj',\n  module: 'obj',\n  version: VERSION,\n  worker: true,\n  extensions: ['obj'],\n  mimeTypes: ['text/plain'],\n  testText: testOBJFile,\n  options: {\n    obj: {}\n  }\n};\n\nfunction testOBJFile(text) {\n  // TODO - There could be comment line first\n  return text[0] === 'v';\n}\n\nexport const _typecheckOBJLoader: Loader = OBJLoader;\n"],"file":"obj-loader.js"}
+{"version":3,"sources":["../../src/obj-loader.ts"],"names":["VERSION","OBJLoader","name","id","module","version","worker","extensions","mimeTypes","testText","testOBJFile","options","obj","text","_typecheckOBJLoader"],"mappings":"AAIA,MAAMA,OAAO,GAAG,0BAAuB,WAAvB,oBAAmD,QAAnE;AAKA,OAAO,MAAMC,SAAS,GAAG;AACvBC,EAAAA,IAAI,EAAE,KADiB;AAEvBC,EAAAA,EAAE,EAAE,KAFmB;AAGvBC,EAAAA,MAAM,EAAE,KAHe;AAIvBC,EAAAA,OAAO,EAAEL,OAJc;AAKvBM,EAAAA,MAAM,EAAE,IALe;AAMvBC,EAAAA,UAAU,EAAE,CAAC,KAAD,CANW;AAOvBC,EAAAA,SAAS,EAAE,CAAC,YAAD,CAPY;AAQvBC,EAAAA,QAAQ,EAAEC,WARa;AASvBC,EAAAA,OAAO,EAAE;AACPC,IAAAA,GAAG,EAAE;AADE;AATc,CAAlB;;AAcP,SAASF,WAAT,CAAqBG,IAArB,EAA2B;AAEzB,SAAOA,IAAI,CAAC,CAAD,CAAJ,KAAY,GAAnB;AACD;;AAED,OAAO,MAAMC,mBAA2B,GAAGb,SAApC","sourcesContent":["import type {Loader} from '@loaders.gl/loader-utils';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\n/**\n * Worker loader for the OBJ geometry format\n */\nexport const OBJLoader = {\n  name: 'OBJ',\n  id: 'obj',\n  module: 'obj',\n  version: VERSION,\n  worker: true,\n  extensions: ['obj'],\n  mimeTypes: ['text/plain'],\n  testText: testOBJFile,\n  options: {\n    obj: {}\n  }\n};\n\nfunction testOBJFile(text) {\n  // TODO - There could be comment line first\n  return text[0] === 'v';\n}\n\nexport const _typecheckOBJLoader: Loader = OBJLoader;\n"],"file":"obj-loader.js"}

package/dist/esm/workers/obj-worker.js

@@ -1,4 +1,4 @@
-import {createLoaderWorker} from '@loaders.gl/loader-utils';
-import {OBJLoader} from '../index';
-
+import { createLoaderWorker } from '@loaders.gl/loader-utils';
+import { OBJLoader } from '../index';
 createLoaderWorker(OBJLoader);
+//# sourceMappingURL=obj-worker.js.map

package/dist/esm/workers/obj-worker.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/workers/obj-worker.ts"],"names":["createLoaderWorker","OBJLoader"],"mappings":"AAAA,SAAQA,kBAAR,QAAiC,0BAAjC;AACA,SAAQC,SAAR,QAAwB,UAAxB;AAEAD,kBAAkB,CAACC,SAAD,CAAlB","sourcesContent":["import {createLoaderWorker} from '@loaders.gl/loader-utils';\nimport {OBJLoader} from '../index';\n\ncreateLoaderWorker(OBJLoader);\n"],"file":"obj-worker.js"}

package/dist/index.d.ts

@@ -10,13 +10,13 @@ export declare const OBJLoader: {
         loaderData: {
             header: {};
         };
-        schema: import("modules/schema/dist").Schema;
+        schema: import("@loaders.gl/schema").Schema;
         header: {
             vertexCount: number;
             boundingBox: [[number, number, number], [number, number, number]];
         };
         mode: number;
-        attributes: import("modules/schema/dist").MeshAttributes;
+        attributes: import("@loaders.gl/schema").MeshAttributes;
     }>;
     parseTextSync: typeof loadOBJ;
     name: string;
@@ -32,3 +32,4 @@ export declare const OBJLoader: {
     };
 };
 export declare const _typecheckOBJLoader: LoaderWithParser;
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +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,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAC,SAAS,IAAI,eAAe,EAAC,MAAM,cAAc,CAAC;AAI1D,OAAO,EAAC,eAAe,EAAC,CAAC;AAEzB;;GAEG;AACH,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;CAIrB,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,gBAA4B,CAAC"}

package/dist/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports._typecheckOBJLoader = exports.OBJLoader = exports.OBJWorkerLoader = void 0;
+const load_obj_1 = __importDefault(require("./lib/load-obj"));
+const obj_loader_1 = require("./obj-loader");
+Object.defineProperty(exports, "OBJWorkerLoader", { enumerable: true, get: function () { return obj_loader_1.OBJLoader; } });
+/**
+ * Loader for the OBJ geometry format
+ */
+exports.OBJLoader = {
+    ...obj_loader_1.OBJLoader,
+    parse: async (arrayBuffer, options) => (0, load_obj_1.default)(new TextDecoder().decode(arrayBuffer), options),
+    parseTextSync: load_obj_1.default
+};
+exports._typecheckOBJLoader = exports.OBJLoader;

package/dist/lib/get-obj-schema.d.ts

@@ -1,2 +1,3 @@
 import { Schema } from '@loaders.gl/schema';
 export declare function getOBJSchema(attributes: any, metadata?: {}): Schema;
+//# sourceMappingURL=get-obj-schema.d.ts.map

package/dist/lib/get-obj-schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-obj-schema.d.ts","sourceRoot":"","sources":["../../src/lib/get-obj-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAmD,MAAM,oBAAoB,CAAC;AAE5F,wBAAgB,YAAY,CAAC,UAAU,KAAA,EAAE,QAAQ,KAAK,UAgBrD"}

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

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getOBJSchema = void 0;
+const schema_1 = require("@loaders.gl/schema");
+function getOBJSchema(attributes, metadata = {}) {
+    let metadataMap;
+    for (const key in metadata) {
+        metadataMap = metadataMap || new Map();
+        if (key !== 'value') {
+            metadataMap.set(key, JSON.stringify(metadata[key]));
+        }
+    }
+    const fields = [];
+    for (const attributeName in attributes) {
+        const attribute = attributes[attributeName];
+        const field = getArrowFieldFromAttribute(attributeName, attribute);
+        fields.push(field);
+    }
+    return new schema_1.Schema(fields, metadataMap);
+}
+exports.getOBJSchema = getOBJSchema;
+function getArrowFieldFromAttribute(attributeName, attribute) {
+    const metadataMap = new Map();
+    for (const key in attribute) {
+        if (key !== 'value') {
+            metadataMap.set(key, JSON.stringify(attribute[key]));
+        }
+    }
+    const type = (0, schema_1.getArrowTypeFromTypedArray)(attribute.value);
+    const isSingleValue = !('size' in attribute) || attribute.size === 1;
+    return isSingleValue
+        ? new schema_1.Field(attributeName, type, false, metadataMap)
+        : new schema_1.Field(attributeName, new schema_1.FixedSizeList(attribute.size, new schema_1.Field('value', type)), false, metadataMap);
+}

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

@@ -11,3 +11,4 @@ export default function loadOBJ(text: any, options: any): {
     mode: number;
     attributes: MeshAttributes;
 };
+//# sourceMappingURL=load-obj.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"load-obj.d.ts","sourceRoot":"","sources":["../../src/lib/load-obj.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAKvD,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,IAAI,KAAA,EAAE,OAAO,KAAA;;;;;;;;;;;EAgC5C"}

package/dist/lib/load-obj.js

@@ -0,0 +1,73 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const schema_1 = require("@loaders.gl/schema");
+const parse_obj_1 = __importDefault(require("./parse-obj"));
+const get_obj_schema_1 = require("./get-obj-schema");
+function loadOBJ(text, options) {
+    const { meshes } = (0, parse_obj_1.default)(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,
+        attributes
+    };
+}
+exports.default = loadOBJ;
+// 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);
+        }
+        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;
+    }
+    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;
+}

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

@@ -0,0 +1 @@
+//# sourceMappingURL=obj-types.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"obj-types.d.ts","sourceRoot":"","sources":["../../src/lib/obj-types.ts"],"names":[],"mappings":""}

package/dist/lib/obj-types.js

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

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

@@ -3,3 +3,4 @@ declare const _default: (text: any) => {
     materials: never[];
 };
 export default _default;
+//# sourceMappingURL=parse-obj.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"parse-obj.d.ts","sourceRoot":"","sources":["../../src/lib/parse-obj.ts"],"names":[],"mappings":";;;;AAgTA,wBA4NE"}