X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=shaders%2Fvblend.h;fp=shaders%2Fvblend.h;h=af2a4967d85fd4974742de68ea9376630972e1e9;hb=23ef4d7f6bfe6a5a91c78822b081a9ea63cb74a6;hp=fd558ef8acdd3798829f4ce5d9173a982ec98158;hpb=9edcce70acf6cf8fbb2449bf54d797e212ebb2c2;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/shaders/vblend.h b/shaders/vblend.h index fd558ef..af2a496 100644 --- a/shaders/vblend.h +++ b/shaders/vblend.h @@ -68,6 +68,8 @@ static struct vg_shader _shader_vblend = { "uniform sampler2D uTexGarbage;\n" "uniform sampler2D uTexGradients;\n" "uniform vec3 uCamera;\n" +"uniform vec3 uBoard0;\n" +"uniform vec3 uBoard1;\n" "\n" "in vec4 aColour;\n" "in vec2 aUv;\n" @@ -152,6 +154,16 @@ static struct vg_shader _shader_vblend = { " return mix( vfrag, g_ambient_colour.rgb, faccum );\n" "}\n" "\n" +"// FIXME\n" +"float sdLine( vec3 p, vec3 a, vec3 b )\n" +"{\n" +" vec3 pa = p - a;\n" +" vec3 ba = b - a;\n" +"\n" +" float h = clamp( dot(pa,ba)/dot(ba,ba), 0.0, 1.0 );\n" +" return length( pa - ba*h );\n" +"}\n" +"\n" "vec3 do_light_shadowing( vec3 vfrag )\n" "{\n" " if( g_shadow_samples == 0 )\n" @@ -172,6 +184,13 @@ static struct vg_shader _shader_vblend = { " famt+=shadow_sample((vdir+vec3( 0.807,-0.690, 0.472)*fspread)*flength*0.6);\n" " famt+=shadow_sample((vdir+vec3( 0.522,-0.379, 0.350)*fspread)*flength*0.7);\n" " famt+=shadow_sample((vdir+vec3( 0.483, 0.201, 0.306)*fspread)*flength*0.8);\n" +"\n" +" // player shadow\n" +" float dist_to_player = max( 0.0, sdLine( aWorldCo, uBoard0, uBoard1 )-0.03 );\n" +" float player_shadow = max( 1.0-dist_to_player*1.7, 0.0 );\n" +" player_shadow *= player_shadow*player_shadow*player_shadow;\n" +"\n" +" famt = max( player_shadow*0.6, famt );\n" " return mix( vfrag, g_ambient_colour.rgb, famt );\n" "}\n" "\n" @@ -181,7 +200,7 @@ static struct vg_shader _shader_vblend = { " return mix( vfrag, vec3(0.55,0.76,1.0), min( 1.0, dist ) );\n" "}\n" "\n" -"#line 12 0 \n" +"#line 14 0 \n" "#line 1 2 \n" "const float k_motion_lerp_amount = 0.01;\n" "\n" @@ -201,7 +220,7 @@ static struct vg_shader _shader_vblend = { " oMotionVec = (vmotion1-vmotion0) * (1.0/k_motion_lerp_amount);\n" "}\n" "\n" -"#line 13 0 \n" +"#line 15 0 \n" "\n" "void main()\n" "{\n" @@ -256,6 +275,8 @@ static GLuint _uniform_vblend_uPvmPrev; static GLuint _uniform_vblend_uTexGarbage; static GLuint _uniform_vblend_uTexGradients; static GLuint _uniform_vblend_uCamera; +static GLuint _uniform_vblend_uBoard0; +static GLuint _uniform_vblend_uBoard1; static GLuint _uniform_vblend_g_world_depth; static void shader_vblend_uMdl(m4x3f m){ glUniformMatrix4x3fv(_uniform_vblend_uMdl,1,GL_FALSE,(float*)m); @@ -275,6 +296,12 @@ static void shader_vblend_uTexGradients(int i){ static void shader_vblend_uCamera(v3f v){ glUniform3fv(_uniform_vblend_uCamera,1,v); } +static void shader_vblend_uBoard0(v3f v){ + glUniform3fv(_uniform_vblend_uBoard0,1,v); +} +static void shader_vblend_uBoard1(v3f v){ + glUniform3fv(_uniform_vblend_uBoard1,1,v); +} static void shader_vblend_g_world_depth(int i){ glUniform1i(_uniform_vblend_g_world_depth,i); } @@ -289,6 +316,8 @@ static void shader_vblend_link(void){ _uniform_vblend_uTexGarbage = glGetUniformLocation( _shader_vblend.id, "uTexGarbage" ); _uniform_vblend_uTexGradients = glGetUniformLocation( _shader_vblend.id, "uTexGradients" ); _uniform_vblend_uCamera = glGetUniformLocation( _shader_vblend.id, "uCamera" ); + _uniform_vblend_uBoard0 = glGetUniformLocation( _shader_vblend.id, "uBoard0" ); + _uniform_vblend_uBoard1 = glGetUniformLocation( _shader_vblend.id, "uBoard1" ); _uniform_vblend_g_world_depth = glGetUniformLocation( _shader_vblend.id, "g_world_depth" ); } #endif /* SHADER_vblend_H */