Mr.doob vor 9 Jahren
Ursprung
Commit
a51411ab6c

+ 4 - 0
src/renderers/shaders/ShaderChunk/envmap_fragment.glsl

@@ -30,17 +30,21 @@
 	#endif
 
 	#ifdef ENVMAP_TYPE_CUBE
+
 		vec4 envColor = textureCube( envMap, flipNormal * vec3( flipEnvMap * reflectVec.x, reflectVec.yz ) );
 
 	#elif defined( ENVMAP_TYPE_EQUIREC )
+
 		vec2 sampleUV;
 		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 );
 
 	#elif defined( ENVMAP_TYPE_SPHERE )
+
 		vec3 reflectView = flipNormal * normalize((viewMatrix * vec4( reflectVec, 0.0 )).xyz + vec3(0.0,0.0,1.0));
 		vec4 envColor = texture2D( envMap, reflectView.xy * 0.5 + 0.5 );
+
 	#endif
 
 	envColor = envMapTexelToLinear( envColor );

+ 2 - 2
src/renderers/shaders/ShaderChunk/lights_pars.glsl

@@ -181,8 +181,8 @@
 
 		#elif defined( ENVMAP_TYPE_CUBE_UV )
 
-				vec3 queryVec = flipNormal * vec3( flipEnvMap * worldNormal.x, worldNormal.yz );
-				vec4 envMapColor = textureCubeUV(queryVec, 1.0);
+			vec3 queryVec = flipNormal * vec3( flipEnvMap * worldNormal.x, worldNormal.yz );
+			vec4 envMapColor = textureCubeUV( queryVec, 1.0 );
 
 		#else
 

+ 8 - 2
src/renderers/webgl/WebGLProgram.js

@@ -47,30 +47,36 @@ THREE.WebGLProgram = ( function () {
 	}
 
 	function getToneMappingFunction( functionName, toneMapping ) {
+
 		var toneMappingName;
 
-		switch( toneMapping ) {
+		switch ( toneMapping ) {
+
 			case THREE.LinearToneMapping:
 				toneMappingName = "Linear";
 				break;
+
 			case THREE.ReinhardToneMapping:
 				toneMappingName = "Reinhard";
 				break;
+
 			case THREE.Uncharted2ToneMapping:
 				toneMappingName = "Uncharted2";
 				break;
+
 			case THREE.CineonToneMapping:
 				toneMappingName = "OptimizedCineon";
 				break;
+
 			default:
 				throw new Error( 'unsupported toneMapping: ' + toneMapping );
 
 		}
+
 		return "vec3 " + functionName + "( vec3 color ) { return " + toneMappingName + "ToneMapping( color ); }";
 
 	}
 
-
 	function generateExtensions( extensions, parameters, rendererExtensions ) {
 
 		extensions = extensions || {};