WebGLRenderer: MAX_SHADOWS to NUM_SHADOWS renaming.

mrdoob · Nov 5, 2015 · 4099b1b · 4099b1b
1 parent 0f14e3c
commit 4099b1b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/src/renderers/shaders/ShaderChunk/shadowmap_fragment.glsl b/src/renderers/shaders/ShaderChunk/shadowmap_fragment.glsl
@@ -1,6 +1,6 @@
 #ifdef USE_SHADOWMAP
 
-	for ( int i = 0; i < MAX_SHADOWS; i ++ ) {
+	for ( int i = 0; i < NUM_SHADOWS; i ++ ) {
 
 		float texelSizeY =  1.0 / shadowMapSize[ i ].y;
 

diff --git a/src/renderers/shaders/ShaderChunk/shadowmap_pars_fragment.glsl b/src/renderers/shaders/ShaderChunk/shadowmap_pars_fragment.glsl
@@ -1,12 +1,12 @@
 #ifdef USE_SHADOWMAP
 
-	uniform sampler2D shadowMap[ MAX_SHADOWS ];
-	uniform vec2 shadowMapSize[ MAX_SHADOWS ];
+	uniform sampler2D shadowMap[ NUM_SHADOWS ];
+	uniform vec2 shadowMapSize[ NUM_SHADOWS ];
 
-	uniform float shadowDarkness[ MAX_SHADOWS ];
-	uniform float shadowBias[ MAX_SHADOWS ];
+	uniform float shadowDarkness[ NUM_SHADOWS ];
+	uniform float shadowBias[ NUM_SHADOWS ];
 
-	varying vec4 vShadowCoord[ MAX_SHADOWS ];
+	varying vec4 vShadowCoord[ NUM_SHADOWS ];
 
 	float unpackDepth( const in vec4 rgba_depth ) {
 

diff --git a/src/renderers/shaders/ShaderChunk/shadowmap_pars_vertex.glsl b/src/renderers/shaders/ShaderChunk/shadowmap_pars_vertex.glsl
@@ -1,7 +1,7 @@
 #ifdef USE_SHADOWMAP
 
-	uniform float shadowDarkness[ MAX_SHADOWS ];
-	uniform mat4 shadowMatrix[ MAX_SHADOWS ];
-	varying vec4 vShadowCoord[ MAX_SHADOWS ];
+	uniform float shadowDarkness[ NUM_SHADOWS ];
+	uniform mat4 shadowMatrix[ NUM_SHADOWS ];
+	varying vec4 vShadowCoord[ NUM_SHADOWS ];
 
 #endif
diff --git a/src/renderers/shaders/ShaderChunk/shadowmap_vertex.glsl b/src/renderers/shaders/ShaderChunk/shadowmap_vertex.glsl
@@ -1,6 +1,6 @@
 #ifdef USE_SHADOWMAP
 
-	for ( int i = 0; i < MAX_SHADOWS; i ++ ) {
+	for ( int i = 0; i < NUM_SHADOWS; i ++ ) {
 
 			vShadowCoord[ i ] = shadowMatrix[ i ] * worldPosition;
 

diff --git a/src/renderers/webgl/WebGLProgram.js b/src/renderers/webgl/WebGLProgram.js
@@ -250,7 +250,7 @@ THREE.WebGLProgram = ( function () {
 				'#define NUM_SPOT_LIGHTS ' + parameters.numSpotLights,
 				'#define NUM_HEMI_LIGHTS ' + parameters.numHemiLights,
 
-				'#define MAX_SHADOWS ' + parameters.maxShadows,
+				'#define NUM_SHADOWS ' + parameters.numShadows,
 
 				'#define MAX_BONES ' + parameters.maxBones,
 
@@ -361,7 +361,7 @@ THREE.WebGLProgram = ( function () {
 				'#define NUM_SPOT_LIGHTS ' + parameters.numSpotLights,
 				'#define NUM_HEMI_LIGHTS ' + parameters.numHemiLights,
 
-				'#define MAX_SHADOWS ' + parameters.maxShadows,
+				'#define NUM_SHADOWS ' + parameters.numShadows,
 
 				parameters.alphaTest ? '#define ALPHATEST ' + parameters.alphaTest : '',
 

diff --git a/src/renderers/webgl/WebGLPrograms.js b/src/renderers/webgl/WebGLPrograms.js
@@ -22,7 +22,7 @@ THREE.WebGLPrograms = function ( renderer, capabilities ) {
 		"flatShading", "sizeAttenuation", "logarithmicDepthBuffer", "skinning",
 		"maxBones", "useVertexTexture", "morphTargets", "morphNormals",
 		"maxMorphTargets", "maxMorphNormals", "numDirLights", "numPointLights",
-		"numSpotLights", "numHemiLights", "maxShadows", "shadowMapEnabled", "pointLightShadows",
+		"numSpotLights", "numHemiLights", "numShadows", "shadowMapEnabled", "pointLightShadows",
 		"shadowMapType", "shadowMapDebug", "alphaTest", "doubleSided",
 		"flipSided"
 	];
@@ -136,7 +136,7 @@ THREE.WebGLPrograms = function ( renderer, capabilities ) {
 			numSpotLights: lights.spot.length,
 			numHemiLights: lights.hemi.length,
 
-			maxShadows: lights.shadows.length,
+			numShadows: lights.shadows.length,
 			pointLightShadows: lights.shadowsPointLight,
 
 			shadowMapEnabled: renderer.shadowMap.enabled && object.receiveShadow && lights.shadows.length > 0,