X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=sidebyside;f=shaders%2Fstandard.h;h=3c759b6c8584a93decf24298faa23cd2577ba57a;hb=f7db507815e2822d971031c30f25e02b45e9c914;hp=4d52aa81fad8601b97d1788a133e8ea22770b1c7;hpb=75703291fbf045008a3b1ebb20fc46a2617b6b3b;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/shaders/standard.h b/shaders/standard.h
index 4d52aa8..3c759b6 100644
--- a/shaders/standard.h
+++ b/shaders/standard.h
@@ -16,9 +16,21 @@ static struct vg_shader _shader_standard = {
 "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 mat4x3 uMdl;\n"
 "uniform mat4 uPv;\n"
+"uniform mat4 uPvmPrev;\n"
 "\n"
 "out vec4 aColour;\n"
 "out vec2 aUv;\n"
@@ -28,20 +40,23 @@ static struct vg_shader _shader_standard = {
 "\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 = 
 {
 .static_src = 
-"out vec4 FragColor;\n"
-"\n"
 "uniform sampler2D uTexGarbage;\n"
 "uniform sampler2D uTexMain;\n"
 "uniform vec3 uCamera;\n"
@@ -54,6 +69,8 @@ static struct vg_shader _shader_standard = {
 "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"
@@ -157,10 +174,27 @@ static struct vg_shader _shader_standard = {
 "   return mix( vfrag, vec3(0.55,0.76,1.0), min( 1.0, dist ) );\n"
 "}\n"
 "\n"
-"#line     15        0 \n"
+"#line     13        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     14        0 \n"
 "\n"
 "void main()\n"
 "{\n"
+"   compute_motion_vectors();\n"
+"\n"
 "   vec3 vfrag = vec3(0.5,0.5,0.5);\n"
 "   vec4 vsamplemain = texture( uTexMain, aUv );\n"
 "   vec3 qnorm = normalize(aNorm);\n"
@@ -182,13 +216,14 @@ static struct vg_shader _shader_standard = {
 "   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_standard_uMdl;
 static GLuint _uniform_standard_uPv;
+static GLuint _uniform_standard_uPvmPrev;
 static GLuint _uniform_standard_uTexGarbage;
 static GLuint _uniform_standard_uTexMain;
 static GLuint _uniform_standard_uCamera;
@@ -200,6 +235,9 @@ static void shader_standard_uMdl(m4x3f m){
 static void shader_standard_uPv(m4x4f m){
    glUniformMatrix4fv(_uniform_standard_uPv,1,GL_FALSE,(float*)m);
 }
+static void shader_standard_uPvmPrev(m4x4f m){
+   glUniformMatrix4fv(_uniform_standard_uPvmPrev,1,GL_FALSE,(float*)m);
+}
 static void shader_standard_uTexGarbage(int i){
    glUniform1i(_uniform_standard_uTexGarbage,i);
 }
@@ -222,6 +260,7 @@ static void shader_standard_use(void){ glUseProgram(_shader_standard.id); }
 static void shader_standard_link(void){
    _uniform_standard_uMdl = glGetUniformLocation( _shader_standard.id, "uMdl" );
    _uniform_standard_uPv = glGetUniformLocation( _shader_standard.id, "uPv" );
+   _uniform_standard_uPvmPrev = glGetUniformLocation( _shader_standard.id, "uPvmPrev" );
    _uniform_standard_uTexGarbage = glGetUniformLocation( _shader_standard.id, "uTexGarbage" );
    _uniform_standard_uTexMain = glGetUniformLocation( _shader_standard.id, "uTexMain" );
    _uniform_standard_uCamera = glGetUniformLocation( _shader_standard.id, "uCamera" );