zhangyuheng/ObjToSchematic
1
0
Fork 0
forked from mirror/ObjToSchematic
Code Pull Requests 1 Activity

Fixed importing error messages being hidden, closes #128

Browse Source
This commit is contained in:
Lucas Dower 2023-06-01 20:32:31 +01:00
parent 50a68b5190
commit 21ea0e7c2c
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/importers/obj_importer.ts
View File

@ -176,21 +176,19 @@ export class ObjImporter extends IImporter {
];
public override import(file: File): Promise<Mesh> {
return new Promise((res, rej) => {
file.text().then((fileSource) => {
if (fileSource.includes('<27>')) {
rej(new AppError(LOC('import.invalid_encoding')));
}
return file.text().then((fileSource) => {
if (fileSource.includes('<27>')) {
throw new AppError(LOC('import.invalid_encoding'));
}
fileSource.replace('\r', ''); // Convert Windows carriage return
const fileLines = fileSource.split('\n');
fileSource.replace('\r', ''); // Convert Windows carriage return
const fileLines = fileSource.split('\n');
for (const line of fileLines) {
this.parseOBJLine(line);
}
for (const line of fileLines) {
this.parseOBJLine(line);
}
res(new Mesh(this._vertices, this._normals, this._uvs, this._tris, new Map()));
});
return new Mesh(this._vertices, this._normals, this._uvs, this._tris, new Map());
});
}
public parseOBJLine(line: string) {