|
@@ -1855,7 +1855,7 @@ function WebGLRenderer( parameters ) {
|
|
|
|
|
|
|
|
} else if ( material.isShadowMaterial ) {
|
|
} else if ( material.isShadowMaterial ) {
|
|
|
|
|
|
|
|
- m_uniforms.color.value = material.color;
|
|
|
|
|
|
|
+ m_uniforms.color.value.copy( material.color );
|
|
|
m_uniforms.opacity.value = material.opacity;
|
|
m_uniforms.opacity.value = material.opacity;
|
|
|
|
|
|
|
|
}
|
|
}
|
|
@@ -1901,7 +1901,7 @@ function WebGLRenderer( parameters ) {
|
|
|
|
|
|
|
|
if ( material.color ) {
|
|
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 ) {
|
|
function refreshUniformsLine( uniforms, material ) {
|
|
|
|
|
|
|
|
- uniforms.diffuse.value = material.color;
|
|
|
|
|
|
|
+ uniforms.diffuse.value.copy( material.color );
|
|
|
uniforms.opacity.value = material.opacity;
|
|
uniforms.opacity.value = material.opacity;
|
|
|
|
|
|
|
|
}
|
|
}
|
|
@@ -2046,7 +2046,7 @@ function WebGLRenderer( parameters ) {
|
|
|
|
|
|
|
|
function refreshUniformsPoints( uniforms, material ) {
|
|
function refreshUniformsPoints( uniforms, material ) {
|
|
|
|
|
|
|
|
- uniforms.diffuse.value = material.color;
|
|
|
|
|
|
|
+ uniforms.diffuse.value.copy( material.color );
|
|
|
uniforms.opacity.value = material.opacity;
|
|
uniforms.opacity.value = material.opacity;
|
|
|
uniforms.size.value = material.size * _pixelRatio;
|
|
uniforms.size.value = material.size * _pixelRatio;
|
|
|
uniforms.scale.value = _height * 0.5;
|
|
uniforms.scale.value = _height * 0.5;
|
|
@@ -2069,7 +2069,7 @@ function WebGLRenderer( parameters ) {
|
|
|
|
|
|
|
|
function refreshUniformsSprites( uniforms, material ) {
|
|
function refreshUniformsSprites( uniforms, material ) {
|
|
|
|
|
|
|
|
- uniforms.diffuse.value = material.color;
|
|
|
|
|
|
|
+ uniforms.diffuse.value.copy( material.color );
|
|
|
uniforms.opacity.value = material.opacity;
|
|
uniforms.opacity.value = material.opacity;
|
|
|
uniforms.rotation.value = material.rotation;
|
|
uniforms.rotation.value = material.rotation;
|
|
|
uniforms.map.value = material.map;
|
|
uniforms.map.value = material.map;
|
|
@@ -2090,7 +2090,7 @@ function WebGLRenderer( parameters ) {
|
|
|
|
|
|
|
|
function refreshUniformsFog( uniforms, fog ) {
|
|
function refreshUniformsFog( uniforms, fog ) {
|
|
|
|
|
|
|
|
- uniforms.fogColor.value = fog.color;
|
|
|
|
|
|
|
+ uniforms.fogColor.value.copy( fog.color );
|
|
|
|
|
|
|
|
if ( fog.isFog ) {
|
|
if ( fog.isFog ) {
|
|
|
|
|
|
|
@@ -2117,7 +2117,7 @@ function WebGLRenderer( parameters ) {
|
|
|
|
|
|
|
|
function refreshUniformsPhong( uniforms, material ) {
|
|
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 )
|
|
uniforms.shininess.value = Math.max( material.shininess, 1e-4 ); // to prevent pow( 0.0, 0.0 )
|
|
|
|
|
|
|
|
if ( material.emissiveMap ) {
|
|
if ( material.emissiveMap ) {
|
Takahiro