X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=shaders%2Falphatest.h;h=9b161c1b86a28950c59c3fd1781977bf033cac06;hb=bdac014448b6ec968fe645f1581f321144f07dba;hp=3039b48b9397fb0428cca1c69e302ae85ed32df5;hpb=d57b7661518800479c00300ce57407378696eec9;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/shaders/alphatest.h b/shaders/alphatest.h
index 3039b48..9b161c1 100644
--- a/shaders/alphatest.h
+++ b/shaders/alphatest.h
@@ -7,17 +7,19 @@ static struct vg_shader _shader_alphatest = {
    .link = shader_alphatest_link,
    .vs = 
 {
-.orig_file = "../shaders/standard.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"
 "\n"
-"uniform mat4 uPv;\n"
 "uniform mat4x3 uMdl;\n"
+"uniform mat4 uPv;\n"
 "\n"
 "out vec4 aColour;\n"
 "out vec2 aUv;\n"
@@ -38,7 +40,7 @@ static struct vg_shader _shader_alphatest = {
 ""},
    .fs = 
 {
-.orig_file = "../shaders/std_alphatest.fs",
+.orig_file = "../../shaders/std_alphatest.fs",
 .static_src = 
 "out vec4 FragColor;\n"
 "\n"
@@ -184,19 +186,19 @@ static struct vg_shader _shader_alphatest = {
 ""},
 };
 
-static GLuint _uniform_alphatest_uPv;
 static GLuint _uniform_alphatest_uMdl;
+static GLuint _uniform_alphatest_uPv;
 static GLuint _uniform_alphatest_uTexGarbage;
 static GLuint _uniform_alphatest_uTexMain;
 static GLuint _uniform_alphatest_uCamera;
 static GLuint _uniform_alphatest_uPlane;
 static GLuint _uniform_alphatest_g_world_depth;
-static void shader_alphatest_uPv(m4x4f m){
-   glUniformMatrix4fv( _uniform_alphatest_uPv, 1, GL_FALSE, (float *)m );
-}
 static void shader_alphatest_uMdl(m4x3f m){
    glUniformMatrix4x3fv( _uniform_alphatest_uMdl, 1, GL_FALSE, (float *)m );
 }
+static void shader_alphatest_uPv(m4x4f m){
+   glUniformMatrix4fv( _uniform_alphatest_uPv, 1, GL_FALSE, (float *)m );
+}
 static void shader_alphatest_uTexGarbage(int i){
    glUniform1i( _uniform_alphatest_uTexGarbage, i );
 }
@@ -217,8 +219,8 @@ static void shader_alphatest_register(void){
 }
 static void shader_alphatest_use(void){ glUseProgram(_shader_alphatest.id); }
 static void shader_alphatest_link(void){
-   _uniform_alphatest_uPv = glGetUniformLocation( _shader_alphatest.id, "uPv" );
    _uniform_alphatest_uMdl = glGetUniformLocation( _shader_alphatest.id, "uMdl" );
+   _uniform_alphatest_uPv = glGetUniformLocation( _shader_alphatest.id, "uPv" );
    _uniform_alphatest_uTexGarbage = glGetUniformLocation( _shader_alphatest.id, "uTexGarbage" );
    _uniform_alphatest_uTexMain = glGetUniformLocation( _shader_alphatest.id, "uTexMain" );
    _uniform_alphatest_uCamera = glGetUniformLocation( _shader_alphatest.id, "uCamera" );