@loaders.gl/obj 3.3.0-alpha.5 → 3.3.0-alpha.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/es5/bundle.js +0 -1
- package/dist/es5/bundle.js.map +1 -1
- package/dist/es5/index.js +4 -21
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/lib/get-obj-schema.js +0 -10
- package/dist/es5/lib/get-obj-schema.js.map +1 -1
- package/dist/es5/lib/obj-types.js.map +1 -1
- package/dist/es5/lib/parse-mtl.js +3 -22
- package/dist/es5/lib/parse-mtl.js.map +1 -1
- package/dist/es5/lib/parse-obj-meshes.js +20 -74
- package/dist/es5/lib/parse-obj-meshes.js.map +1 -1
- package/dist/es5/lib/parse-obj.js +7 -24
- package/dist/es5/lib/parse-obj.js.map +1 -1
- package/dist/es5/mtl-loader.js +2 -1
- package/dist/es5/mtl-loader.js.map +1 -1
- package/dist/es5/obj-loader.js +1 -3
- package/dist/es5/obj-loader.js.map +1 -1
- package/dist/es5/workers/obj-worker.js +0 -2
- package/dist/es5/workers/obj-worker.js.map +1 -1
- package/dist/esm/bundle.js +1 -1
- package/dist/esm/bundle.js.map +1 -1
- package/dist/esm/index.js +7 -2
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/lib/get-obj-schema.js +2 -9
- package/dist/esm/lib/get-obj-schema.js.map +1 -1
- package/dist/esm/lib/obj-types.js.map +1 -1
- package/dist/esm/lib/parse-mtl.js +5 -16
- package/dist/esm/lib/parse-mtl.js.map +1 -1
- package/dist/esm/lib/parse-obj-meshes.js +23 -76
- package/dist/esm/lib/parse-obj-meshes.js.map +1 -1
- package/dist/esm/lib/parse-obj.js +2 -10
- package/dist/esm/lib/parse-obj.js.map +1 -1
- package/dist/esm/mtl-loader.js +3 -1
- package/dist/esm/mtl-loader.js.map +1 -1
- package/dist/esm/obj-loader.js +2 -3
- package/dist/esm/obj-loader.js.map +1 -1
- package/dist/esm/workers/obj-worker.js.map +1 -1
- package/dist/index.d.ts +4 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/obj-worker.js +2 -2
- package/package.json +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"parse-obj.js","names":["getMeshBoundingBox","parseOBJMeshes","getOBJSchema","parseOBJ","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"],"sources":["../../../src/lib/parse-obj.ts"],"sourcesContent":["import type {MeshAttributes} from '@loaders.gl/schema';\nimport {getMeshBoundingBox} from '@loaders.gl/schema';\nimport {parseOBJMeshes} from './parse-obj-meshes';\nimport {getOBJSchema} from './get-obj-schema';\n\nexport function parseOBJ(text, options) {\n const {meshes} = parseOBJMeshes(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"],"mappings":"AACA,SAAQA,kBAAkB,QAAO,oBAAoB;AACrD,SAAQC,cAAc,QAAO,oBAAoB;AACjD,SAAQC,YAAY,QAAO,kBAAkB;AAE7C,OAAO,SAASC,QAAQ,CAACC,IAAI,EAAEC,OAAO,EAAE;EACtC,MAAM;IAACC;EAAM,CAAC,GAAGL,cAAc,CAACG,IAAI,CAAC;;EAGrC,MAAMG,WAAW,GAAGD,MAAM,CAACE,MAAM,CAAC,CAACC,CAAC,EAAEC,IAAI,KAAKD,CAAC,GAAGC,IAAI,CAACC,MAAM,CAACJ,WAAW,EAAE,CAAC,CAAC;EAE9E,MAAMK,UAAU,GAAGC,eAAe,CAACP,MAAM,EAAEC,WAAW,CAAC;EAEvD,MAAMI,MAAM,GAAG;IACbJ,WAAW;IAEXO,WAAW,EAAEd,kBAAkB,CAACY,UAAU;EAC5C,CAAC;EAED,MAAMG,MAAM,GAAGb,YAAY,CAACU,UAAU,EAAE;IACtCI,IAAI,EAAE,CAAC;IACPF,WAAW,EAAEH,MAAM,CAACG;EACtB,CAAC,CAAC;EAEF,OAAO;IAELG,UAAU,EAAE;MACVN,MAAM,EAAE,CAAC;IACX,CAAC;IAGDI,MAAM;IACNJ,MAAM;IACNK,IAAI,EAAE,CAAC;;IAEPJ;EACF,CAAC;AACH;;AAGA,SAASC,eAAe,CAACP,MAAM,EAAEC,WAAW,EAAE;EAC5C,MAAMW,SAAS,GAAG,IAAIC,YAAY,CAACZ,WAAW,GAAG,CAAC,CAAC;EACnD,IAAIa,OAAO;EACX,IAAIC,MAAM;EACV,IAAIC,GAAG;EACP,IAAIC,CAAC,GAAG,CAAC;EAET,KAAK,MAAMb,IAAI,IAAIJ,MAAM,EAAE;IACzB,MAAM;MAACkB,QAAQ;MAAEC,MAAM;MAAEC,OAAO;MAAEC;IAAU,CAAC,GAAGjB,IAAI,CAACE,UAAU;IAE/DM,SAAS,CAACU,GAAG,CAACJ,QAAQ,CAACK,KAAK,EAAEN,CAAC,GAAG,CAAC,CAAC;IAEpC,IAAIE,MAAM,EAAE;MACVL,OAAO,GAAGA,OAAO,IAAI,IAAID,YAAY,CAACZ,WAAW,GAAG,CAAC,CAAC;MACtDa,OAAO,CAACQ,GAAG,CAACH,MAAM,CAACI,KAAK,EAAEN,CAAC,GAAG,CAAC,CAAC;IAClC;IACA,IAAIG,OAAO,EAAE;MACXL,MAAM,GAAGA,MAAM,IAAI,IAAIF,YAAY,CAACZ,WAAW,GAAG,CAAC,CAAC;MACpDc,MAAM,CAACO,GAAG,CAACF,OAAO,CAACG,KAAK,EAAEN,CAAC,GAAG,CAAC,CAAC;IAClC;IACA,IAAII,UAAU,EAAE;MACdL,GAAG,GAAGA,GAAG,IAAI,IAAIH,YAAY,CAACZ,WAAW,GAAG,CAAC,CAAC;MAC9Ce,GAAG,CAACM,GAAG,CAACD,UAAU,CAACE,KAAK,EAAEN,CAAC,GAAG,CAAC,CAAC;IAClC;IAEAA,CAAC,IAAIC,QAAQ,CAACK,KAAK,CAACC,MAAM,GAAG,CAAC;EAChC;EAEA,MAAMlB,UAA0B,GAAG,CAAC,CAAC;EACrCA,UAAU,CAACY,QAAQ,GAAG;IAACK,KAAK,EAAEX,SAAS;IAAEa,IAAI,EAAE;EAAC,CAAC;EAEjD,IAAIX,OAAO,EAAE;IACXR,UAAU,CAACa,MAAM,GAAG;MAACI,KAAK,EAAET,OAAO;MAAEW,IAAI,EAAE;IAAC,CAAC;EAC/C;EACA,IAAIV,MAAM,EAAE;IACVT,UAAU,CAACc,OAAO,GAAG;MAACG,KAAK,EAAER,MAAM;MAAEU,IAAI,EAAE;IAAC,CAAC;EAC/C;EACA,IAAIT,GAAG,EAAE;IACPV,UAAU,CAACe,UAAU,GAAG;MAACE,KAAK,EAAEP,GAAG;MAAES,IAAI,EAAE;IAAC,CAAC;EAC/C;EAEA,OAAOnB,UAAU;AACnB"}
|
package/dist/esm/mtl-loader.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"mtl-loader.js","names":["VERSION","MTLLoader","name","id","module","version","worker","extensions","mimeTypes","testText","text","includes","options","mtl","_typecheckMTLLoader"],"sources":["../../src/mtl-loader.ts"],"sourcesContent":["// loaders.gl, MIT license\nimport type {Loader, LoaderOptions} from '@loaders.gl/loader-utils';\nimport type {ParseMTLOptions} from './lib/parse-mtl';\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\nexport type MTLLoaderOptions = LoaderOptions & {\n mtl?: ParseMTLOptions;\n};\n\n/**\n * Loader for the MTL material format\n * Parses a Wavefront .mtl file specifying materials\n */\nexport const MTLLoader = {\n name: 'MTL',\n id: 'mtl',\n module: 'mtl',\n version: VERSION,\n worker: true,\n extensions: ['mtl'],\n mimeTypes: ['text/plain'],\n testText: (text: string): boolean => text.includes('newmtl'),\n options: {\n mtl: {}\n }\n};\n\nexport const _typecheckMTLLoader: Loader = MTLLoader;\n"],"mappings":";;AAMA,MAAMA,OAAO,GAAG,sBAAkB,KAAK,WAAW,qBAAiB,QAAQ;AAU3E,OAAO,MAAMC,SAAS,GAAG;EACvBC,IAAI,EAAE,KAAK;EACXC,EAAE,EAAE,KAAK;EACTC,MAAM,EAAE,KAAK;EACbC,OAAO,EAAEL,OAAO;EAChBM,MAAM,EAAE,IAAI;EACZC,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBC,SAAS,EAAE,CAAC,YAAY,CAAC;EACzBC,QAAQ,EAAGC,IAAY,IAAcA,IAAI,CAACC,QAAQ,CAAC,QAAQ,CAAC;EAC5DC,OAAO,EAAE;IACPC,GAAG,EAAE,CAAC;EACR;AACF,CAAC;AAED,OAAO,MAAMC,mBAA2B,GAAGb,SAAS"}
|
package/dist/esm/obj-loader.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
|
|
1
|
+
|
|
2
|
+
const VERSION = typeof "3.3.0-alpha.7" !== 'undefined' ? "3.3.0-alpha.7" : 'latest';
|
|
2
3
|
export const OBJLoader = {
|
|
3
4
|
name: 'OBJ',
|
|
4
5
|
id: 'obj',
|
|
@@ -12,10 +13,8 @@ export const OBJLoader = {
|
|
|
12
13
|
obj: {}
|
|
13
14
|
}
|
|
14
15
|
};
|
|
15
|
-
|
|
16
16
|
function testOBJFile(text) {
|
|
17
17
|
return text[0] === 'v';
|
|
18
18
|
}
|
|
19
|
-
|
|
20
19
|
export const _typecheckOBJLoader = OBJLoader;
|
|
21
20
|
//# sourceMappingURL=obj-loader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"obj-loader.js","names":["VERSION","OBJLoader","name","id","module","version","worker","extensions","mimeTypes","testText","testOBJFile","options","obj","text","_typecheckOBJLoader"],"sources":["../../src/obj-loader.ts"],"sourcesContent":["import type {Loader, LoaderOptions} 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\nexport type OBJLoaderOptions = LoaderOptions & {\n obj?: {};\n};\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: string): boolean {\n // TODO - There could be comment line first\n return text[0] === 'v';\n}\n\nexport const _typecheckOBJLoader: Loader = OBJLoader;\n"],"mappings":";AAIA,MAAMA,OAAO,GAAG,sBAAkB,KAAK,WAAW,qBAAiB,QAAQ;AAS3E,OAAO,MAAMC,SAAS,GAAG;EACvBC,IAAI,EAAE,KAAK;EACXC,EAAE,EAAE,KAAK;EACTC,MAAM,EAAE,KAAK;EACbC,OAAO,EAAEL,OAAO;EAChBM,MAAM,EAAE,IAAI;EACZC,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBC,SAAS,EAAE,CAAC,YAAY,CAAC;EACzBC,QAAQ,EAAEC,WAAW;EACrBC,OAAO,EAAE;IACPC,GAAG,EAAE,CAAC;EACR;AACF,CAAC;AAED,SAASF,WAAW,CAACG,IAAY,EAAW;EAE1C,OAAOA,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG;AACxB;AAEA,OAAO,MAAMC,mBAA2B,GAAGb,SAAS"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"obj-worker.js","names":["createLoaderWorker","OBJLoader"],"sources":["../../../src/workers/obj-worker.ts"],"sourcesContent":["import {createLoaderWorker} from '@loaders.gl/loader-utils';\nimport {OBJLoader} from '../index';\n\ncreateLoaderWorker(OBJLoader);\n"],"mappings":"AAAA,SAAQA,kBAAkB,QAAO,0BAA0B;AAC3D,SAAQC,SAAS,QAAO,UAAU;AAElCD,kBAAkB,CAACC,SAAS,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -7,7 +7,7 @@ export { OBJWorkerLoader };
|
|
|
7
7
|
* Loader for the OBJ geometry format
|
|
8
8
|
*/
|
|
9
9
|
export declare const OBJLoader: {
|
|
10
|
-
parse: (arrayBuffer: ArrayBuffer, options?: OBJLoaderOptions
|
|
10
|
+
parse: (arrayBuffer: ArrayBuffer, options?: OBJLoaderOptions) => Promise<{
|
|
11
11
|
/**
|
|
12
12
|
* Loader for the MTL material format
|
|
13
13
|
*/
|
|
@@ -22,7 +22,7 @@ export declare const OBJLoader: {
|
|
|
22
22
|
mode: number;
|
|
23
23
|
attributes: import("@loaders.gl/schema").MeshAttributes;
|
|
24
24
|
}>;
|
|
25
|
-
parseTextSync: (text: string, options?: OBJLoaderOptions
|
|
25
|
+
parseTextSync: (text: string, options?: OBJLoaderOptions) => {
|
|
26
26
|
/**
|
|
27
27
|
* Loader for the MTL material format
|
|
28
28
|
*/
|
|
@@ -53,8 +53,8 @@ export declare const OBJLoader: {
|
|
|
53
53
|
* Loader for the MTL material format
|
|
54
54
|
*/
|
|
55
55
|
export declare const MTLLoader: {
|
|
56
|
-
parse: (arrayBuffer: ArrayBuffer, options?: MTLLoaderOptions
|
|
57
|
-
parseTextSync: (text: string, options?: MTLLoaderOptions
|
|
56
|
+
parse: (arrayBuffer: ArrayBuffer, options?: MTLLoaderOptions) => Promise<import("./lib/parse-mtl").MTLMaterial[]>;
|
|
57
|
+
parseTextSync: (text: string, options?: MTLLoaderOptions) => import("./lib/parse-mtl").MTLMaterial[];
|
|
58
58
|
name: string;
|
|
59
59
|
id: string;
|
|
60
60
|
module: string;
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAG/D,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AACnD,OAAO,EAAC,SAAS,IAAI,eAAe,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAKnD,OAAO,EAAC,eAAe,EAAC,CAAC;AAEzB;;GAEG;AACH,eAAO,MAAM,SAAS;yBAEO,WAAW;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAG/D,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AACnD,OAAO,EAAC,SAAS,IAAI,eAAe,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAKnD,OAAO,EAAC,eAAe,EAAC,CAAC;AAEzB;;GAEG;AACH,eAAO,MAAM,SAAS;yBAEO,WAAW,YAAY,gBAAgB;QAOpE;;WAEG;;;;;;;;;;;;0BAPqB,MAAM,YAAY,gBAAgB;QAK1D;;WAEG;;;;;;;;;;;;;;;;;;;;;;;CANF,CAAC;AAIF;;GAEG;AACH,eAAO,MAAM,SAAS;yBAEO,WAAW,YAAY,gBAAgB;0BAE5C,MAAM,YAAY,gBAAgB;;;;;;;;;;;;CACzD,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,gBAA4B,CAAC;AAC/D,eAAO,MAAM,mBAAmB,EAAE,gBAA4B,CAAC"}
|
package/dist/obj-worker.js
CHANGED
|
@@ -1205,7 +1205,7 @@
|
|
|
1205
1205
|
}
|
|
1206
1206
|
|
|
1207
1207
|
// src/obj-loader.ts
|
|
1208
|
-
var VERSION = true ? "3.3.0-alpha.
|
|
1208
|
+
var VERSION = true ? "3.3.0-alpha.7" : "latest";
|
|
1209
1209
|
var OBJLoader = {
|
|
1210
1210
|
name: "OBJ",
|
|
1211
1211
|
id: "obj",
|
|
@@ -1224,7 +1224,7 @@
|
|
|
1224
1224
|
}
|
|
1225
1225
|
|
|
1226
1226
|
// src/mtl-loader.ts
|
|
1227
|
-
var VERSION2 = true ? "3.3.0-alpha.
|
|
1227
|
+
var VERSION2 = true ? "3.3.0-alpha.7" : "latest";
|
|
1228
1228
|
var MTLLoader = {
|
|
1229
1229
|
name: "MTL",
|
|
1230
1230
|
id: "mtl",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loaders.gl/obj",
|
|
3
|
-
"version": "3.3.0-alpha.
|
|
3
|
+
"version": "3.3.0-alpha.7",
|
|
4
4
|
"description": "Framework-independent loader for the OBJ format",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"publishConfig": {
|
|
@@ -34,8 +34,8 @@
|
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
36
|
"@babel/runtime": "^7.3.1",
|
|
37
|
-
"@loaders.gl/loader-utils": "3.3.0-alpha.
|
|
38
|
-
"@loaders.gl/schema": "3.3.0-alpha.
|
|
37
|
+
"@loaders.gl/loader-utils": "3.3.0-alpha.7",
|
|
38
|
+
"@loaders.gl/schema": "3.3.0-alpha.7"
|
|
39
39
|
},
|
|
40
|
-
"gitHead": "
|
|
40
|
+
"gitHead": "29b08f3519c50984e84bf4234e607cab7c7d1c3e"
|
|
41
41
|
}
|