提交 2f350889 编写于 作者: T Takahiro

Copy color to uniforms value

上级 1f4dd25e
......@@ -1855,7 +1855,7 @@ function WebGLRenderer( parameters ) {
} else if ( material.isShadowMaterial ) {
m_uniforms.color.value = material.color;
m_uniforms.color.value.copy( material.color );
m_uniforms.opacity.value = material.opacity;
}
......@@ -1901,7 +1901,7 @@ function WebGLRenderer( parameters ) {
if ( material.color ) {
uniforms.diffuse.value = material.color;
uniforms.diffuse.value.copy( material.color );
}
......@@ -2031,7 +2031,7 @@ function WebGLRenderer( parameters ) {
function refreshUniformsLine( uniforms, material ) {
uniforms.diffuse.value = material.color;
uniforms.diffuse.value.copy( material.color );
uniforms.opacity.value = material.opacity;
}
......@@ -2046,7 +2046,7 @@ function WebGLRenderer( parameters ) {
function refreshUniformsPoints( uniforms, material ) {
uniforms.diffuse.value = material.color;
uniforms.diffuse.value.copy( material.color );
uniforms.opacity.value = material.opacity;
uniforms.size.value = material.size * _pixelRatio;
uniforms.scale.value = _height * 0.5;
......@@ -2069,7 +2069,7 @@ function WebGLRenderer( parameters ) {
function refreshUniformsSprites( uniforms, material ) {
uniforms.diffuse.value = material.color;
uniforms.diffuse.value.copy( material.color );
uniforms.opacity.value = material.opacity;
uniforms.rotation.value = material.rotation;
uniforms.map.value = material.map;
......@@ -2090,7 +2090,7 @@ function WebGLRenderer( parameters ) {
function refreshUniformsFog( uniforms, fog ) {
uniforms.fogColor.value = fog.color;
uniforms.fogColor.value.copy( fog.color );
if ( fog.isFog ) {
......@@ -2117,7 +2117,7 @@ function WebGLRenderer( parameters ) {
function refreshUniformsPhong( uniforms, material ) {
uniforms.specular.value = material.specular;
uniforms.specular.value.copy( material.specular );
uniforms.shininess.value = Math.max( material.shininess, 1e-4 ); // to prevent pow( 0.0, 0.0 )
if ( material.emissiveMap ) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册