未验证 提交 8cf60bfb 编写于 作者: M Mr.doob 提交者: GitHub

Merge pull request #13632 from looeee/FBXLoader_blender_specular_fix

FBXLoader: alphebetized material parameters
......@@ -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 ) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册