Refactored ShadowMap code.

mrdoob · mrdoob · commit 8eaf494a4627 · 2016-01-29T04:10:43.000+09:00
Currently MeshBasicMaterial/MeshLambertMaterial doesn't support shadows. Not sure if they'll get that back.
diff --git a/editor/js/Sidebar.Project.js b/editor/js/Sidebar.Project.js
@@ -123,4 +123,4 @@ Sidebar.Project = function ( editor ) {
 
 	return container;
 
-}
+};
diff --git a/examples/js/ShaderSkin.js b/examples/js/ShaderSkin.js
@@ -246,11 +246,6 @@ THREE.ShaderSkin = {
 
 				"#endif",
 
-				THREE.ShaderChunk[ "shadowmap_fragment" ],
-
-				"totalDiffuseLight *= shadowMask;",
-				"totalSpecularLight *= shadowMask;",
-
 				"outgoingLight += diffuseColor.xyz * ( totalDiffuseLight + ambientLightColor * diffuse ) + totalSpecularLight;",
 
 				THREE.ShaderChunk[ "linear_to_gamma_fragment" ],
diff --git a/examples/js/ShaderTerrain.js b/examples/js/ShaderTerrain.js
@@ -232,7 +232,6 @@ THREE.ShaderTerrain = {
 
 				"outgoingLight += diffuseColor.xyz * ( totalDiffuseLight + ambientLightColor + totalSpecularLight );",
 
-				THREE.ShaderChunk[ "shadowmap_fragment" ],
 				THREE.ShaderChunk[ "linear_to_gamma_fragment" ],
 				THREE.ShaderChunk[ "fog_fragment" ],
 
diff --git a/examples/js/loaders/MMDLoader.js b/examples/js/loaders/MMDLoader.js
@@ -3822,8 +3822,6 @@ THREE.ShaderLib[ 'mmd' ] = {
 			THREE.ShaderChunk[ "normal_fragment" ],
 			THREE.ShaderChunk[ "emissivemap_fragment" ],
 
-			THREE.ShaderChunk[ "shadowmap_fragment" ],
-
 			// accumulation
 			THREE.ShaderChunk[ "lights_phong_fragment" ],
 			THREE.ShaderChunk[ "lights_template" ],
diff --git a/examples/js/nodes/materials/PhongNode.js b/examples/js/nodes/materials/PhongNode.js
@@ -207,8 +207,6 @@ THREE.PhongNode.prototype.build = function( builder ) {
 		output.push( 'material.diffuseColor = ' + ( light ? 'vec3( 1.0 )' : 'diffuseColor' ) + ';' );
 
 		output.push(
-			THREE.ShaderChunk[ "shadowmap_fragment" ],
-
 			// accumulation
 			'material.specularColor = specular;',
 			'material.specularShininess = shininess;',
diff --git a/examples/js/nodes/materials/StandardNode.js b/examples/js/nodes/materials/StandardNode.js
@@ -219,8 +219,6 @@ THREE.StandardNode.prototype.build = function( builder ) {
 		output.push( 'material.diffuseColor = ' + ( light ? 'vec3( 1.0 )' : 'diffuseColor * (1.0 - metalnessFactor)' ) + ';' );
 
 		output.push(
-			THREE.ShaderChunk[ "shadowmap_fragment" ],
-
 			// accumulation
 			'material.specularRoughness = clamp( roughnessFactor, 0.001, 1.0 );', // disney's remapping of [ 0, 1 ] roughness to [ 0.001, 1 ]
 			'material.specularColor = mix( vec3( 0.04 ), diffuseColor, metalnessFactor );',
diff --git a/examples/webgl_geometry_spline_editor.html b/examples/webgl_geometry_spline_editor.html
@@ -74,7 +74,6 @@
 				light.shadowCameraFar = camera.far;
 				light.shadowCameraFov = 70;
 				light.shadowBias = -0.000222;
-				light.shadowDarkness = 0.25;
 				light.shadowMapWidth = 1024;
 				light.shadowMapHeight = 1024;
 				scene.add( light );
diff --git a/examples/webgl_particles_general.html b/examples/webgl_particles_general.html
@@ -513,8 +513,6 @@
 		pointLight.castShadow = true;
 		pointLight.shadowCameraNear = 1;
 		pointLight.shadowCameraFar = 1000;
-		pointLight.shadowDarkness = .8;
-		// pointLight.shadowCameraVisible = true;
 		pointLight.shadowMapWidth = 4096;
 		pointLight.shadowMapHeight = 2048;
 		pointLight.shadowBias = - 0.5;
diff --git a/src/Three.Legacy.js b/src/Three.Legacy.js
@@ -314,7 +314,7 @@ Object.defineProperties( THREE.Light.prototype, {
 	},
 	shadowDarkness: {
 		set: function ( value ) {
-			this.shadow.darkness = value;
+			console.warn( 'THREE.Light: .shadowDarkness has been removed.' );
 		}
 	},
 	shadowMapWidth: {
diff --git a/src/lights/LightShadow.js b/src/lights/LightShadow.js
@@ -7,7 +7,6 @@ THREE.LightShadow = function ( camera ) {
 	this.camera = camera;
 
 	this.bias = 0;
-	this.darkness = 1;
 
 	this.mapSize = new THREE.Vector2( 512, 512 );
 
@@ -25,7 +24,6 @@ THREE.LightShadow.prototype = {
 		this.camera = source.camera.clone();
 
 		this.bias = source.bias;
-		this.darkness = source.darkness;
 
 		this.mapSize.copy( source.mapSize );
 
diff --git a/src/renderers/WebGLRenderer.js b/src/renderers/WebGLRenderer.js
@@ -2169,13 +2169,6 @@ THREE.WebGLRenderer = function ( parameters ) {
 					_vector3.setFromMatrixPosition( light.matrixWorld ).negate();
 					shadow.matrix.identity().setPosition( _vector3 );
 
-					// for point lights we set the sign of the shadowDarkness uniform to be negative
-					uniforms.shadowDarkness.value[ i ] = - shadow.darkness;
-
-				} else {
-
-					uniforms.shadowDarkness.value[ i ] = shadow.darkness;
-
 				}
 
 				uniforms.shadowBias.value[ i ] = shadow.bias;
diff --git a/src/renderers/shaders/ShaderChunk/lights_template.glsl b/src/renderers/shaders/ShaderChunk/lights_template.glsl
@@ -28,13 +28,7 @@ geometry.viewDir = normalize( vViewPosition );
 		IncidentLight directLight = getPointDirectLight( pointLight, geometry );
 
 		#ifdef USE_SHADOWMAP
-		if ( pointLight.shadow > - 1 ) {
-			for ( int j = 0; j < NUM_SHADOWS; j ++ ) {
-				if ( j == pointLight.shadow ) {
-					directLight.color *= shadows[ j ];
-				}
-			}
-		}
+			directLight.color *= getPointShadowById( pointLight.shadow );
 		#endif
 
 		RE_Direct( directLight, geometry, material, reflectedLight );
@@ -52,13 +46,7 @@ geometry.viewDir = normalize( vViewPosition );
 		IncidentLight directLight = getSpotDirectLight( spotLight, geometry );
 
 		#ifdef USE_SHADOWMAP
-		if ( spotLight.shadow > - 1 ) {
-			for ( int j = 0; j < NUM_SHADOWS; j ++ ) {
-				if ( j == spotLight.shadow ) {
-					directLight.color *= shadows[ j ];
-				}
-			}
-		}
+			directLight.color *= getShadowById( spotLight.shadow );
 		#endif
 
 		RE_Direct( directLight, geometry, material, reflectedLight );
@@ -76,13 +64,7 @@ geometry.viewDir = normalize( vViewPosition );
 		IncidentLight directLight = getDirectionalDirectLight( directionalLight, geometry );
 
 		#ifdef USE_SHADOWMAP
-		if ( directionalLight.shadow > - 1 ) {
-			for ( int j = 0; j < NUM_SHADOWS; j ++ ) {
-				if ( j == directionalLight.shadow ) {
-					directLight.color *= shadows[ j ];
-				}
-			}
-		}
+			directLight.color *= getShadowById( directionalLight.shadow );
 		#endif
 
 		RE_Direct( directLight, geometry, material, reflectedLight );
diff --git a/src/renderers/shaders/ShaderChunk/shadowmap_fragment.glsl b/src/renderers/shaders/ShaderChunk/shadowmap_fragment.glsl
diff --git a/src/renderers/shaders/ShaderChunk/shadowmap_pars_fragment.glsl b/src/renderers/shaders/ShaderChunk/shadowmap_pars_fragment.glsl
diff --git a/src/renderers/shaders/ShaderLib.js b/src/renderers/shaders/ShaderLib.js
diff --git a/src/renderers/shaders/UniformsLib.js b/src/renderers/shaders/UniformsLib.js
diff --git a/src/renderers/webgl/WebGLLights.js b/src/renderers/webgl/WebGLLights.js
diff --git a/utils/build/includes/common.json b/utils/build/includes/common.json

Original file line number	Diff line number	Diff line change
`@@ -123,4 +123,4 @@ Sidebar.Project = function ( editor ) {`
`123`	`123`
`124`	`124`	`return container;`
`125`	`125`
`126`		`-}`
	`126`	`+};`
Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@ Object.defineProperties( THREE.Light.prototype, {`
`314`	`314`	`},`
`315`	`315`	`shadowDarkness: {`
`316`	`316`	`set: function ( value ) {`
`317`		`- this.shadow.darkness = value;`
	`317`	`+ console.warn( 'THREE.Light: .shadowDarkness has been removed.' );`
`318`	`318`	`}`
`319`	`319`	`},`
`320`	`320`	`shadowMapWidth: {`