X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=shaders%2Falphatest.h;h=07908407de8157e18f9d52e01e8cab1cce5f6396;hb=4bb5686fffc24abdc4a722051ca066378cb8d419;hp=80ce028df5bd3622141e9837362a195e5c9a3e03;hpb=d045af680c6b8ca267a7aded69e2e510e659d2ab;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/shaders/alphatest.h b/shaders/alphatest.h
index 80ce028..0790840 100644
--- a/shaders/alphatest.h
+++ b/shaders/alphatest.h
@@ -18,8 +18,8 @@ static struct vg_shader _shader_alphatest = {
 "\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"
@@ -67,6 +67,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"
@@ -131,6 +132,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"
@@ -186,19 +192,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 );
 }
@@ -219,8 +225,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" );