From f94562b56a765212488c63024c849760eb2a7d8c Mon Sep 17 00:00:00 2001 From: Takahiro Date: Tue, 7 Mar 2017 08:56:15 -0800 Subject: [PATCH] Clean up color setting in GLTF2Loader --- examples/js/loaders/GLTF2Loader.js | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/examples/js/loaders/GLTF2Loader.js b/examples/js/loaders/GLTF2Loader.js index 1f7523a23a..276cd1efef 100644 --- a/examples/js/loaders/GLTF2Loader.js +++ b/examples/js/loaders/GLTF2Loader.js @@ -1201,7 +1201,8 @@ THREE.GLTF2Loader = ( function () { var metallicRoughness = material.pbrMetallicRoughness; - materialParams.color = new THREE.Color(); + materialParams.color = new THREE.Color( 1.0, 1.0, 1.0 ); + materialParams.opacity = 1.0; if ( Array.isArray( metallicRoughness.baseColorFactor ) ) { @@ -1210,11 +1211,6 @@ THREE.GLTF2Loader = ( function () { materialParams.color.fromArray( array ); materialParams.opacity = array[ 3 ]; - } else { - - materialParams.color.setRGB( 1.0, 1.0, 1.0 ); - materialParams.opacity = 1.0; - } if ( metallicRoughness.baseColorTexture !== undefined ) { @@ -1265,16 +1261,12 @@ THREE.GLTF2Loader = ( function () { } - materialParams.emissive = new THREE.Color(); + materialParams.emissive = new THREE.Color( 0.0, 0.0, 0.0 ); if ( material.emissiveFactor !== undefined ) { materialParams.emissive.fromArray( material.emissiveFactor ); - } else { - - materialParams.emissive.setRGB( 0.0, 0.0, 0.0 ); - } Object.assign( materialValues, material.values ); -- GitLab