X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=shaders%2Fwater_fast.h;h=90ea5c8023973d2559dca0cdcbe58a8f01cc1f32;hb=23ef4d7f6bfe6a5a91c78822b081a9ea63cb74a6;hp=415d477be5759e2aa4a3828ed3183b1a2b0a6817;hpb=a3c10b9dec1ed7136721695033ebeef30717f249;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/shaders/water_fast.h b/shaders/water_fast.h index 415d477..90ea5c8 100644 --- a/shaders/water_fast.h +++ b/shaders/water_fast.h @@ -7,7 +7,6 @@ static struct vg_shader _shader_water_fast = { .link = shader_water_fast_link, .vs = { -.orig_file = "../../shaders/standard.vs", .static_src = "layout (location=0) in vec3 a_co;\n" "layout (location=1) in vec3 a_norm;\n" @@ -17,9 +16,29 @@ static struct vg_shader _shader_water_fast = { "layout (location=5) in ivec4 a_groups;\n" "\n" "#line 2 0 \n" +"#line 1 2 \n" +"const float k_motion_lerp_amount = 0.01;\n" +"\n" +"#line 2 0 \n" +"\n" +"out vec3 aMotionVec0;\n" +"out vec3 aMotionVec1;\n" +"\n" +"void vs_motion_out( vec4 vproj0, vec4 vproj1 )\n" +"{\n" +" // This magically solves some artifacting errors!\n" +" //\n" +" vproj1 = vproj0*(1.0-k_motion_lerp_amount) + vproj1*k_motion_lerp_amount;\n" +"\n" +" aMotionVec0 = vec3( vproj0.xy, vproj0.w );\n" +" aMotionVec1 = vec3( vproj1.xy, vproj1.w );\n" +"}\n" +"\n" +"#line 3 0 \n" "\n" "uniform mat4x3 uMdl;\n" "uniform mat4 uPv;\n" +"uniform mat4 uPvmPrev;\n" "\n" "out vec4 aColour;\n" "out vec2 aUv;\n" @@ -29,26 +48,30 @@ static struct vg_shader _shader_water_fast = { "\n" "void main()\n" "{\n" -" vec3 world_pos = uMdl * vec4(a_co,1.0);\n" -" gl_Position = uPv * vec4( world_pos, 1.0 );\n" +" vec3 world_pos0 = uMdl * vec4( a_co, 1.0 );\n" +" vec4 vproj0 = uPv * vec4( world_pos0, 1.0 );\n" +" vec4 vproj1 = uPvmPrev * vec4( a_co, 1.0 );\n" +"\n" +" vs_motion_out( vproj0, vproj1 );\n" +"\n" +" gl_Position = vproj0;\n" +" aWorldCo = world_pos0;\n" " aColour = a_colour;\n" " aUv = a_uv;\n" " aNorm = mat3(uMdl) * a_norm;\n" " aCo = a_co;\n" -" aWorldCo = world_pos;\n" "}\n" ""}, .fs = { -.orig_file = "../../shaders/water_fast.fs", .static_src = -"out vec4 FragColor;\n" -"\n" "uniform sampler2D uTexDudv;\n" "\n" "uniform float uTime;\n" "uniform vec3 uCamera;\n" "uniform float uSurfaceY;\n" +"uniform vec3 uBoard0;\n" +"uniform vec3 uBoard1;\n" "\n" "uniform vec3 uShoreColour;\n" "uniform vec3 uOceanColour;\n" @@ -60,6 +83,8 @@ static struct vg_shader _shader_water_fast = { "in vec3 aWorldCo;\n" "\n" "#line 1 1 \n" +"layout (location = 0) out vec4 oColour;\n" +"\n" "layout (std140) uniform ub_world_lighting\n" "{\n" " vec4 g_light_colours[3];\n" @@ -134,6 +159,16 @@ static struct vg_shader _shader_water_fast = { " 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" @@ -154,6 +189,13 @@ static struct vg_shader _shader_water_fast = { " 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" @@ -164,6 +206,26 @@ static struct vg_shader _shader_water_fast = { "}\n" "\n" "#line 19 0 \n" +"#line 1 2 \n" +"const float k_motion_lerp_amount = 0.01;\n" +"\n" +"#line 2 0 \n" +"\n" +"layout (location = 1) out vec2 oMotionVec;\n" +"\n" +"in vec3 aMotionVec0;\n" +"in vec3 aMotionVec1;\n" +"\n" +"void compute_motion_vectors()\n" +"{\n" +" // Write motion vectors\n" +" vec2 vmotion0 = aMotionVec0.xy / aMotionVec0.z;\n" +" vec2 vmotion1 = aMotionVec1.xy / aMotionVec1.z;\n" +"\n" +" oMotionVec = (vmotion1-vmotion0) * (1.0/k_motion_lerp_amount);\n" +"}\n" +"\n" +"#line 20 0 \n" "\n" "vec4 water_surf( vec3 halfview, vec3 vnorm, float depthvalue )\n" "{\n" @@ -180,6 +242,8 @@ static struct vg_shader _shader_water_fast = { "\n" "void main()\n" "{\n" +" compute_motion_vectors();\n" +"\n" " // Surface colour composite\n" " float depthvalue = clamp( -world_depth_sample( aCo )*(1.0/25.0), 0.0, 1.0 );\n" "\n" @@ -204,46 +268,58 @@ static struct vg_shader _shader_water_fast = { " // Composite\n" " vec4 vsurface = water_surf( halfview, surfnorm, depthvalue );\n" " vsurface.a -= fdist;\n" -" FragColor = mix( vsurface, vec4(1.0,1.0,1.0,0.5), fband );\n" +" oColour = mix( vsurface, vec4(1.0,1.0,1.0,0.5), fband );\n" "}\n" ""}, }; static GLuint _uniform_water_fast_uMdl; static GLuint _uniform_water_fast_uPv; +static GLuint _uniform_water_fast_uPvmPrev; static GLuint _uniform_water_fast_uTexDudv; static GLuint _uniform_water_fast_uTime; static GLuint _uniform_water_fast_uCamera; static GLuint _uniform_water_fast_uSurfaceY; +static GLuint _uniform_water_fast_uBoard0; +static GLuint _uniform_water_fast_uBoard1; static GLuint _uniform_water_fast_uShoreColour; static GLuint _uniform_water_fast_uOceanColour; static GLuint _uniform_water_fast_g_world_depth; static void shader_water_fast_uMdl(m4x3f m){ - glUniformMatrix4x3fv( _uniform_water_fast_uMdl, 1, GL_FALSE, (float *)m ); + glUniformMatrix4x3fv(_uniform_water_fast_uMdl,1,GL_FALSE,(float*)m); } static void shader_water_fast_uPv(m4x4f m){ - glUniformMatrix4fv( _uniform_water_fast_uPv, 1, GL_FALSE, (float *)m ); + glUniformMatrix4fv(_uniform_water_fast_uPv,1,GL_FALSE,(float*)m); +} +static void shader_water_fast_uPvmPrev(m4x4f m){ + glUniformMatrix4fv(_uniform_water_fast_uPvmPrev,1,GL_FALSE,(float*)m); } static void shader_water_fast_uTexDudv(int i){ - glUniform1i( _uniform_water_fast_uTexDudv, i ); + glUniform1i(_uniform_water_fast_uTexDudv,i); } static void shader_water_fast_uTime(float f){ - glUniform1f( _uniform_water_fast_uTime, f ); + glUniform1f(_uniform_water_fast_uTime,f); } static void shader_water_fast_uCamera(v3f v){ - glUniform3fv( _uniform_water_fast_uCamera, 1, v ); + glUniform3fv(_uniform_water_fast_uCamera,1,v); } static void shader_water_fast_uSurfaceY(float f){ - glUniform1f( _uniform_water_fast_uSurfaceY, f ); + glUniform1f(_uniform_water_fast_uSurfaceY,f); +} +static void shader_water_fast_uBoard0(v3f v){ + glUniform3fv(_uniform_water_fast_uBoard0,1,v); +} +static void shader_water_fast_uBoard1(v3f v){ + glUniform3fv(_uniform_water_fast_uBoard1,1,v); } static void shader_water_fast_uShoreColour(v3f v){ - glUniform3fv( _uniform_water_fast_uShoreColour, 1, v ); + glUniform3fv(_uniform_water_fast_uShoreColour,1,v); } static void shader_water_fast_uOceanColour(v3f v){ - glUniform3fv( _uniform_water_fast_uOceanColour, 1, v ); + glUniform3fv(_uniform_water_fast_uOceanColour,1,v); } static void shader_water_fast_g_world_depth(int i){ - glUniform1i( _uniform_water_fast_g_world_depth, i ); + glUniform1i(_uniform_water_fast_g_world_depth,i); } static void shader_water_fast_register(void){ vg_shader_register( &_shader_water_fast ); @@ -252,10 +328,13 @@ static void shader_water_fast_use(void){ glUseProgram(_shader_water_fast.id); } static void shader_water_fast_link(void){ _uniform_water_fast_uMdl = glGetUniformLocation( _shader_water_fast.id, "uMdl" ); _uniform_water_fast_uPv = glGetUniformLocation( _shader_water_fast.id, "uPv" ); + _uniform_water_fast_uPvmPrev = glGetUniformLocation( _shader_water_fast.id, "uPvmPrev" ); _uniform_water_fast_uTexDudv = glGetUniformLocation( _shader_water_fast.id, "uTexDudv" ); _uniform_water_fast_uTime = glGetUniformLocation( _shader_water_fast.id, "uTime" ); _uniform_water_fast_uCamera = glGetUniformLocation( _shader_water_fast.id, "uCamera" ); _uniform_water_fast_uSurfaceY = glGetUniformLocation( _shader_water_fast.id, "uSurfaceY" ); + _uniform_water_fast_uBoard0 = glGetUniformLocation( _shader_water_fast.id, "uBoard0" ); + _uniform_water_fast_uBoard1 = glGetUniformLocation( _shader_water_fast.id, "uBoard1" ); _uniform_water_fast_uShoreColour = glGetUniformLocation( _shader_water_fast.id, "uShoreColour" ); _uniform_water_fast_uOceanColour = glGetUniformLocation( _shader_water_fast.id, "uOceanColour" ); _uniform_water_fast_g_world_depth = glGetUniformLocation( _shader_water_fast.id, "g_world_depth" );