X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=shaders%2Fgate.h;h=7b5b31f4dd2d31a0a44bf1e55a64db6b55ceb8ce;hb=d45f2b7d71311ce5ce8cd3496844b4ec7d2f46ac;hp=53013d0c20d34d06ee31786134d2af7c51825880;hpb=60b0d8af679396c857f8c5f9a7a518b092a2f416;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/shaders/gate.h b/shaders/gate.h
index 53013d0..7b5b31f 100644
--- a/shaders/gate.h
+++ b/shaders/gate.h
@@ -7,12 +7,13 @@ static struct vg_shader _shader_gate = {
    .link = shader_gate_link,
    .vs = 
 {
-.orig_file = "../../shaders/gate.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"
 "uniform mat4 uPv;\n"
@@ -34,7 +35,6 @@ static struct vg_shader _shader_gate = {
 ""},
    .fs = 
 {
-.orig_file = "../../shaders/gate.fs",
 .static_src = 
 "out vec4 FragColor;\n"
 "\n"
@@ -74,25 +74,25 @@ static GLuint _uniform_gate_uInvRes;
 static GLuint _uniform_gate_uTime;
 static GLuint _uniform_gate_uCam;
 static void shader_gate_uPv(m4x4f m){
-   glUniformMatrix4fv( _uniform_gate_uPv, 1, GL_FALSE, (float *)m );
+   glUniformMatrix4fv(_uniform_gate_uPv,1,GL_FALSE,(float*)m);
 }
 static void shader_gate_uMdl(m4x3f m){
-   glUniformMatrix4x3fv( _uniform_gate_uMdl, 1, GL_FALSE, (float *)m );
+   glUniformMatrix4x3fv(_uniform_gate_uMdl,1,GL_FALSE,(float*)m);
 }
 static void shader_gate_uTexMain(int i){
-   glUniform1i( _uniform_gate_uTexMain, i );
+   glUniform1i(_uniform_gate_uTexMain,i);
 }
 static void shader_gate_uTexWater(int i){
-   glUniform1i( _uniform_gate_uTexWater, i );
+   glUniform1i(_uniform_gate_uTexWater,i);
 }
 static void shader_gate_uInvRes(v2f v){
-   glUniform2fv( _uniform_gate_uInvRes, 1, v );
+   glUniform2fv(_uniform_gate_uInvRes,1,v);
 }
 static void shader_gate_uTime(float f){
-   glUniform1f( _uniform_gate_uTime, f );
+   glUniform1f(_uniform_gate_uTime,f);
 }
 static void shader_gate_uCam(v3f v){
-   glUniform3fv( _uniform_gate_uCam, 1, v );
+   glUniform3fv(_uniform_gate_uCam,1,v);
 }
 static void shader_gate_register(void){
    vg_shader_register( &_shader_gate );