fix null reference

[carveJwlIkooP6JGAAIwe30JlM.git] / shaders / model_gate.h

diff --git a/shaders/model_gate.h b/shaders/model_gate.h
index fc9c1ea326b904532f78be6249efb0e78f08e549..31329abb360c00b1bc97621f47263aa79ace7606 100644 (file)
--- a/shaders/model_gate.h
+++ b/shaders/model_gate.h
@@ -7,7 +7,7 @@ static struct vg_shader _shader_model_gate = {
    .link = shader_model_gate_link,
    .vs = 
 {
-.orig_file = "shaders/model_gate.vs",
+.orig_file = "shaders/model.vs",
 .static_src = 
 "layout (location=0) in vec3 a_co;\n"
 "layout (location=1) in vec3 a_norm;\n"
@@ -16,21 +16,50 @@ static struct vg_shader _shader_model_gate = {
 "layout (location=4) in vec4 a_weights;\n"
 "layout (location=5) in ivec4 a_groups;\n"
 "\n"
-"uniform mat4 uPv;\n"
+"#line       1        1 \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      9        0 \n"
+"\n"
 "uniform mat4x3 uMdl;\n"
+"uniform mat4 uPv;\n"
+"uniform mat4 uPvmPrev;\n"
 "\n"
-"out vec3 aNorm;\n"
+"out vec4 aColour;\n"
 "out vec2 aUv;\n"
+"out vec3 aNorm;\n"
 "out vec3 aCo;\n"
+"out vec3 aWorldCo;\n"
 "\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"
-"   aNorm = a_norm;\n"
-"   aCo = world_pos;\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"
 "}\n"
 ""},
    .fs = 
@@ -64,17 +93,21 @@ static struct vg_shader _shader_model_gate = {
 ""},
 };
 
-static GLuint _uniform_model_gate_uPv;
 static GLuint _uniform_model_gate_uMdl;
+static GLuint _uniform_model_gate_uPv;
+static GLuint _uniform_model_gate_uPvmPrev;
 static GLuint _uniform_model_gate_uTime;
 static GLuint _uniform_model_gate_uCam;
 static GLuint _uniform_model_gate_uInvRes;
 static GLuint _uniform_model_gate_uColour;
+static void shader_model_gate_uMdl(m4x3f m){
+   glUniformMatrix4x3fv(_uniform_model_gate_uMdl,1,GL_FALSE,(float*)m);
+}
 static void shader_model_gate_uPv(m4x4f m){
    glUniformMatrix4fv(_uniform_model_gate_uPv,1,GL_FALSE,(float*)m);
 }
-static void shader_model_gate_uMdl(m4x3f m){
-   glUniformMatrix4x3fv(_uniform_model_gate_uMdl,1,GL_FALSE,(float*)m);
+static void shader_model_gate_uPvmPrev(m4x4f m){
+   glUniformMatrix4fv(_uniform_model_gate_uPvmPrev,1,GL_FALSE,(float*)m);
 }
 static void shader_model_gate_uTime(float f){
    glUniform1f(_uniform_model_gate_uTime,f);
@@ -93,8 +126,9 @@ static void shader_model_gate_register(void){
 }
 static void shader_model_gate_use(void){ glUseProgram(_shader_model_gate.id); }
 static void shader_model_gate_link(void){
-   _uniform_model_gate_uPv = glGetUniformLocation( _shader_model_gate.id, "uPv" );
    _uniform_model_gate_uMdl = glGetUniformLocation( _shader_model_gate.id, "uMdl" );
+   _uniform_model_gate_uPv = glGetUniformLocation( _shader_model_gate.id, "uPv" );
+   _uniform_model_gate_uPvmPrev = glGetUniformLocation( _shader_model_gate.id, "uPvmPrev" );
    _uniform_model_gate_uTime = glGetUniformLocation( _shader_model_gate.id, "uTime" );
    _uniform_model_gate_uCam = glGetUniformLocation( _shader_model_gate.id, "uCam" );
    _uniform_model_gate_uInvRes = glGetUniformLocation( _shader_model_gate.id, "uInvRes" );