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

Merge pull request #13216 from Mugen87/dev8

ColladaLoader: Improve evaluation of transparency
......@@ -1189,10 +1189,15 @@ THREE.ColladaLoader.prototype = {
case 'diffuse':
case 'specular':
case 'shininess':
case 'transparent':
case 'transparency':
data[ child.nodeName ] = parseEffectParameter( child );
break;
case 'transparent':
data[ child.nodeName ] = {
opaque: child.getAttribute( 'opaque' ),
data: parseEffectParameters( child )
};
break;
}
......@@ -1471,11 +1476,24 @@ THREE.ColladaLoader.prototype = {
material.emissive.fromArray( parameter.color );
break;
case 'transparent':
// if ( parameter.texture ) material.alphaMap = getTexture( parameter.texture );
// if ( parameter.data.texture ) material.alphaMap = getTexture( parameter.data.texture );
material.transparent = true;
break;
case 'transparency':
if ( parameter.float !== undefined ) material.opacity = parameter.float;
if ( parameter.float !== undefined ) {
material.opacity = parameter.float;
if ( parameters[ 'transparent' ] !== undefined ) {
var opaque = parameters[ 'transparent' ].opaque;
if ( opaque === 'RGB_ZERO' ) material.opacity = 1 - material.opacity;
}
}
material.transparent = true;
break;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册