From a8fe4e132df81355879aa54f733aa759a4248b72 Mon Sep 17 00:00:00 2001 From: Lewy Blue Date: Mon, 19 Mar 2018 09:48:40 +0700 Subject: [PATCH] alphebetized material parameters --- examples/js/loaders/FBXLoader.js | 40 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/examples/js/loaders/FBXLoader.js b/examples/js/loaders/FBXLoader.js index efc77a482d346..4b07ebf70edbb 100644 --- a/examples/js/loaders/FBXLoader.js +++ b/examples/js/loaders/FBXLoader.js @@ -445,26 +445,6 @@ parameters.displacementScale = properties.DisplacementFactor.value; - } - if ( properties.ReflectionFactor ) { - - parameters.reflectivity = properties.ReflectionFactor.value; - - } - if ( properties.Specular ) { - - parameters.specular = new THREE.Color().fromArray( properties.Specular.value ); - - } else if ( properties.SpecularColor && properties.SpecularColor.type === 'Color' ) { - - // The blender exporter exports specular color here instead of in properties.Specular - parameters.emissive = new THREE.Color().fromArray( properties.SpecularColor.value ); - - } - if ( properties.Shininess ) { - - parameters.shininess = properties.Shininess.value; - } if ( properties.Emissive ) { @@ -490,6 +470,26 @@ parameters.transparent = true; + } + if ( properties.ReflectionFactor ) { + + parameters.reflectivity = properties.ReflectionFactor.value; + + } + if ( properties.Shininess ) { + + parameters.shininess = properties.Shininess.value; + + } + if ( properties.Specular ) { + + parameters.specular = new THREE.Color().fromArray( properties.Specular.value ); + + } else if ( properties.SpecularColor && properties.SpecularColor.type === 'Color' ) { + + // The blender exporter exports specular color here instead of in properties.Specular + parameters.specular = new THREE.Color().fromArray( properties.SpecularColor.value ); + } connections.get( ID ).children.forEach( function ( child ) {