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

Move incompatible argument checking to bin file

This commit is contained in:
Sean Lilley 2017-07-28 17:34:56 -04:00
parent 3da691df62
commit 487eca91f8
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bin/obj2gltf.js
View File

@ -122,6 +122,16 @@ var argv = yargs
} }
}).parse(args); }).parse(args);
if (argv.metallicRoughness + argv.specularGlossiness + argv.materialsCommon > 1) {
console.error('Only one material type may be set from [--metallicRoughness, --specularGlossiness, --materialsCommon].');
process.exit(1);
}
if (defined(argv.metallicRoughnessOcclusionTexture) && defined(argv.specularGlossinessTexture)) {
console.error('--metallicRoughnessOcclusionTexture and --specularGlossinessTexture cannot both be set.');
process.exit(1);
}
var objPath = argv.i; var objPath = argv.i;
var gltfPath = argv.o; var gltfPath = argv.o;
@ -157,14 +167,10 @@ var options = {
console.time('Total'); console.time('Total');
try { obj2gltf(objPath, gltfPath, options)
obj2gltf(objPath, gltfPath, options) .then(function() {
.then(function() { console.timeEnd('Total');
console.timeEnd('Total'); })
}) .catch(function(error) {
.catch(function(error) { console.log(error.message);
console.log(error.message); });
});
} catch(error) {
console.log(error.message);
}

4
lib/obj2gltf.js
View File

@ -83,11 +83,11 @@ function obj2gltf(objPath, gltfPath, options) {
} }
if (metallicRoughness + specularGlossiness + materialsCommon > 1) { if (metallicRoughness + specularGlossiness + materialsCommon > 1) {
throw new DeveloperError('Only one material type may be set from [--metallicRoughness, --specularGlossiness, --materialsCommon].'); throw new DeveloperError('Only one material type may be set from [metallicRoughness, specularGlossiness, materialsCommon].');
} }
if (defined(overridingImages.metallicRoughnessOcclusionTexture) && defined(overridingImages.specularGlossinessTexture)) { if (defined(overridingImages.metallicRoughnessOcclusionTexture) && defined(overridingImages.specularGlossinessTexture)) {
throw new DeveloperError('options.overridingImages.metallicRoughnessOcclusionTexture and options.overridingImages.specularGlossinessTexture cannot both be defined.'); throw new DeveloperError('metallicRoughnessOcclusionTexture and specularGlossinessTexture cannot both be defined.');
} }
if (defined(overridingImages.metallicRoughnessOcclusionTexture)) { if (defined(overridingImages.metallicRoughnessOcclusionTexture)) {