revision 2

[carveJwlIkooP6JGAAIwe30JlM.git] / shaders / model_menu.h

diff --git a/shaders/model_menu.h b/shaders/model_menu.h
index 0ee6ad39f0aca1044922ebf3f6b28a79991cb35b..774d4c8f407906fb992c469e72cb61524abce750 100644 (file)
--- a/shaders/model_menu.h
+++ b/shaders/model_menu.h
@@ -1,122 +1,33 @@
-#ifndef SHADER_model_menu_H
-#define SHADER_model_menu_H
-static void shader_model_menu_link(void);
-static void shader_model_menu_register(void);
-static struct vg_shader _shader_model_menu = {
-   .name = "model_menu",
-   .link = shader_model_menu_link,
-   .vs = 
+#pragma once
+#include "vg/vg_engine.h"
+extern struct vg_shader _shader_model_menu;
+extern GLuint _uniform_model_menu_uMdl;
+extern GLuint _uniform_model_menu_uPv;
+extern GLuint _uniform_model_menu_uPvmPrev;
+extern GLuint _uniform_model_menu_uTexMain;
+extern GLuint _uniform_model_menu_uColour;
+static inline void shader_model_menu_uMdl(m4x3f m)
 {
-.orig_file = "shaders/model.vs",
-.static_src = 
-"layout (location=0) in vec3 a_co;\n"
-"layout (location=1) in vec3 a_norm;\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       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 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_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 = normalize( mat3(uMdl) * a_norm );\n"
-"   aCo = a_co;\n"
-"}\n"
-""},
-   .fs = 
-{
-.orig_file = "shaders/model_menu.fs",
-.static_src = 
-"out vec4 FragColor;\n"
-"\n"
-"uniform sampler2D uTexMain;\n"
-"uniform vec4 uColour;\n"
-"\n"
-"in vec4 aColour;\n"
-"in vec2 aUv;\n"
-"in vec3 aNorm;\n"
-"in vec3 aCo;\n"
-"\n"
-"void main()\n"
-"{\n"
-"   vec4 diffuse = texture( uTexMain, aUv );\n"
-"\n"
-"   if( diffuse.a < 0.5 )\n"
-"      discard;\n"
-"\n"
-"   FragColor = vec4( diffuse.rgb, 1.0 ) * uColour;\n"
-"}\n"
-""},
-};
-
-static GLuint _uniform_model_menu_uMdl;
-static GLuint _uniform_model_menu_uPv;
-static GLuint _uniform_model_menu_uPvmPrev;
-static GLuint _uniform_model_menu_uTexMain;
-static GLuint _uniform_model_menu_uColour;
-static void shader_model_menu_uMdl(m4x3f m){
-   glUniformMatrix4x3fv(_uniform_model_menu_uMdl,1,GL_FALSE,(float*)m);
+   glUniformMatrix4x3fv(_uniform_model_menu_uMdl,1,GL_FALSE,(f32*)m);
 }
-static void shader_model_menu_uPv(m4x4f m){
-   glUniformMatrix4fv(_uniform_model_menu_uPv,1,GL_FALSE,(float*)m);
+static inline void shader_model_menu_uPv(m4x4f m)
+{
+   glUniformMatrix4fv(_uniform_model_menu_uPv,1,GL_FALSE,(f32*)m);
 }
-static void shader_model_menu_uPvmPrev(m4x4f m){
-   glUniformMatrix4fv(_uniform_model_menu_uPvmPrev,1,GL_FALSE,(float*)m);
+static inline void shader_model_menu_uPvmPrev(m4x4f m)
+{
+   glUniformMatrix4fv(_uniform_model_menu_uPvmPrev,1,GL_FALSE,(f32*)m);
 }
-static void shader_model_menu_uTexMain(int i){
+static inline void shader_model_menu_uTexMain(int i)
+{
    glUniform1i(_uniform_model_menu_uTexMain,i);
 }
-static void shader_model_menu_uColour(v4f v){
+static inline void shader_model_menu_uColour(v4f v)
+{
    glUniform4fv(_uniform_model_menu_uColour,1,v);
 }
-static void shader_model_menu_register(void){
-   vg_shader_register( &_shader_model_menu );
-}
-static void shader_model_menu_use(void){ glUseProgram(_shader_model_menu.id); }
-static void shader_model_menu_link(void){
-   _uniform_model_menu_uMdl = glGetUniformLocation( _shader_model_menu.id, "uMdl" );
-   _uniform_model_menu_uPv = glGetUniformLocation( _shader_model_menu.id, "uPv" );
-   _uniform_model_menu_uPvmPrev = glGetUniformLocation( _shader_model_menu.id, "uPvmPrev" );
-   _uniform_model_menu_uTexMain = glGetUniformLocation( _shader_model_menu.id, "uTexMain" );
-   _uniform_model_menu_uColour = glGetUniformLocation( _shader_model_menu.id, "uColour" );
+static inline void shader_model_menu_use(void);
+static inline void shader_model_menu_use(void)
+{
+   glUseProgram(_shader_model_menu.id);
 }
-#endif /* SHADER_model_menu_H */