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

diff --git a/shaders/alphatest.h b/shaders/alphatest.h
index 3039b48..13d11ae 100644
--- a/shaders/alphatest.h
+++ b/shaders/alphatest.h
@@ -7,17 +7,18 @@ static struct vg_shader _shader_alphatest = {
    .link = shader_alphatest_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"
-"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 +39,6 @@ static struct vg_shader _shader_alphatest = {
 ""},
    .fs = 
 {
-.orig_file = "../shaders/std_alphatest.fs",
 .static_src = 
 "out vec4 FragColor;\n"
 "\n"
@@ -65,6 +65,7 @@ static struct vg_shader _shader_alphatest = {
 "   float g_water_fog;\n"
 "   int g_light_count;\n"
 "   int g_light_preview;\n"
+"   int g_shadow_samples;\n"
 "};\n"
 "\n"
 "uniform sampler2D g_world_depth;\n"
@@ -129,6 +130,11 @@ static struct vg_shader _shader_alphatest = {
 "\n"
 "vec3 do_light_shadowing( vec3 vfrag )\n"
 "{\n"
+"   if( g_shadow_samples == 0 )\n"
+"   {\n"
+"      return vfrag;\n"
+"   }\n"
+"\n"
 "   float fspread = g_light_colours[0].w;\n"
 "   vec3  vdir = g_light_directions[0].xyz;\n"
 "   float flength = g_light_directions[0].w;\n"
@@ -184,41 +190,41 @@ 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 );
+   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 );
+   glUniform1i(_uniform_alphatest_uTexGarbage,i);
 }
 static void shader_alphatest_uTexMain(int i){
-   glUniform1i( _uniform_alphatest_uTexMain, i );
+   glUniform1i(_uniform_alphatest_uTexMain,i);
 }
 static void shader_alphatest_uCamera(v3f v){
-   glUniform3fv( _uniform_alphatest_uCamera, 1, v );
+   glUniform3fv(_uniform_alphatest_uCamera,1,v);
 }
 static void shader_alphatest_uPlane(v4f v){
-   glUniform4fv( _uniform_alphatest_uPlane, 1, v );
+   glUniform4fv(_uniform_alphatest_uPlane,1,v);
 }
 static void shader_alphatest_g_world_depth(int i){
-   glUniform1i( _uniform_alphatest_g_world_depth, i );
+   glUniform1i(_uniform_alphatest_g_world_depth,i);
 }
 static void shader_alphatest_register(void){
    vg_shader_register( &_shader_alphatest );
 }
 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" );