medfall

commit 2a886ffd003d4757974d0bf86eb095bf0e92d26a
parent 651ce1898bc35149bd66ecd300a417ed17912c78
Author: Michael Savage <mikejsavage@gmail.com>
Date:   Wed Dec 28 22:34:30 +0200

color -> colour

Diffstat:
terrain_manager.cc
 | 
4
++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/terrain_manager.cc b/terrain_manager.cc
@@ -101,13 +101,13 @@ static const char * frag_src = GLSL(
 		}
 
 		// fog
-		vec3 fog_color = vec3( 0.5, 0.6, 0.7 );
+		vec3 fog_colour = vec3( 0.5, 0.6, 0.7 );
 		float fog_strength = 0.0005;
 		// don't draw any fog too close to the camera because the banding is quite noticable
 		float fog_distance_bias = 100.0;
 		float fog_t = 1.0 - exp( -fog_strength * max( ( length( vpos ) - fog_distance_bias ), 0.0 ) );
 
-		colour = vec4( mix( c, fog_color, fog_t ), 1.0 );
+		colour = vec4( mix( c, fog_colour, fog_t ), 1.0 );
 	}
 );