framebuffer formalitites

[carveJwlIkooP6JGAAIwe30JlM.git] / shaders / menu.h

diff --git a/shaders/menu.h b/shaders/menu.h
index d0cd493d75ab63ba6643b4bb30f452cff2fff98a..2a14ac1921673ce3a5e09f48d2a644b44961eb5d 100644 (file)
--- a/shaders/menu.h
+++ b/shaders/menu.h
@@ -7,7 +7,6 @@ static struct vg_shader _shader_menu = {
    .link = shader_menu_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,21 @@ static struct vg_shader _shader_menu = {
 "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"
@@ -29,18 +40,22 @@ static struct vg_shader _shader_menu = {
 "\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/menu.fs",
 .static_src = 
 "out vec4 FragColor;\n"
 "\n"
@@ -66,19 +81,23 @@ static struct vg_shader _shader_menu = {
 
 static GLuint _uniform_menu_uMdl;
 static GLuint _uniform_menu_uPv;
+static GLuint _uniform_menu_uPvmPrev;
 static GLuint _uniform_menu_uTexMain;
 static GLuint _uniform_menu_uColour;
 static void shader_menu_uMdl(m4x3f m){
-   glUniformMatrix4x3fv( _uniform_menu_uMdl, 1, GL_FALSE, (float *)m );
+   glUniformMatrix4x3fv(_uniform_menu_uMdl,1,GL_FALSE,(float*)m);
 }
 static void shader_menu_uPv(m4x4f m){
-   glUniformMatrix4fv( _uniform_menu_uPv, 1, GL_FALSE, (float *)m );
+   glUniformMatrix4fv(_uniform_menu_uPv,1,GL_FALSE,(float*)m);
+}
+static void shader_menu_uPvmPrev(m4x4f m){
+   glUniformMatrix4fv(_uniform_menu_uPvmPrev,1,GL_FALSE,(float*)m);
 }
 static void shader_menu_uTexMain(int i){
-   glUniform1i( _uniform_menu_uTexMain, i );
+   glUniform1i(_uniform_menu_uTexMain,i);
 }
 static void shader_menu_uColour(v4f v){
-   glUniform4fv( _uniform_menu_uColour, 1, v );
+   glUniform4fv(_uniform_menu_uColour,1,v);
 }
 static void shader_menu_register(void){
    vg_shader_register( &_shader_menu );
@@ -87,6 +106,7 @@ static void shader_menu_use(void){ glUseProgram(_shader_menu.id); }
 static void shader_menu_link(void){
    _uniform_menu_uMdl = glGetUniformLocation( _shader_menu.id, "uMdl" );
    _uniform_menu_uPv = glGetUniformLocation( _shader_menu.id, "uPv" );
+   _uniform_menu_uPvmPrev = glGetUniformLocation( _shader_menu.id, "uPvmPrev" );
    _uniform_menu_uTexMain = glGetUniformLocation( _shader_menu.id, "uTexMain" );
    _uniform_menu_uColour = glGetUniformLocation( _shader_menu.id, "uColour" );
 }