mirror of
https://github.com/CesiumGS/obj2gltf.git
synced 2024-11-23 08:34:14 -05:00
Cleanup
This commit is contained in:
parent
b5da7be229
commit
7e9a7a87b8
@ -122,7 +122,7 @@ var argv = yargs
|
||||
describe : 'The glTF will be saved with the KHR_materials_unlit extension.',
|
||||
type : 'boolean',
|
||||
default : defaults.unlit
|
||||
},
|
||||
}
|
||||
}).parse(args);
|
||||
|
||||
if (argv.metallicRoughness + argv.specularGlossiness > 1) {
|
||||
|
@ -25,7 +25,6 @@ module.exports = loadMtl;
|
||||
*
|
||||
* @param {String} mtlPath Path to the .mtl file.
|
||||
* @param {Object} options The options object passed along from lib/obj2gltf.js
|
||||
* @param {Boolean} options.hasNormals Whether the model has normals.
|
||||
* @returns {Promise} A promise resolving to an array of glTF materials with Texture objects stored in the texture slots.
|
||||
*
|
||||
* @private
|
||||
@ -733,4 +732,4 @@ function convertTraditionalToMetallicRoughness(material) {
|
||||
|
||||
material.specularColor = [metallicFactor, metallicFactor, metallicFactor, 1.0];
|
||||
material.specularShininess = roughnessFactor;
|
||||
}
|
||||
}
|
||||
|
@ -184,17 +184,4 @@ describe('obj2gltf', function() {
|
||||
obj2gltf(texturedObjPath, options);
|
||||
}).toThrowDeveloperError();
|
||||
});
|
||||
|
||||
it('adds KHR_materials_unlit to materials if unlit is set', function(done) {
|
||||
var options = {
|
||||
unlit : true
|
||||
};
|
||||
expect(obj2gltf(texturedObjPath, options)
|
||||
.then(function(glb) {
|
||||
for(var i = 0;i < glb.materials.length; i++) {
|
||||
var material = glb.materials[i];
|
||||
expect(material.extensions.KHR_materials_unlit).toBeDefined();
|
||||
}
|
||||
}), done).toResolve();
|
||||
});
|
||||
});
|
||||
|
Loading…
Reference in New Issue
Block a user