X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=shaders%2Fvblend.h;h=2a5dacf8bcb16d9db7ede932a3e82b07143ca0b8;hb=a1adba47558099cab82aa6d10abdc1dca11d3342;hp=cc057627036fb630443fd21a8834903a26d92422;hpb=60b0d8af679396c857f8c5f9a7a518b092a2f416;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/shaders/vblend.h b/shaders/vblend.h index cc05762..2a5dacf 100644 --- a/shaders/vblend.h +++ b/shaders/vblend.h @@ -7,17 +7,30 @@ static struct vg_shader _shader_vblend = { .link = shader_vblend_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" -"layout (location=2) in vec4 a_colour;\n" -"layout (location=3) in vec2 a_uv;\n" +"layout (location=2) in vec2 a_uv;\n" +"layout (location=3) in vec4 a_colour;\n" +"layout (location=4) in vec4 a_weights;\n" +"layout (location=5) in ivec4 a_groups;\n" "\n" "#line 2 0 \n" +"#line 1 2 \n" +"out vec3 aMotionVec0;\n" +"out vec3 aMotionVec1;\n" +"\n" +"void vs_motion_out( vec4 vproj0, vec4 vproj1 )\n" +"{\n" +" aMotionVec0 = vec3( vproj0.xy, vproj0.w );\n" +" aMotionVec1 = vec3( vproj1.xy, vproj1.w );\n" +"}\n" +"\n" +"#line 3 0 \n" "\n" -"uniform mat4 uPv;\n" "uniform mat4x3 uMdl;\n" +"uniform mat4 uPv;\n" +"uniform mat4 uPvmPrev;\n" "\n" "out vec4 aColour;\n" "out vec2 aUv;\n" @@ -27,21 +40,23 @@ static struct vg_shader _shader_vblend = { "\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/vblend.fs", .static_src = -"out vec4 FragColor;\n" -"\n" "uniform sampler2D uTexGarbage;\n" "uniform sampler2D uTexGradients;\n" "uniform vec3 uCamera;\n" @@ -53,6 +68,8 @@ static struct vg_shader _shader_vblend = { "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" @@ -64,6 +81,7 @@ static struct vg_shader _shader_vblend = { " float g_water_fog;\n" " int g_light_count;\n" " int g_light_preview;\n" +" int g_shadow_samples;\n" "};\n" "\n" "uniform sampler2D g_world_depth;\n" @@ -128,6 +146,11 @@ static struct vg_shader _shader_vblend = { "\n" "vec3 do_light_shadowing( vec3 vfrag )\n" "{\n" +" if( g_shadow_samples == 0 )\n" +" {\n" +" return vfrag;\n" +" }\n" +"\n" " float fspread = g_light_colours[0].w;\n" " vec3 vdir = g_light_directions[0].xyz;\n" " float flength = g_light_directions[0].w;\n" @@ -150,10 +173,27 @@ static struct vg_shader _shader_vblend = { " return mix( vfrag, vec3(0.55,0.76,1.0), min( 1.0, dist ) );\n" "}\n" "\n" -"#line 14 0 \n" +"#line 12 0 \n" +"#line 1 2 \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" +" oMotionVec = vmotion1-vmotion0;\n" +"}\n" +"\n" +"#line 13 0 \n" "\n" "void main()\n" "{\n" +" compute_motion_vectors();\n" +"\n" " vec3 vfrag = vec3(0.5,0.5,0.5);\n" "\n" " // ws modulation\n" @@ -192,42 +232,47 @@ static struct vg_shader _shader_vblend = { " vfrag = do_light_shadowing( vfrag );\n" " vfrag = apply_fog( vfrag, fdist );\n" "\n" -" FragColor = vec4(vfrag, 1.0 );\n" +" oColour = vec4(vfrag, 1.0 );\n" "}\n" ""}, }; -static GLuint _uniform_vblend_uPv; static GLuint _uniform_vblend_uMdl; +static GLuint _uniform_vblend_uPv; +static GLuint _uniform_vblend_uPvmPrev; static GLuint _uniform_vblend_uTexGarbage; static GLuint _uniform_vblend_uTexGradients; static GLuint _uniform_vblend_uCamera; static GLuint _uniform_vblend_g_world_depth; +static void shader_vblend_uMdl(m4x3f m){ + glUniformMatrix4x3fv(_uniform_vblend_uMdl,1,GL_FALSE,(float*)m); +} static void shader_vblend_uPv(m4x4f m){ - glUniformMatrix4fv( _uniform_vblend_uPv, 1, GL_FALSE, (float *)m ); + glUniformMatrix4fv(_uniform_vblend_uPv,1,GL_FALSE,(float*)m); } -static void shader_vblend_uMdl(m4x3f m){ - glUniformMatrix4x3fv( _uniform_vblend_uMdl, 1, GL_FALSE, (float *)m ); +static void shader_vblend_uPvmPrev(m4x4f m){ + glUniformMatrix4fv(_uniform_vblend_uPvmPrev,1,GL_FALSE,(float*)m); } static void shader_vblend_uTexGarbage(int i){ - glUniform1i( _uniform_vblend_uTexGarbage, i ); + glUniform1i(_uniform_vblend_uTexGarbage,i); } static void shader_vblend_uTexGradients(int i){ - glUniform1i( _uniform_vblend_uTexGradients, i ); + glUniform1i(_uniform_vblend_uTexGradients,i); } static void shader_vblend_uCamera(v3f v){ - glUniform3fv( _uniform_vblend_uCamera, 1, v ); + glUniform3fv(_uniform_vblend_uCamera,1,v); } static void shader_vblend_g_world_depth(int i){ - glUniform1i( _uniform_vblend_g_world_depth, i ); + glUniform1i(_uniform_vblend_g_world_depth,i); } static void shader_vblend_register(void){ vg_shader_register( &_shader_vblend ); } static void shader_vblend_use(void){ glUseProgram(_shader_vblend.id); } static void shader_vblend_link(void){ - _uniform_vblend_uPv = glGetUniformLocation( _shader_vblend.id, "uPv" ); _uniform_vblend_uMdl = glGetUniformLocation( _shader_vblend.id, "uMdl" ); + _uniform_vblend_uPv = glGetUniformLocation( _shader_vblend.id, "uPv" ); + _uniform_vblend_uPvmPrev = glGetUniformLocation( _shader_vblend.id, "uPvmPrev" ); _uniform_vblend_uTexGarbage = glGetUniformLocation( _shader_vblend.id, "uTexGarbage" ); _uniform_vblend_uTexGradients = glGetUniformLocation( _shader_vblend.id, "uTexGradients" ); _uniform_vblend_uCamera = glGetUniformLocation( _shader_vblend.id, "uCamera" );