chaos pt 1

[carveJwlIkooP6JGAAIwe30JlM.git] / shaders / scene_scoretext.h

diff --git a/shaders/scene_scoretext.h b/shaders/scene_scoretext.h
index 37b24fce1748829d5021efda7d7ad2e460c465b0..1d82be37968326bc9d4cc47a17f2c6c399d76808 100644 (file)
--- a/shaders/scene_scoretext.h
+++ b/shaders/scene_scoretext.h
@@ -46,8 +46,8 @@ static struct vg_shader _shader_scene_scoretext = {
 "void main()\n"
 "{\n"
 "   float w = ((a_norm.w)-0.5)*2.0 + fract(uInfo.z) - 0.0;\n"
-"   float c = -cos(w*0.2);\n"
-"   float s = -sin(w*0.2);\n"
+"   float c = -cos(w*0.6);\n"
+"   float s = -sin(w*0.6);\n"
 "   float r = 0.2;\n"
 "\n"
 "   float w1 = clamp( w*4.0 - a_co.y*10.0, -1.0, 1.0 ) * (3.14159265*0.5);\n"
@@ -230,19 +230,15 @@ static struct vg_shader _shader_scene_scoretext = {
 "   return world_depth_sample( pos ) - ref_depth;\n"
 "}\n"
 "\n"
-"float shadow_sample( vec3 vdir )\n"
-"{\n"
-"   vec3 sample_pos = aWorldCo + vdir;\n"
-"   float height_sample = world_depth_sample( sample_pos );\n"
+"float shadow_sample( vec3 co ){\n"
+"   float height_sample = world_depth_sample( co );\n"
 "\n"
-"   float fdelta = height_sample - sample_pos.y;\n"
+"   float fdelta = height_sample - co.y;\n"
 "   return clamp( fdelta, 0.2, 0.4 )-0.2;\n"
 "}\n"
 "\n"
-"float newlight_compute_sun_shadow( vec3 dir )\n"
-"{\n"
-"   if( g_shadow_samples == 0 )\n"
-"   {\n"
+"float newlight_compute_sun_shadow( vec3 co, vec3 dir ){\n"
+"   if( g_shadow_samples == 0 ){\n"
 "      return 1.0;\n"
 "   }\n"
 "\n"
@@ -250,15 +246,15 @@ static struct vg_shader _shader_scene_scoretext = {
 "   float flength = g_shadow_length;\n"
 "\n"
 "   float famt = 0.0;\n"
-"   famt += shadow_sample((dir+vec3(-0.56,0.55, 0.30)*fspread)*flength*0.1);\n"
-"   famt += shadow_sample((dir+vec3( 0.80,0.68, 0.34)*fspread)*flength*0.2);\n"
-"   famt += shadow_sample((dir+vec3( 0.78,0.07,-0.06)*fspread)*flength*0.3);\n"
-"   famt += shadow_sample((dir+vec3(-0.59,0.07,-0.42)*fspread)*flength*0.4);\n"
+"   famt += shadow_sample(co+(dir+vec3(-0.56,0.55, 0.30)*fspread)*flength*0.1);\n"
+"   famt += shadow_sample(co+(dir+vec3( 0.80,0.68, 0.34)*fspread)*flength*0.2);\n"
+"   famt += shadow_sample(co+(dir+vec3( 0.78,0.07,-0.06)*fspread)*flength*0.3);\n"
+"   famt += shadow_sample(co+(dir+vec3(-0.59,0.07,-0.42)*fspread)*flength*0.4);\n"
 "\n"
-"   //famt+=shadow_sample((dir+vec3(-0.790,-0.933,-0.875)*fspread)*flength*0.5);\n"
-"   //famt+=shadow_sample((dir+vec3( 0.807,-0.690, 0.472)*fspread)*flength*0.6);\n"
-"   //famt+=shadow_sample((dir+vec3( 0.522,-0.379, 0.350)*fspread)*flength*0.7);\n"
-"   //famt+=shadow_sample((dir+vec3( 0.483, 0.201, 0.306)*fspread)*flength*0.8);\n"
+"   //famt+=shadow_sample(co+(dir+vec3(-0.790,-0.933,-0.875)*fspread)*flength*0.5);\n"
+"   //famt+=shadow_sample(co+(dir+vec3( 0.807,-0.690, 0.472)*fspread)*flength*0.6);\n"
+"   //famt+=shadow_sample(co+(dir+vec3( 0.522,-0.379, 0.350)*fspread)*flength*0.7);\n"
+"   //famt+=shadow_sample(co+(dir+vec3( 0.483, 0.201, 0.306)*fspread)*flength*0.8);\n"
 "\n"
 "   return 1.0 - famt;\n"
 "}\n"
@@ -295,7 +291,7 @@ static struct vg_shader _shader_scene_scoretext = {
 "   light_delta = normalize( light_delta );\n"
 "\n"
 "   float quadratic = dist2*100.0;\n"
-"   float attenuation  = 1.0f/( 1.0f + quadratic );\n"
+"   float attenuation  = 1.0/( 1.0 + quadratic );\n"
 "         attenuation *= max( dot( light_delta, normal ), 0.0 );\n"
 "\n"
 "   float falloff = max( 0.0, 1.0-(dist2*light_co.w) );\n"
@@ -346,8 +342,8 @@ static struct vg_shader _shader_scene_scoretext = {
 "   float fdist = length(halfview);\n"
 "   halfview /= fdist;\n"
 "\n"
-"   float world_shadow = newlight_compute_sun_shadow( g_sun_dir.xyz \n"
-"                                    * (1.0/(max(g_sun_dir.y,0.0)+0.2)) );\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"