mirror of
https://github.com/CesiumGS/obj2gltf.git
synced 2024-11-23 16:44:05 -05:00
Merge pull request #268 from CesiumGS/fix-missing-mtl
Fix unhandled error when mtl is missing
This commit is contained in:
commit
049f7af86b
@ -1,5 +1,9 @@
|
|||||||
# Change Log
|
# Change Log
|
||||||
|
|
||||||
|
### 3.1.3 - 2021-09-15
|
||||||
|
|
||||||
|
- Fixed bug where missing .mtl files were no longer being handled gracefully in Node 16. [#268](https://github.com/CesiumGS/obj2gltf/pull/268)
|
||||||
|
|
||||||
### 3.1.2 - 2021-08-02
|
### 3.1.2 - 2021-08-02
|
||||||
|
|
||||||
- Removed `minFilter` and `magFilter` from generated samplers so that runtime engines can use their preferred texture filtering. [#240](https://github.com/CesiumGS/obj2gltf/pull/240)
|
- Removed `minFilter` and `magFilter` from generated samplers so that runtime engines can use their preferred texture filtering. [#240](https://github.com/CesiumGS/obj2gltf/pull/240)
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
const fsExtra = require("fs-extra");
|
const fsExtra = require("fs-extra");
|
||||||
const Promise = require("bluebird");
|
const Promise = require("bluebird");
|
||||||
const readline = require("readline");
|
const readline = require("readline");
|
||||||
|
const events = require("events");
|
||||||
|
|
||||||
module.exports = readLines;
|
module.exports = readLines;
|
||||||
|
|
||||||
@ -15,23 +16,25 @@ module.exports = readLines;
|
|||||||
* @private
|
* @private
|
||||||
*/
|
*/
|
||||||
function readLines(path, callback) {
|
function readLines(path, callback) {
|
||||||
return new Promise(function (resolve, reject) {
|
const stream = fsExtra.createReadStream(path);
|
||||||
const stream = fsExtra.createReadStream(path);
|
return events.once(stream, "open").then(function () {
|
||||||
stream.on("error", reject);
|
return new Promise(function (resolve, reject) {
|
||||||
stream.on("end", resolve);
|
stream.on("error", reject);
|
||||||
|
stream.on("end", resolve);
|
||||||
|
|
||||||
const lineReader = readline.createInterface({
|
const lineReader = readline.createInterface({
|
||||||
input: stream,
|
input: stream,
|
||||||
|
});
|
||||||
|
|
||||||
|
const callbackWrapper = function (line) {
|
||||||
|
try {
|
||||||
|
callback(line);
|
||||||
|
} catch (error) {
|
||||||
|
reject(error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
lineReader.on("line", callbackWrapper);
|
||||||
});
|
});
|
||||||
|
|
||||||
const callbackWrapper = function (line) {
|
|
||||||
try {
|
|
||||||
callback(line);
|
|
||||||
} catch (error) {
|
|
||||||
reject(error);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
lineReader.on("line", callbackWrapper);
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user