fix wwater fog

[carveJwlIkooP6JGAAIwe30JlM.git] / shaders / impl.c

diff --git a/shaders/impl.c b/shaders/impl.c
index 01e1b84ebd047bc3ffe6aa2554df9161d4808ebd..dbcebf8258ab0a0d9067d92a3a4153d8675f0161 100644 (file)
--- a/shaders/impl.c
+++ b/shaders/impl.c
@@ -173,7 +173,7 @@ struct vg_shader _shader_scene_standard = {
 "\n"
 "float luminance( vec3 v )\n"
 "{\n"
-"   return dot( v, vec3(0.2126, 0.7152, 0.0722) );\n"
+"   return dot( v, vec3(0.2126, 0.7052, 0.0722) );\n"
 "}\n"
 "\n"
 "vec3 clearskies_ambient( vec3 dir )\n"
@@ -187,7 +187,7 @@ struct vg_shader _shader_scene_standard = {
 "        ambient += g_nightsky_colour.rgb * (1.0-g_day_phase);\n"
 "   \n"
 "   /* Add gradient */\n"
-"        ambient -= sky_gradient * luminance(ambient);\n"
+"        ambient -= sky_gradient * luminance(ambient)*1.6;\n"
 "        \n"
 "   return ambient;\n"
 "}\n"
@@ -217,7 +217,7 @@ struct vg_shader _shader_scene_standard = {
 "      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
+"   vec3 composite = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
@@ -664,7 +664,7 @@ struct vg_shader _shader_scene_standard_alphatest = {
 "\n"
 "float luminance( vec3 v )\n"
 "{\n"
-"   return dot( v, vec3(0.2126, 0.7152, 0.0722) );\n"
+"   return dot( v, vec3(0.2126, 0.7052, 0.0722) );\n"
 "}\n"
 "\n"
 "vec3 clearskies_ambient( vec3 dir )\n"
@@ -678,7 +678,7 @@ struct vg_shader _shader_scene_standard_alphatest = {
 "        ambient += g_nightsky_colour.rgb * (1.0-g_day_phase);\n"
 "   \n"
 "   /* Add gradient */\n"
-"        ambient -= sky_gradient * luminance(ambient);\n"
+"        ambient -= sky_gradient * luminance(ambient)*1.6;\n"
 "        \n"
 "   return ambient;\n"
 "}\n"
@@ -708,7 +708,7 @@ struct vg_shader _shader_scene_standard_alphatest = {
 "      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
+"   vec3 composite = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
@@ -1157,7 +1157,7 @@ struct vg_shader _shader_scene_foliage = {
 "\n"
 "float luminance( vec3 v )\n"
 "{\n"
-"   return dot( v, vec3(0.2126, 0.7152, 0.0722) );\n"
+"   return dot( v, vec3(0.2126, 0.7052, 0.0722) );\n"
 "}\n"
 "\n"
 "vec3 clearskies_ambient( vec3 dir )\n"
@@ -1171,7 +1171,7 @@ struct vg_shader _shader_scene_foliage = {
 "        ambient += g_nightsky_colour.rgb * (1.0-g_day_phase);\n"
 "   \n"
 "   /* Add gradient */\n"
-"        ambient -= sky_gradient * luminance(ambient);\n"
+"        ambient -= sky_gradient * luminance(ambient)*1.6;\n"
 "        \n"
 "   return ambient;\n"
 "}\n"
@@ -1201,7 +1201,7 @@ struct vg_shader _shader_scene_foliage = {
 "      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
+"   vec3 composite = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
@@ -1656,7 +1656,7 @@ struct vg_shader _shader_scene_override = {
 "\n"
 "float luminance( vec3 v )\n"
 "{\n"
-"   return dot( v, vec3(0.2126, 0.7152, 0.0722) );\n"
+"   return dot( v, vec3(0.2126, 0.7052, 0.0722) );\n"
 "}\n"
 "\n"
 "vec3 clearskies_ambient( vec3 dir )\n"
@@ -1670,7 +1670,7 @@ struct vg_shader _shader_scene_override = {
 "        ambient += g_nightsky_colour.rgb * (1.0-g_day_phase);\n"
 "   \n"
 "   /* Add gradient */\n"
-"        ambient -= sky_gradient * luminance(ambient);\n"
+"        ambient -= sky_gradient * luminance(ambient)*1.6;\n"
 "        \n"
 "   return ambient;\n"
 "}\n"
@@ -1700,7 +1700,7 @@ struct vg_shader _shader_scene_override = {
 "      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
+"   vec3 composite = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
@@ -2202,7 +2202,7 @@ struct vg_shader _shader_scene_fxglow = {
 "\n"
 "float luminance( vec3 v )\n"
 "{\n"
-"   return dot( v, vec3(0.2126, 0.7152, 0.0722) );\n"
+"   return dot( v, vec3(0.2126, 0.7052, 0.0722) );\n"
 "}\n"
 "\n"
 "vec3 clearskies_ambient( vec3 dir )\n"
@@ -2216,7 +2216,7 @@ struct vg_shader _shader_scene_fxglow = {
 "        ambient += g_nightsky_colour.rgb * (1.0-g_day_phase);\n"
 "   \n"
 "   /* Add gradient */\n"
-"        ambient -= sky_gradient * luminance(ambient);\n"
+"        ambient -= sky_gradient * luminance(ambient)*1.6;\n"
 "        \n"
 "   return ambient;\n"
 "}\n"
@@ -2246,7 +2246,7 @@ struct vg_shader _shader_scene_fxglow = {
 "      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
+"   vec3 composite = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
@@ -2687,7 +2687,7 @@ struct vg_shader _shader_scene_vertex_blend = {
 "\n"
 "float luminance( vec3 v )\n"
 "{\n"
-"   return dot( v, vec3(0.2126, 0.7152, 0.0722) );\n"
+"   return dot( v, vec3(0.2126, 0.7052, 0.0722) );\n"
 "}\n"
 "\n"
 "vec3 clearskies_ambient( vec3 dir )\n"
@@ -2701,7 +2701,7 @@ struct vg_shader _shader_scene_vertex_blend = {
 "        ambient += g_nightsky_colour.rgb * (1.0-g_day_phase);\n"
 "   \n"
 "   /* Add gradient */\n"
-"        ambient -= sky_gradient * luminance(ambient);\n"
+"        ambient -= sky_gradient * luminance(ambient)*1.6;\n"
 "        \n"
 "   return ambient;\n"
 "}\n"
@@ -2731,7 +2731,7 @@ struct vg_shader _shader_scene_vertex_blend = {
 "      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
+"   vec3 composite = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
@@ -3196,7 +3196,7 @@ struct vg_shader _shader_scene_terrain = {
 "\n"
 "float luminance( vec3 v )\n"
 "{\n"
-"   return dot( v, vec3(0.2126, 0.7152, 0.0722) );\n"
+"   return dot( v, vec3(0.2126, 0.7052, 0.0722) );\n"
 "}\n"
 "\n"
 "vec3 clearskies_ambient( vec3 dir )\n"
@@ -3210,7 +3210,7 @@ struct vg_shader _shader_scene_terrain = {
 "        ambient += g_nightsky_colour.rgb * (1.0-g_day_phase);\n"
 "   \n"
 "   /* Add gradient */\n"
-"        ambient -= sky_gradient * luminance(ambient);\n"
+"        ambient -= sky_gradient * luminance(ambient)*1.6;\n"
 "        \n"
 "   return ambient;\n"
 "}\n"
@@ -3240,7 +3240,7 @@ struct vg_shader _shader_scene_terrain = {
 "      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
+"   vec3 composite = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
@@ -3711,7 +3711,7 @@ struct vg_shader _shader_scene_route = {
 "\n"
 "float luminance( vec3 v )\n"
 "{\n"
-"   return dot( v, vec3(0.2126, 0.7152, 0.0722) );\n"
+"   return dot( v, vec3(0.2126, 0.7052, 0.0722) );\n"
 "}\n"
 "\n"
 "vec3 clearskies_ambient( vec3 dir )\n"
@@ -3725,7 +3725,7 @@ struct vg_shader _shader_scene_route = {
 "        ambient += g_nightsky_colour.rgb * (1.0-g_day_phase);\n"
 "   \n"
 "   /* Add gradient */\n"
-"        ambient -= sky_gradient * luminance(ambient);\n"
+"        ambient -= sky_gradient * luminance(ambient)*1.6;\n"
 "        \n"
 "   return ambient;\n"
 "}\n"
@@ -3755,7 +3755,7 @@ struct vg_shader _shader_scene_route = {
 "      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
+"   vec3 composite = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
@@ -4232,7 +4232,7 @@ struct vg_shader _shader_scene_depth = {
 "\n"
 "float luminance( vec3 v )\n"
 "{\n"
-"   return dot( v, vec3(0.2126, 0.7152, 0.0722) );\n"
+"   return dot( v, vec3(0.2126, 0.7052, 0.0722) );\n"
 "}\n"
 "\n"
 "vec3 clearskies_ambient( vec3 dir )\n"
@@ -4246,7 +4246,7 @@ struct vg_shader _shader_scene_depth = {
 "        ambient += g_nightsky_colour.rgb * (1.0-g_day_phase);\n"
 "   \n"
 "   /* Add gradient */\n"
-"        ambient -= sky_gradient * luminance(ambient);\n"
+"        ambient -= sky_gradient * luminance(ambient)*1.6;\n"
 "        \n"
 "   return ambient;\n"
 "}\n"
@@ -4276,7 +4276,7 @@ struct vg_shader _shader_scene_depth = {
 "      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
+"   vec3 composite = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
@@ -4704,7 +4704,7 @@ struct vg_shader _shader_scene_position = {
 "\n"
 "float luminance( vec3 v )\n"
 "{\n"
-"   return dot( v, vec3(0.2126, 0.7152, 0.0722) );\n"
+"   return dot( v, vec3(0.2126, 0.7052, 0.0722) );\n"
 "}\n"
 "\n"
 "vec3 clearskies_ambient( vec3 dir )\n"
@@ -4718,7 +4718,7 @@ struct vg_shader _shader_scene_position = {
 "        ambient += g_nightsky_colour.rgb * (1.0-g_day_phase);\n"
 "   \n"
 "   /* Add gradient */\n"
-"        ambient -= sky_gradient * luminance(ambient);\n"
+"        ambient -= sky_gradient * luminance(ambient)*1.6;\n"
 "        \n"
 "   return ambient;\n"
 "}\n"
@@ -4748,7 +4748,7 @@ struct vg_shader _shader_scene_position = {
 "      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
+"   vec3 composite = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
@@ -5168,7 +5168,7 @@ struct vg_shader _shader_scene_cubemapped = {
 "\n"
 "float luminance( vec3 v )\n"
 "{\n"
-"   return dot( v, vec3(0.2126, 0.7152, 0.0722) );\n"
+"   return dot( v, vec3(0.2126, 0.7052, 0.0722) );\n"
 "}\n"
 "\n"
 "vec3 clearskies_ambient( vec3 dir )\n"
@@ -5182,7 +5182,7 @@ struct vg_shader _shader_scene_cubemapped = {
 "        ambient += g_nightsky_colour.rgb * (1.0-g_day_phase);\n"
 "   \n"
 "   /* Add gradient */\n"
-"        ambient -= sky_gradient * luminance(ambient);\n"
+"        ambient -= sky_gradient * luminance(ambient)*1.6;\n"
 "        \n"
 "   return ambient;\n"
 "}\n"
@@ -5212,7 +5212,7 @@ struct vg_shader _shader_scene_cubemapped = {
 "      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
+"   vec3 composite = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
@@ -5675,7 +5675,7 @@ struct vg_shader _shader_scene_water = {
 "\n"
 "float luminance( vec3 v )\n"
 "{\n"
-"   return dot( v, vec3(0.2126, 0.7152, 0.0722) );\n"
+"   return dot( v, vec3(0.2126, 0.7052, 0.0722) );\n"
 "}\n"
 "\n"
 "vec3 clearskies_ambient( vec3 dir )\n"
@@ -5689,7 +5689,7 @@ struct vg_shader _shader_scene_water = {
 "        ambient += g_nightsky_colour.rgb * (1.0-g_day_phase);\n"
 "   \n"
 "   /* Add gradient */\n"
-"        ambient -= sky_gradient * luminance(ambient);\n"
+"        ambient -= sky_gradient * luminance(ambient)*1.6;\n"
 "        \n"
 "   return ambient;\n"
 "}\n"
@@ -5719,7 +5719,7 @@ struct vg_shader _shader_scene_water = {
 "      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
+"   vec3 composite = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
@@ -5960,8 +5960,61 @@ struct vg_shader _shader_scene_water = {
 "\n"
 "#line     18        0 \n"
 "\n"
+"// Pasted from common_world.glsl\n"
+"vec3 water_compute_lighting( vec3 diffuse, vec3 normal, vec3 co )\n"
+"{\n"
+"   float light_mask = compute_board_shadow();\n"
+"\n"
+"   if( g_light_preview == 1 )\n"
+"      diffuse = vec3(0.75);\n"
+"\n"
+"   // Lighting\n"
+"   vec3 halfview = uCamera - co;\n"
+"   float fdist = length(halfview);\n"
+"   halfview /= fdist;\n"
+"\n"
+"   float world_shadow = newlight_compute_sun_shadow( \n"
+"               co, g_sun_dir.xyz * (1.0/(max(g_sun_dir.y,0.0)+0.2)) );\n"
+"\n"
+"   vec3 total_light = clearskies_lighting( \n"
+"                           normal, min( light_mask, world_shadow ), halfview );\n"
+"\n"
+"   vec3 cube_coord = (co - g_cube_min.xyz) * g_cube_inv_range.xyz;\n"
+"        cube_coord = floor( cube_coord );\n"
+"\n"
+"   if( g_debug_indices == 1 )\n"
+"   {\n"
+"      return rand33(cube_coord);\n"
+"   }\n"
+"\n"
+"   if( g_debug_complexity == 1 )\n"
+"   {\n"
+"      ivec3 coord = ivec3( cube_coord );\n"
+"      uvec4 index_sample = texelFetch( uLightsIndex, coord, 0 );\n"
+"\n"
+"      uint light_count = (index_sample.x & 0x3u) + (index_sample.y & 0x3u);\n"
+"      return vec3( float(light_count)*(1.0/6.0), 0.0, 0.5 );\n"
+"   }\n"
+"\n"
+"   // FIXME: this coord should absolutely must be clamped!\n"
+"   \n"
+"   ivec3 coord = ivec3( cube_coord );\n"
+"   uvec4 index_sample = texelFetch( uLightsIndex, coord, 0 );\n"
+"\n"
+"   total_light += \n"
+"      scene_calculate_packed_light_patch( index_sample.x,\n"
+"                                          halfview, co, normal ) \n"
+"                                          * light_mask;\n"
+"   total_light += \n"
+"      scene_calculate_packed_light_patch( index_sample.y,\n"
+"                                          halfview, co, normal )\n"
+"                                          * light_mask;\n"
+"\n"
+"   return diffuse * total_light;\n"
+"}\n"
+"\n"
 "vec4 water_surf( vec3 halfview, vec3 vnorm, float depthvalue, \n"
-"                 vec4 beneath, vec4 above )\n"
+"                 vec4 beneath, vec4 above, vec4 dudva )\n"
 "{\n"
 "   vec3 surface_tint = mix(uShoreColour, uOceanColour, depthvalue);\n"
 "\n"
@@ -5974,11 +6027,29 @@ struct vg_shader _shader_scene_water = {
 "   // Depth \n"
 "   float depthblend = pow( beneath.r, 0.8 );\n"
 "\n"
-"   // Composite\n"
-"   vec3 vsurface = mix(surface_tint, above.rgb, ffresnel );\n"
-"   //vsurface += spec;\n"
+"   // Foam\n"
+"   float fband = fract( aCo.z*0.02+uTime*0.1+depthvalue*10.0 );\n"
+"   fband = step( fband+dudva.a*0.8, 0.3 ) * max((1.0-depthvalue*4.0),0.0);\n"
+"\n"
+"   vec4 surf = mix( vec4(surface_tint,depthblend), \n"
+"                    vec4(1.0,1.0,1.0,0.5), fband );\n"
+"   surf.rgb = water_compute_lighting( surf.rgb, aNorm.xyz, aWorldCo );\n"
+"   surf.rgb = mix(surf.rgb, above.rgb, ffresnel );\n"
 "\n"
-"   return vec4( vsurface,depthblend );\n"
+"   // Take a section of the sky function to give us a matching fog colour\n"
+"   vec3 fog_colour  = clearskies_ambient( -halfview );\n"
+"   float sun_theta  = dot( -halfview, g_sun_dir.xyz );\n"
+"   float sun_size   = max( 0.0, sun_theta * 0.5 + 0.5 );\n"
+"   float sun_shape  = sun_size * max(g_sun_dir.y,0.0) * 0.5;\n"
+"         \n"
+"   vec3 sun_colour  = mix( vec3(1.0), g_sunset_colour.rgb, g_sunset_phase*0.5 );\n"
+"        sun_colour *= sun_shape;\n"
+"\n"
+"   fog_colour += sun_colour;\n"
+"   surf.rgb = scene_apply_fog( surf.rgb, fog_colour,  \n"
+"                               distance(uCamera, aWorldCo) );\n"
+"\n"
+"   return surf;\n"
 "}\n"
 "\n"
 "void main()\n"
@@ -5999,10 +6070,6 @@ struct vg_shader _shader_scene_water = {
 "   vec3 surfnorm = dudva.rgb + dudvb.rgb;\n"
 "   surfnorm = normalize(vec3(0.0,1.0,0.0) + dudva.xyz*0.4 + dudvb.xyz*0.1);\n"
 "   \n"
-"   // Foam\n"
-"   float fband = fract( aCo.z*0.02+uTime*0.1+depthvalue*10.0 );\n"
-"   fband = step( fband+dudva.a*0.8, 0.3 ) * max((1.0-depthvalue*4.0),0.0);\n"
-"\n"
 "   // Lighting\n"
 "   vec3 halfview = -normalize( aCo-uCamera );\n"
 "\n"
@@ -6014,10 +6081,10 @@ struct vg_shader _shader_scene_water = {
 "   float fdist = pow(length( aCo.xz-uCamera.xz ) * 0.00047, 2.6);\n"
 "\n"
 "   // Composite\n"
-"   vec4 vsurface = water_surf( halfview, surfnorm, depthvalue, beneath, above );\n"
+"   vec4 vsurface = water_surf( halfview, surfnorm, depthvalue, beneath, above, dudva );\n"
 "   vsurface.a -= fdist;\n"
-"   oColour = mix( vsurface, vec4(1.0,1.0,1.0,0.5), fband );\n"
-"   oColour.rgb = scene_compute_lighting( oColour.rgb, aNorm.xyz, aWorldCo );\n"
+"\n"
+"   oColour = vsurface;\n"
 "}\n"
 ""},
 };
@@ -6220,7 +6287,7 @@ struct vg_shader _shader_scene_water_fast = {
 "\n"
 "float luminance( vec3 v )\n"
 "{\n"
-"   return dot( v, vec3(0.2126, 0.7152, 0.0722) );\n"
+"   return dot( v, vec3(0.2126, 0.7052, 0.0722) );\n"
 "}\n"
 "\n"
 "vec3 clearskies_ambient( vec3 dir )\n"
@@ -6234,7 +6301,7 @@ struct vg_shader _shader_scene_water_fast = {
 "        ambient += g_nightsky_colour.rgb * (1.0-g_day_phase);\n"
 "   \n"
 "   /* Add gradient */\n"
-"        ambient -= sky_gradient * luminance(ambient);\n"
+"        ambient -= sky_gradient * luminance(ambient)*1.6;\n"
 "        \n"
 "   return ambient;\n"
 "}\n"
@@ -6264,7 +6331,7 @@ struct vg_shader _shader_scene_water_fast = {
 "      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
+"   vec3 composite = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
@@ -6761,7 +6828,7 @@ struct vg_shader _shader_scene_scoretext = {
 "\n"
 "float luminance( vec3 v )\n"
 "{\n"
-"   return dot( v, vec3(0.2126, 0.7152, 0.0722) );\n"
+"   return dot( v, vec3(0.2126, 0.7052, 0.0722) );\n"
 "}\n"
 "\n"
 "vec3 clearskies_ambient( vec3 dir )\n"
@@ -6775,7 +6842,7 @@ struct vg_shader _shader_scene_scoretext = {
 "        ambient += g_nightsky_colour.rgb * (1.0-g_day_phase);\n"
 "   \n"
 "   /* Add gradient */\n"
-"        ambient -= sky_gradient * luminance(ambient);\n"
+"        ambient -= sky_gradient * luminance(ambient)*1.6;\n"
 "        \n"
 "   return ambient;\n"
 "}\n"
@@ -6805,7 +6872,7 @@ struct vg_shader _shader_scene_scoretext = {
 "      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
+"   vec3 composite = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
@@ -7257,7 +7324,7 @@ struct vg_shader _shader_scene_font = {
 "\n"
 "float luminance( vec3 v )\n"
 "{\n"
-"   return dot( v, vec3(0.2126, 0.7152, 0.0722) );\n"
+"   return dot( v, vec3(0.2126, 0.7052, 0.0722) );\n"
 "}\n"
 "\n"
 "vec3 clearskies_ambient( vec3 dir )\n"
@@ -7271,7 +7338,7 @@ struct vg_shader _shader_scene_font = {
 "        ambient += g_nightsky_colour.rgb * (1.0-g_day_phase);\n"
 "   \n"
 "   /* Add gradient */\n"
-"        ambient -= sky_gradient * luminance(ambient);\n"
+"        ambient -= sky_gradient * luminance(ambient)*1.6;\n"
 "        \n"
 "   return ambient;\n"
 "}\n"
@@ -7301,7 +7368,7 @@ struct vg_shader _shader_scene_font = {
 "      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
+"   vec3 composite = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
@@ -7778,7 +7845,7 @@ struct vg_shader _shader_model_sky = {
 "\n"
 "float luminance( vec3 v )\n"
 "{\n"
-"   return dot( v, vec3(0.2126, 0.7152, 0.0722) );\n"
+"   return dot( v, vec3(0.2126, 0.7052, 0.0722) );\n"
 "}\n"
 "\n"
 "vec3 clearskies_ambient( vec3 dir )\n"
@@ -7792,7 +7859,7 @@ struct vg_shader _shader_model_sky = {
 "        ambient += g_nightsky_colour.rgb * (1.0-g_day_phase);\n"
 "   \n"
 "   /* Add gradient */\n"
-"        ambient -= sky_gradient * luminance(ambient);\n"
+"        ambient -= sky_gradient * luminance(ambient)*1.6;\n"
 "        \n"
 "   return ambient;\n"
 "}\n"
@@ -7822,7 +7889,7 @@ struct vg_shader _shader_model_sky = {
 "      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
+"   vec3 composite = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
@@ -8244,7 +8311,7 @@ struct vg_shader _shader_model_sky_space = {
 "\n"
 "float luminance( vec3 v )\n"
 "{\n"
-"   return dot( v, vec3(0.2126, 0.7152, 0.0722) );\n"
+"   return dot( v, vec3(0.2126, 0.7052, 0.0722) );\n"
 "}\n"
 "\n"
 "vec3 clearskies_ambient( vec3 dir )\n"
@@ -8258,7 +8325,7 @@ struct vg_shader _shader_model_sky_space = {
 "        ambient += g_nightsky_colour.rgb * (1.0-g_day_phase);\n"
 "   \n"
 "   /* Add gradient */\n"
-"        ambient -= sky_gradient * luminance(ambient);\n"
+"        ambient -= sky_gradient * luminance(ambient)*1.6;\n"
 "        \n"
 "   return ambient;\n"
 "}\n"
@@ -8288,7 +8355,7 @@ struct vg_shader _shader_model_sky_space = {
 "      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
+"   vec3 composite = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
@@ -8823,7 +8890,7 @@ struct vg_shader _shader_model_character_view = {
 "\n"
 "float luminance( vec3 v )\n"
 "{\n"
-"   return dot( v, vec3(0.2126, 0.7152, 0.0722) );\n"
+"   return dot( v, vec3(0.2126, 0.7052, 0.0722) );\n"
 "}\n"
 "\n"
 "vec3 clearskies_ambient( vec3 dir )\n"
@@ -8837,7 +8904,7 @@ struct vg_shader _shader_model_character_view = {
 "        ambient += g_nightsky_colour.rgb * (1.0-g_day_phase);\n"
 "   \n"
 "   /* Add gradient */\n"
-"        ambient -= sky_gradient * luminance(ambient);\n"
+"        ambient -= sky_gradient * luminance(ambient)*1.6;\n"
 "        \n"
 "   return ambient;\n"
 "}\n"
@@ -8867,7 +8934,7 @@ struct vg_shader _shader_model_character_view = {
 "      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
+"   vec3 composite = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
@@ -9407,7 +9474,7 @@ struct vg_shader _shader_model_board_view = {
 "\n"
 "float luminance( vec3 v )\n"
 "{\n"
-"   return dot( v, vec3(0.2126, 0.7152, 0.0722) );\n"
+"   return dot( v, vec3(0.2126, 0.7052, 0.0722) );\n"
 "}\n"
 "\n"
 "vec3 clearskies_ambient( vec3 dir )\n"
@@ -9421,7 +9488,7 @@ struct vg_shader _shader_model_board_view = {
 "        ambient += g_nightsky_colour.rgb * (1.0-g_day_phase);\n"
 "   \n"
 "   /* Add gradient */\n"
-"        ambient -= sky_gradient * luminance(ambient);\n"
+"        ambient -= sky_gradient * luminance(ambient)*1.6;\n"
 "        \n"
 "   return ambient;\n"
 "}\n"
@@ -9451,7 +9518,7 @@ struct vg_shader _shader_model_board_view = {
 "      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
+"   vec3 composite = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
@@ -9992,7 +10059,7 @@ struct vg_shader _shader_model_entity = {
 "\n"
 "float luminance( vec3 v )\n"
 "{\n"
-"   return dot( v, vec3(0.2126, 0.7152, 0.0722) );\n"
+"   return dot( v, vec3(0.2126, 0.7052, 0.0722) );\n"
 "}\n"
 "\n"
 "vec3 clearskies_ambient( vec3 dir )\n"
@@ -10006,7 +10073,7 @@ struct vg_shader _shader_model_entity = {
 "        ambient += g_nightsky_colour.rgb * (1.0-g_day_phase);\n"
 "   \n"
 "   /* Add gradient */\n"
-"        ambient -= sky_gradient * luminance(ambient);\n"
+"        ambient -= sky_gradient * luminance(ambient)*1.6;\n"
 "        \n"
 "   return ambient;\n"
 "}\n"
@@ -10036,7 +10103,7 @@ struct vg_shader _shader_model_entity = {
 "      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
+"   vec3 composite = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"