Browse Source

fix two bugs with premultiplied alpha implementation.

Ben Houston 9 years ago
parent
commit
ce91ae9e46
2 changed files with 3 additions and 2 deletions
  1. 2 0
      src/materials/Material.js
  2. 1 2
      src/renderers/webgl/WebGLPrograms.js

+ 2 - 0
src/materials/Material.js

@@ -185,6 +185,8 @@ THREE.Material.prototype = {
 
 
 		}
 		}
 
 
+		if( this.premultipliedAlpha ) data.premultipliedAlpha = this.premultipliedAlpha;
+
 		if ( this.size !== undefined ) data.size = this.size;
 		if ( this.size !== undefined ) data.size = this.size;
 		if ( this.sizeAttenuation !== undefined ) data.sizeAttenuation = this.sizeAttenuation;
 		if ( this.sizeAttenuation !== undefined ) data.sizeAttenuation = this.sizeAttenuation;
 
 

+ 1 - 2
src/renderers/webgl/WebGLPrograms.js

@@ -21,7 +21,7 @@ THREE.WebGLPrograms = function ( renderer, capabilities ) {
 		"alphaMap", "combine", "vertexColors", "fog", "useFog", "fogExp",
 		"alphaMap", "combine", "vertexColors", "fog", "useFog", "fogExp",
 		"flatShading", "sizeAttenuation", "logarithmicDepthBuffer", "skinning",
 		"flatShading", "sizeAttenuation", "logarithmicDepthBuffer", "skinning",
 		"maxBones", "useVertexTexture", "morphTargets", "morphNormals",
 		"maxBones", "useVertexTexture", "morphTargets", "morphNormals",
-		"maxMorphTargets", "maxMorphNormals",
+		"maxMorphTargets", "maxMorphNormals", "premultipliedAlpha",
 		"numDirLights", "numPointLights", "numSpotLights", "numHemiLights",
 		"numDirLights", "numPointLights", "numSpotLights", "numHemiLights",
 		"shadowMapEnabled", "pointLightShadows",
 		"shadowMapEnabled", "pointLightShadows",
 		"shadowMapType",
 		"shadowMapType",
@@ -181,7 +181,6 @@ THREE.WebGLPrograms = function ( renderer, capabilities ) {
 			flipSided: material.side === THREE.BackSide
 			flipSided: material.side === THREE.BackSide
 
 
 		};
 		};
-
 		return parameters;
 		return parameters;
 
 
 	};
 	};