X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=shaders%2Fscene_standard_alphatest.h;h=19a42cf98b187e8e5705c3fc55587a298bf2ae37;hb=137d40d96fe923600d8378b8e138e3c276f27ff4;hp=74b36f64f264ce425bac5d733c46589987c3d141;hpb=a1056ed8198f0f5be0e0f341da8bd49aa6c47198;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/shaders/scene_standard_alphatest.h b/shaders/scene_standard_alphatest.h
index 74b36f6..19a42cf 100644
--- a/shaders/scene_standard_alphatest.h
+++ b/shaders/scene_standard_alphatest.h
@@ -64,8 +64,6 @@ static struct vg_shader _shader_scene_standard_alphatest = {
 .static_src = 
 "uniform sampler2D uTexGarbage;\n"
 "uniform sampler2D uTexMain;\n"
-"uniform vec3 uBoard0;\n"
-"uniform vec3 uBoard1;\n"
 "uniform vec3 uCamera;\n"
 "uniform vec4 uPlane;\n"
 "\n"
@@ -96,6 +94,8 @@ static struct vg_shader _shader_scene_standard_alphatest = {
 "   vec4 g_sunset_ambient;\n"
 "   vec4 g_sun_colour;\n"
 "   vec4 g_sun_dir;\n"
+"   vec4 g_board_0;\n"
+"   vec4 g_board_1;\n"
 "\n"
 "   float g_water_fog;\n"
 "   float g_time;\n"
@@ -196,7 +196,7 @@ static struct vg_shader _shader_scene_standard_alphatest = {
 "   return ambient + (light_sun + sky_reflection) * shadow;\n"
 "}\n"
 "\n"
-"#line     42        0 \n"
+"#line     44        0 \n"
 "\n"
 "float world_depth_sample( vec3 pos )\n"
 "{\n"
@@ -206,9 +206,8 @@ static struct vg_shader _shader_scene_standard_alphatest = {
 "\n"
 "float world_water_depth( vec3 pos )\n"
 "{\n"
-"   vec2 depth_coord = (pos.xz - g_depth_bounds.xy) * g_depth_bounds.zw; \n"
 "   float ref_depth = g_water_plane.y*g_water_plane.w;\n"
-"   return texture( g_world_depth, depth_coord ).g - ref_depth;\n"
+"   return world_depth_sample( pos ) - ref_depth;\n"
 "}\n"
 "\n"
 "float shadow_sample( vec3 vdir )\n"
@@ -276,7 +275,7 @@ static struct vg_shader _shader_scene_standard_alphatest = {
 "   light_delta = normalize( light_delta );\n"
 "\n"
 "   float quadratic = dist2*100.0;\n"
-"   float attenuation  = 1.0f/( 1.0f + quadratic );\n"
+"   float attenuation  = 1.0/( 1.0 + quadratic );\n"
 "         attenuation *= max( dot( light_delta, normal ), 0.0 );\n"
 "\n"
 "   float falloff = max( 0.0, 1.0-(dist2*light_co.w) );\n"
@@ -392,7 +391,8 @@ static struct vg_shader _shader_scene_standard_alphatest = {
 "float compute_board_shadow()\n"
 "{\n"
 "   // player shadow\n"
-"   float dist_to_player = max( 0.0, sdLine( aWorldCo, uBoard0, uBoard1 )-0.1 );\n"
+"   float dist_to_player = max( 0.0, sdLine( aWorldCo, g_board_0.xyz,\n"
+"                                                      g_board_1.xyz )-0.1 );\n"
 "   float player_shadow = max( 1.0-dist_to_player*2.7, 0.0 );\n"
 "   player_shadow *= player_shadow*player_shadow*player_shadow;\n"
 "\n"
@@ -404,7 +404,7 @@ static struct vg_shader _shader_scene_standard_alphatest = {
 "   return world_compute_lighting( diffuse, normal, co, compute_board_shadow() );\n"
 "}\n"
 "\n"
-"#line      9        0 \n"
+"#line      7        0 \n"
 "#line       1        2 \n"
 "const float k_motion_lerp_amount = 0.01;\n"
 "\n"
@@ -424,7 +424,7 @@ static struct vg_shader _shader_scene_standard_alphatest = {
 "   oMotionVec = (vmotion1-vmotion0) * (1.0/k_motion_lerp_amount);\n"
 "}\n"
 "\n"
-"#line     10        0 \n"
+"#line      8        0 \n"
 "\n"
 "void main()\n"
 "{\n"
@@ -455,8 +455,6 @@ static GLuint _uniform_scene_standard_alphatest_uPv;
 static GLuint _uniform_scene_standard_alphatest_uPvmPrev;
 static GLuint _uniform_scene_standard_alphatest_uTexGarbage;
 static GLuint _uniform_scene_standard_alphatest_uTexMain;
-static GLuint _uniform_scene_standard_alphatest_uBoard0;
-static GLuint _uniform_scene_standard_alphatest_uBoard1;
 static GLuint _uniform_scene_standard_alphatest_uCamera;
 static GLuint _uniform_scene_standard_alphatest_uPlane;
 static GLuint _uniform_scene_standard_alphatest_g_world_depth;
@@ -477,12 +475,6 @@ static void shader_scene_standard_alphatest_uTexGarbage(int i){
 static void shader_scene_standard_alphatest_uTexMain(int i){
    glUniform1i(_uniform_scene_standard_alphatest_uTexMain,i);
 }
-static void shader_scene_standard_alphatest_uBoard0(v3f v){
-   glUniform3fv(_uniform_scene_standard_alphatest_uBoard0,1,v);
-}
-static void shader_scene_standard_alphatest_uBoard1(v3f v){
-   glUniform3fv(_uniform_scene_standard_alphatest_uBoard1,1,v);
-}
 static void shader_scene_standard_alphatest_uCamera(v3f v){
    glUniform3fv(_uniform_scene_standard_alphatest_uCamera,1,v);
 }
@@ -502,8 +494,6 @@ static void shader_scene_standard_alphatest_link(void){
    _uniform_scene_standard_alphatest_uPvmPrev = glGetUniformLocation( _shader_scene_standard_alphatest.id, "uPvmPrev" );
    _uniform_scene_standard_alphatest_uTexGarbage = glGetUniformLocation( _shader_scene_standard_alphatest.id, "uTexGarbage" );
    _uniform_scene_standard_alphatest_uTexMain = glGetUniformLocation( _shader_scene_standard_alphatest.id, "uTexMain" );
-   _uniform_scene_standard_alphatest_uBoard0 = glGetUniformLocation( _shader_scene_standard_alphatest.id, "uBoard0" );
-   _uniform_scene_standard_alphatest_uBoard1 = glGetUniformLocation( _shader_scene_standard_alphatest.id, "uBoard1" );
    _uniform_scene_standard_alphatest_uCamera = glGetUniformLocation( _shader_scene_standard_alphatest.id, "uCamera" );
    _uniform_scene_standard_alphatest_uPlane = glGetUniformLocation( _shader_scene_standard_alphatest.id, "uPlane" );
    _uniform_scene_standard_alphatest_g_world_depth = glGetUniformLocation( _shader_scene_standard_alphatest.id, "g_world_depth" );