djsundog
/
obj2gltf
mirror of https://github.com/CesiumGS/obj2gltf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #72 from AnalyticalGraphicsInc/error-reporting 

Return Promise.reject instead of throwing error
This commit is contained in:
Ed Mackey 2017-04-27 15:06:41 -04:00 committed by GitHub
parent 9213047cbb 81201dcd03
commit cab8911223
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/obj2gltf.js
View File

@ -15,6 +15,7 @@ var fsExtraOutputJson = Promise.promisify(fsExtra.outputJson);
var defaultValue = Cesium.defaultValue; var defaultValue = Cesium.defaultValue;
var defined = Cesium.defined; var defined = Cesium.defined;
var DeveloperError = Cesium.DeveloperError; var DeveloperError = Cesium.DeveloperError;
var RuntimeError = Cesium.RuntimeError;
module.exports = obj2gltf; module.exports = obj2gltf;
@ -85,7 +86,7 @@ function obj2gltf(objPath, gltfPath, options) {
} }
if (binary && bypassPipeline) { if (binary && bypassPipeline) {
throw new DeveloperError('--bypassPipeline does not convert to binary glTF'); return Promise.reject(new RuntimeError('--bypassPipeline does not convert to binary glTF'));
} }
gltfPath = path.join(path.dirname(gltfPath), modelName + extension); gltfPath = path.join(path.dirname(gltfPath), modelName + extension);