X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=shaders%2Fvblend.h;h=61b0ccec1b77eef911b69f4e3d443b10509ba94c;hb=15beb60ade240af4e00b0d204f7e89a4d35dca36;hp=26d7a51bf3946537c93bc7f7a01a2bb8578d6644;hpb=ecc4dfbfb3adf91d2dfc03ba0ec9a821fcc2390c;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/shaders/vblend.h b/shaders/vblend.h
index 26d7a51..61b0cce 100644
--- a/shaders/vblend.h
+++ b/shaders/vblend.h
@@ -7,71 +7,159 @@ static struct vg_shader _shader_vblend = {
    .link = shader_vblend_link,
    .vs = 
 {
-.orig_file = "../shaders/terrain.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"
 "out vec3 aNorm;\n"
 "out vec3 aCo;\n"
+"out vec3 aWorldCo;\n"
 "\n"
 "void main()\n"
 "{\n"
-"   gl_Position = uPv * vec4( uMdl * vec4(a_co,1.0), 1.0 );\n"
+"   vec3 world_pos = uMdl * vec4(a_co,1.0);\n"
+"   gl_Position = uPv * vec4( world_pos, 1.0 );\n"
 "   aColour = a_colour;\n"
 "   aUv = a_uv;\n"
 "   aNorm = mat3(uMdl) * a_norm;\n"
 "   aCo = a_co;\n"
+"   aWorldCo = world_pos;\n"
 "}\n"
 ""},
    .fs = 
 {
-.orig_file = "../shaders/vblend.fs",
+.orig_file = "../../shaders/vblend.fs",
 .static_src = 
 "out vec4 FragColor;\n"
 "\n"
 "uniform sampler2D uTexGarbage;\n"
 "uniform sampler2D uTexGradients;\n"
-"uniform sampler2D uTexDepth;\n"
-"uniform vec4 uDepthBounds;\n"
 "uniform vec3 uCamera;\n"
-"uniform vec4 uPlane;\n"
 "\n"
 "in vec4 aColour;\n"
 "in vec2 aUv;\n"
 "in vec3 aNorm;\n"
 "in vec3 aCo;\n"
+"in vec3 aWorldCo;\n"
+"\n"
+"#line       1        1 \n"
+"layout (std140) uniform ub_world_lighting\n"
+"{\n"
+"   vec4 g_light_colours[3];\n"
+"   vec4 g_light_directions[3];\n"
+"   vec4 g_ambient_colour;\n"
+"\n"
+"   vec4 g_water_plane;\n"
+"   vec4 g_depth_bounds;\n"
+"   float g_water_fog;\n"
+"   int g_light_count;\n"
+"   int g_light_preview;\n"
+"};\n"
+"\n"
+"uniform sampler2D g_world_depth;\n"
+"\n"
+"// Standard diffuse + spec models\n"
+"// ==============================\n"
+"\n"
+"vec3 do_light_diffuse( vec3 vfrag, vec3 wnormal )\n"
+"{\n"
+"   vec3 vtotal = g_ambient_colour.rgb;\n"
+"\n"
+"   for( int i=0; i<g_light_count; i++ )\n"
+"   {\n"
+"      vec3 vcolour = g_light_colours[i].rgb;\n"
+"      vec3 vdir = g_light_directions[i].xyz;\n"
+"\n"
+"      float flight = max(dot( vdir, wnormal )*0.75+0.25,0.0);\n"
+"      vtotal += vcolour*flight;\n"
+"   }\n"
 "\n"
-"float water_depth( vec3 pos, vec3 dir, vec4 plane )\n"
+"   return vfrag * vtotal;\n"
+"}\n"
+"\n"
+"vec3 do_light_spec( vec3 vfrag, vec3 wnormal, vec3 halfview, float fintensity )\n"
+"{\n"
+"   vec3 vcolour = g_light_colours[0].rgb;\n"
+"   vec3 vdir = g_light_directions[0].xyz;\n"
+"\n"
+"   vec3 specdir = reflect( -vdir, wnormal );\n"
+"   float spec = pow(max(dot( halfview, specdir ), 0.0), 10.0);\n"
+"   return vfrag + vcolour*spec*fintensity;\n"
+"}\n"
+"\n"
+"float world_depth_sample( vec3 pos )\n"
 "{\n"
-"   float d = dot( plane.xyz, dir );\n"
-"   float t = dot((plane.xyz*plane.w - pos),plane.xyz) / d;\n"
-"   return t*0.04;\n"
+"   vec2 depth_coord = (pos.xz - g_depth_bounds.xy) * g_depth_bounds.zw; \n"
+"   return texture( g_world_depth, depth_coord ).r;\n"
 "}\n"
 "\n"
-"float sample_height( vec3 pos )\n"
+"float shadow_sample( vec3 vdir )\n"
 "{\n"
-"   vec2 depth_coords = (pos.xz-uDepthBounds.xy)*uDepthBounds.zw;\n"
-"   return texture( uTexDepth, depth_coords ).r;\n"
+"   vec3 sample_pos = aWorldCo + vdir;\n"
+"   float height_sample = world_depth_sample( sample_pos );\n"
+"\n"
+"   float fdelta = height_sample - sample_pos.y;\n"
+"   return clamp( fdelta, 0.1, 0.2 )-0.1;\n"
+"}\n"
+"\n"
+"vec3 do_light_shadowing_old( vec3 vfrag )\n"
+"{\n"
+"   float faccum = 0.0;\n"
+"   faccum += shadow_sample( vec3( 0.0, 0.5, 0.0 ));\n"
+"   faccum += shadow_sample( vec3( 2.0, 0.3, 0.0 ));\n"
+"   faccum += shadow_sample( vec3( 3.0, 1.0, 0.0 ));\n"
+"   faccum += shadow_sample( vec3( 5.0, 1.0, 0.0 ));\n"
+"   faccum += shadow_sample( vec3( 0.0, 0.5, 0.0 )*1.5);\n"
+"   faccum += shadow_sample( vec3( 2.0, 0.3, 0.0 )*1.5);\n"
+"   faccum += shadow_sample( vec3( 3.0, 1.0, 0.0 )*1.5);\n"
+"   faccum += shadow_sample( vec3( 5.0, 1.0, 0.0 )*1.5);\n"
+"   return mix( vfrag, g_ambient_colour.rgb, faccum );\n"
 "}\n"
 "\n"
-"float create_shadowing( vec3 vdir )\n"
+"vec3 do_light_shadowing( vec3 vfrag )\n"
 "{\n"
-"   return clamp( sample_height( aCo+vdir ) - (aCo.y+vdir.y), 0.1, 0.2 )-0.1;\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"
+"\n"
+"   float famt = 0.0;\n"
+"   famt+=shadow_sample((vdir+vec3(-0.563, 0.550, 0.307)*fspread)*flength*0.1);\n"
+"   famt+=shadow_sample((vdir+vec3( 0.808, 0.686, 0.346)*fspread)*flength*0.2);\n"
+"   famt+=shadow_sample((vdir+vec3( 0.787, 0.074,-0.065)*fspread)*flength*0.3);\n"
+"   famt+=shadow_sample((vdir+vec3(-0.593, 0.071,-0.425)*fspread)*flength*0.4);\n"
+"   famt+=shadow_sample((vdir+vec3(-0.790,-0.933,-0.875)*fspread)*flength*0.5);\n"
+"   famt+=shadow_sample((vdir+vec3( 0.807,-0.690, 0.472)*fspread)*flength*0.6);\n"
+"   famt+=shadow_sample((vdir+vec3( 0.522,-0.379, 0.350)*fspread)*flength*0.7);\n"
+"   famt+=shadow_sample((vdir+vec3( 0.483, 0.201, 0.306)*fspread)*flength*0.8);\n"
+"   return mix( vfrag, g_ambient_colour.rgb, famt );\n"
 "}\n"
 "\n"
+"vec3 apply_fog( vec3 vfrag, float fdist )\n"
+"{\n"
+"   float dist = pow(fdist*0.0008,1.2);\n"
+"   return mix( vfrag, vec3(0.55,0.76,1.0), min( 1.0, dist ) );\n"
+"}\n"
+"\n"
+"#line     14        0 \n"
+"\n"
 "void main()\n"
 "{\n"
-"   vec4 wgarbage = texture( uTexGarbage, aCo.xz * 0.160 );\n"
+"   vec3 vfrag = vec3(0.5,0.5,0.5);\n"
+"\n"
+"   // ws modulation\n"
+"   vec4 wgarbage = vec4(0.5,0.5,0.5,1.0);//texture( uTexGarbage, aCo.xz * 0.160 );\n"
 "   \n"
 "   // Creating normal patches\n"
 "   vec3 modnorm = (wgarbage.rgb-0.4) * 1.4;\n"
@@ -88,82 +176,63 @@ static struct vg_shader _shader_vblend = {
 "   float fblendclip = step(0.380,aColour.r + (rgarbage.r-0.5)*-1.740)*0.320;\n"
 "   vec2 uvgradients = aUv + vec2( fblendclip, 0.0 );\n"
 "\n"
-"   vec3 diffuse = texture( uTexGradients, uvgradients ).rgb;\n"
-"   diffuse -= rgarbage.a*0.04;\n"
+"   vfrag = texture( uTexGradients, uvgradients ).rgb;\n"
+"   vfrag -= rgarbage.a*0.04;\n"
+"\n"
+"   if( g_light_preview == 1 )\n"
+"   {\n"
+"      vfrag = vec3(0.5);\n"
+"   }\n"
 "\n"
 "   // Lighting\n"
-"   vec3 lightdir = normalize(vec3(0.5,0.5,-0.1));\n"
-"   vec3 shadow = vec3(0.27,0.25,0.34);\n"
-"   float light1 = dot( lightdir, aNorm )*0.5+0.5;\n"
-"   diffuse = diffuse * (light1*vec3(1.0,0.96,0.9)*1.2 + shadow*(1.0-light1));\n"
-"   \n"
-"   // Specular lighting\n"
-"   vec3 halfview = normalize( uCamera - aCo );\n"
-"   vec3 specdir = reflect( -lightdir, qnorm );\n"
-"   float spec = pow(max(dot(halfview,specdir),0.0),10.0) * 0.3*rgarbage.r;\n"
-"   //diffuse += spec * vec3(1.0,0.8,0.8);\n"
+"   vec3 halfview = uCamera - aWorldCo;\n"
+"   float fdist = length( halfview );\n"
+"   halfview /= fdist;\n"
 "\n"
-"   float faccum = 0.0;\n"
-"   vec3 offs = vec3(rgarbage.x, 0.0, rgarbage.z)*4.0;\n"
-"   faccum += create_shadowing( vec3( 0.0, 0.5, 0.0 )*0.6);\n"
-"   faccum += create_shadowing( vec3( 2.0, 0.3, 0.0 )*0.6);\n"
-"   faccum += create_shadowing( vec3( 3.0, 1.0, 0.0 )*0.6);\n"
-"   faccum += create_shadowing( vec3( 5.0, 1.0, 0.0 )*0.6);\n"
-"   faccum += create_shadowing( vec3( 0.0, 0.5, 0.0 )*0.6*1.5+offs);\n"
-"   faccum += create_shadowing( vec3( 2.0, 0.3, 0.0 )*0.6*1.5);\n"
-"   faccum += create_shadowing( vec3( 3.0, 1.0, 0.0 )*0.6*1.5-offs);\n"
-"   faccum += create_shadowing( vec3( 5.0, 1.0, 0.0 )*0.6*1.5);\n"
-"   diffuse = mix( diffuse, vec3(0.15,0.1,0.2), min(faccum*1.0,1.0));\n"
-"\n"
-"   FragColor = vec4(diffuse, water_depth(aCo,halfview,uPlane));\n"
+"   vfrag = do_light_diffuse( vfrag, qnorm );\n"
+"   vfrag = do_light_spec( vfrag, qnorm, halfview, 0.1 );\n"
+"   vfrag = do_light_shadowing( vfrag );\n"
+"   vfrag = apply_fog( vfrag, fdist );\n"
+"\n"
+"   FragColor = vec4(vfrag, 1.0 );\n"
 "}\n"
 ""},
 };
 
-static GLuint _uniform_vblend_uPv;
 static GLuint _uniform_vblend_uMdl;
+static GLuint _uniform_vblend_uPv;
 static GLuint _uniform_vblend_uTexGarbage;
 static GLuint _uniform_vblend_uTexGradients;
-static GLuint _uniform_vblend_uTexDepth;
-static GLuint _uniform_vblend_uDepthBounds;
 static GLuint _uniform_vblend_uCamera;
-static GLuint _uniform_vblend_uPlane;
-static void shader_vblend_uPv(m4x4f m){
-   glUniformMatrix4fv( _uniform_vblend_uPv, 1, GL_FALSE, (float *)m );
-}
+static GLuint _uniform_vblend_g_world_depth;
 static void shader_vblend_uMdl(m4x3f m){
    glUniformMatrix4x3fv( _uniform_vblend_uMdl, 1, GL_FALSE, (float *)m );
 }
+static void shader_vblend_uPv(m4x4f m){
+   glUniformMatrix4fv( _uniform_vblend_uPv, 1, GL_FALSE, (float *)m );
+}
 static void shader_vblend_uTexGarbage(int i){
    glUniform1i( _uniform_vblend_uTexGarbage, i );
 }
 static void shader_vblend_uTexGradients(int i){
    glUniform1i( _uniform_vblend_uTexGradients, i );
 }
-static void shader_vblend_uTexDepth(int i){
-   glUniform1i( _uniform_vblend_uTexDepth, i );
-}
-static void shader_vblend_uDepthBounds(v4f v){
-   glUniform4fv( _uniform_vblend_uDepthBounds, 1, v );
-}
 static void shader_vblend_uCamera(v3f v){
    glUniform3fv( _uniform_vblend_uCamera, 1, v );
 }
-static void shader_vblend_uPlane(v4f v){
-   glUniform4fv( _uniform_vblend_uPlane, 1, v );
+static void shader_vblend_g_world_depth(int i){
+   glUniform1i( _uniform_vblend_g_world_depth, i );
 }
 static void shader_vblend_register(void){
    vg_shader_register( &_shader_vblend );
 }
 static void shader_vblend_use(void){ glUseProgram(_shader_vblend.id); }
 static void shader_vblend_link(void){
-   _uniform_vblend_uPv = glGetUniformLocation( _shader_vblend.id, "uPv" );
    _uniform_vblend_uMdl = glGetUniformLocation( _shader_vblend.id, "uMdl" );
+   _uniform_vblend_uPv = glGetUniformLocation( _shader_vblend.id, "uPv" );
    _uniform_vblend_uTexGarbage = glGetUniformLocation( _shader_vblend.id, "uTexGarbage" );
    _uniform_vblend_uTexGradients = glGetUniformLocation( _shader_vblend.id, "uTexGradients" );
-   _uniform_vblend_uTexDepth = glGetUniformLocation( _shader_vblend.id, "uTexDepth" );
-   _uniform_vblend_uDepthBounds = glGetUniformLocation( _shader_vblend.id, "uDepthBounds" );
    _uniform_vblend_uCamera = glGetUniformLocation( _shader_vblend.id, "uCamera" );
-   _uniform_vblend_uPlane = glGetUniformLocation( _shader_vblend.id, "uPlane" );
+   _uniform_vblend_g_world_depth = glGetUniformLocation( _shader_vblend.id, "g_world_depth" );
 }
 #endif /* SHADER_vblend_H */