Merge pull request mrdoob#6354 from benaadams/revertish-glsl

mrdoob · mrdoob · commit 839ee7a38dd8 · 2015-04-08T09:52:08.000-04:00
Add defines for glsl functions
diff --git a/src/renderers/shaders/ShaderChunk/common.glsl b/src/renderers/shaders/ShaderChunk/common.glsl
@@ -4,6 +4,9 @@
 #define LOG2 1.442695
 #define EPSILON 1e-6
 
+#define saturate(a) clamp( a, 0.0, 1.0 )
+#define whiteCompliment(a) ( 1.0 - saturate( a ) )
+
 vec3 transformDirection( in vec3 normal, in mat4 matrix ) {
 
 	return normalize( ( matrix * vec4( normal, 0.0 ) ).xyz );
@@ -41,7 +44,7 @@ float calcLightAttenuation( float lightDistance, float cutoffDistance, float dec
 
 	if ( decayExponent > 0.0 ) {
 
-	  return pow( clamp( -lightDistance / cutoffDistance + 1.0, 0.0, 1.0 ), decayExponent );
+	  return pow( saturate( -lightDistance / cutoffDistance + 1.0 ), decayExponent );
 
 	}
 
@@ -75,10 +78,10 @@ vec3 BRDF_BlinnPhong( in vec3 specularColor, in float shininess, in vec3 normal,
 
 	vec3 halfDir = normalize( lightDir + viewDir );
 
-	//float dotNL = clamp( dot( normal, lightDir ), 0.0, 1.0 );
-	//float dotNV = clamp( dot( normal, viewDir ), 0.0, 1.0 );
-	float dotNH = clamp( dot( normal, halfDir ), 0.0, 1.0 );
-	float dotLH = clamp( dot( lightDir, halfDir ), 0.0, 1.0 );
+	//float dotNL = saturate( dot( normal, lightDir ) );
+	//float dotNV = saturate( dot( normal, viewDir ) );
+	float dotNH = saturate( dot( normal, halfDir ) );
+	float dotLH = saturate( dot( lightDir, halfDir ) );
 
 	vec3 F = F_Schlick( specularColor, dotLH );
 
diff --git a/src/renderers/shaders/ShaderChunk/envmap_fragment.glsl b/src/renderers/shaders/ShaderChunk/envmap_fragment.glsl
@@ -34,7 +34,7 @@
 
 	#elif defined( ENVMAP_TYPE_EQUIREC )
 		vec2 sampleUV;
-		sampleUV.y = clamp( flipNormal * reflectVec.y * 0.5 + 0.5, 0.0, 1.0 );
+		sampleUV.y = saturate( flipNormal * reflectVec.y * 0.5 + 0.5 );
 		sampleUV.x = atan( flipNormal * reflectVec.z, flipNormal * reflectVec.x ) * RECIPROCAL_PI2 + 0.5;
 		vec4 envColor = texture2D( envMap, sampleUV );
 
diff --git a/src/renderers/shaders/ShaderChunk/fog_fragment.glsl b/src/renderers/shaders/ShaderChunk/fog_fragment.glsl
@@ -12,7 +12,7 @@
 
 	#ifdef FOG_EXP2
 
-		float fogFactor = 1.0 - clamp( exp2( - fogDensity * fogDensity * depth * depth * LOG2 ), 0.0, 1.0 );
+		float fogFactor = whiteCompliment( exp2( - fogDensity * fogDensity * depth * depth * LOG2 ) );
 
 	#else
 
diff --git a/src/renderers/shaders/ShaderChunk/helper_funcs.glsl b/src/renderers/shaders/ShaderChunk/helper_funcs.glsl
diff --git a/src/renderers/shaders/ShaderChunk/lights_phong_fragment.glsl b/src/renderers/shaders/ShaderChunk/lights_phong_fragment.glsl
@@ -78,7 +78,7 @@ vec3 totalSpecularLight = vec3( 0.0 );
 
 		if ( spotEffect > spotLightAngleCos[ i ] ) {
 
-			spotEffect = clamp( pow( clamp( spotEffect, 0.0, 1.0 ), spotLightExponent[ i ] ), 0.0, 1.0 );
+			spotEffect = saturate( pow( saturate( spotEffect ), spotLightExponent[ i ] ) );
 
 			// attenuation
 
diff --git a/src/renderers/shaders/ShaderChunk/lights_phong_pars_fragment.glsl b/src/renderers/shaders/ShaderChunk/lights_phong_pars_fragment.glsl
@@ -60,12 +60,11 @@ varying vec3 vViewPosition;
 vec3 calcCosineTerm( in vec3 normal, in vec3 lightDir ) {
 
 	float dotProduct = dot( normal, lightDir );
-
-	vec3 cosineTerm = vec3( clamp( dotProduct, 0.0, 1.0 ) );
+	vec3 cosineTerm = vec3( saturate( dotProduct ) );
 
 	#ifdef WRAP_AROUND
 
-		vec3 cosineTermHalf = vec3( clamp( 0.5 * dotProduct + 0.5, 0.0, 1.0 ) );
+		vec3 cosineTermHalf = vec3( saturate( 0.5 * dotProduct + 0.5 ) );
 
 		cosineTerm = mix( cosineTerm, cosineTermHalf, wrapRGB );
 
diff --git a/src/renderers/shaders/ShaderLib.js b/src/renderers/shaders/ShaderLib.js
@@ -737,7 +737,7 @@ THREE.ShaderLib = {
 				// "	gl_FragColor = textureCube( tCube, vec3( tFlip * vWorldPosition.x, vWorldPosition.yz ) );",
 				"vec3 direction = normalize( vWorldPosition );",
 				"vec2 sampleUV;",
-				"sampleUV.y = clamp( tFlip * direction.y * -0.5 + 0.5, 0.0, 1.0 );",
+				"sampleUV.y = saturate( tFlip * direction.y * -0.5 + 0.5 );",
 				"sampleUV.x = atan( direction.z, direction.x ) * RECIPROCAL_PI2 + 0.5;",
 				"gl_FragColor = texture2D( tEquirect, sampleUV );",
 
diff --git a/utils/build/includes/common.json b/utils/build/includes/common.json
@@ -108,7 +108,6 @@
 	"src/renderers/shaders/ShaderChunk/envmap_vertex.glsl",
 	"src/renderers/shaders/ShaderChunk/fog_fragment.glsl",
 	"src/renderers/shaders/ShaderChunk/fog_pars_fragment.glsl",
-	"src/renderers/shaders/ShaderChunk/helper_funcs.glsl",
 	"src/renderers/shaders/ShaderChunk/lightmap_fragment.glsl",
 	"src/renderers/shaders/ShaderChunk/lightmap_pars_fragment.glsl",
 	"src/renderers/shaders/ShaderChunk/lights_lambert_pars_vertex.glsl",
