glider orphan / entity normals with scale

[carveJwlIkooP6JGAAIwe30JlM.git] / shaders / model_entity.h

diff --git a/shaders/model_entity.h b/shaders/model_entity.h
index 585c89737f1b7c197e3865439058b55089fbe6dc..a9700388f0e4783c2d9eed4dec3be0423bbb3621 100644 (file)
--- a/shaders/model_entity.h
+++ b/shaders/model_entity.h
@@ -58,7 +58,7 @@ static struct vg_shader _shader_model_entity = {
 "   aWorldCo = world_pos0;\n"
 "   aColour = a_colour;\n"
 "   aUv = a_uv;\n"
-"   aNorm = mat3(uMdl) * a_norm;\n"
+"   aNorm = normalize( mat3(uMdl) * a_norm );\n"
 "   aCo = a_co;\n"
 "}\n"
 ""},
@@ -76,6 +76,11 @@ static struct vg_shader _shader_model_entity = {
 "in vec3 aWorldCo;\n"
 "\n"
 "#line       1        1 \n"
+"// :D\n"
+"const float CLEARSKIES_LIGHT_DOT_MIN = 0.0;\n"
+"\n"
+"#line     11        0 \n"
+"#line       1        2 \n"
 "layout (location = 0) out vec4 oColour;\n"
 "\n"
 "// OpenGL wiki: Recommends do not use vec3 because of drivers. hence the v4s...\n"
@@ -205,14 +210,18 @@ static struct vg_shader _shader_model_entity = {
 "   vec3 sun_colour  = mix( vec3(1.0), g_sunset_colour.rgb, g_sunset_phase*0.5 );\n"
 "        sun_colour *= sun_shape;\n"
 "\n"
-"\n"
+"   \n"
 "   float star = 0.0;\n"
-"   for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
-"      float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
-"      star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0 / pow(4.0, j));\n"
+"   float star_blend = 10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"\n"
+"   if( star_blend > 0.001 ){\n"
+"      for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
+"         float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
+"         star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0/pow(4.0, j));\n"
+"      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
@@ -224,8 +233,9 @@ static struct vg_shader _shader_model_entity = {
 "                               g_sunset_phase );\n"
 "\n"
 "   vec3  sky_reflection = 0.5 * fresnel * reflect_colour;\n"
-"   vec3  light_sun      = max(0.0,dot(normal,g_sun_dir.xyz)*0.75+0.25) \n"
-"                           * g_sun_colour.rgb * g_day_phase;\n"
+"   vec3  light_sun      = max( CLEARSKIES_LIGHT_DOT_MIN, \n"
+"                               dot(normal,g_sun_dir.xyz)*0.75+0.25\n"
+"                           ) * g_sun_colour.rgb * g_day_phase;\n"
 "\n"
 "   float scaled_shadow = max( shadow, 1.0 - max(g_sun_dir.y,0.0) );\n"
 "   vec3 ambient = mix( g_ambient_colour.rgb, g_sunset_ambient.rgb, \n"
@@ -403,8 +413,8 @@ static struct vg_shader _shader_model_entity = {
 "   return scene_apply_fog( diffuse * total_light, fog_colour, fdist );\n"
 "}\n"
 "\n"
-"#line     11        0 \n"
-"#line       1        2 \n"
+"#line     12        0 \n"
+"#line       1        3 \n"
 "const float k_motion_lerp_amount = 0.01;\n"
 "\n"
 "#line      2        0 \n"
@@ -423,7 +433,7 @@ static struct vg_shader _shader_model_entity = {
 "   oMotionVec = (vmotion1-vmotion0) * (1.0/k_motion_lerp_amount);\n"
 "}\n"
 "\n"
-"#line     12        0 \n"
+"#line     13        0 \n"
 "\n"
 "void main()\n"
 "{\n"