djsundog/obj2gltf
1
0
Fork 0
mirror of https://github.com/CesiumGS/obj2gltf.git synced 2024-11-23 16:44:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Omar Shehata 2018-12-04 14:33:10 -05:00
parent b5da7be229
commit 7e9a7a87b8
3 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/obj2gltf.js
View File

@ -122,7 +122,7 @@ var argv = yargs
describe : 'The glTF will be saved with the KHR_materials_unlit extension.', describe : 'The glTF will be saved with the KHR_materials_unlit extension.',
type : 'boolean', type : 'boolean',
default : defaults.unlit default : defaults.unlit
}, }
}).parse(args); }).parse(args);
if (argv.metallicRoughness + argv.specularGlossiness > 1) { if (argv.metallicRoughness + argv.specularGlossiness > 1) {

3
lib/loadMtl.js
View File

@ -25,7 +25,6 @@ module.exports = loadMtl;
* *
* @param {String} mtlPath Path to the .mtl file. * @param {String} mtlPath Path to the .mtl file.
* @param {Object} options The options object passed along from lib/obj2gltf.js * @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. * @returns {Promise} A promise resolving to an array of glTF materials with Texture objects stored in the texture slots.
* *
* @private * @private
@ -733,4 +732,4 @@ function convertTraditionalToMetallicRoughness(material) {
material.specularColor = [metallicFactor, metallicFactor, metallicFactor, 1.0]; material.specularColor = [metallicFactor, metallicFactor, metallicFactor, 1.0];
material.specularShininess = roughnessFactor; material.specularShininess = roughnessFactor;
} }

13
specs/lib/obj2gltfSpec.js
View File

@ -184,17 +184,4 @@ describe('obj2gltf', function() {
obj2gltf(texturedObjPath, options); obj2gltf(texturedObjPath, options);
}).toThrowDeveloperError(); }).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();
});
}); });