X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=shaders%2Fscene_override.h;h=b457233fd5cc433a512c9bab719516deefcecc1d;hb=70ff4a83e5a4b35436388d9bb999c939559ac23f;hp=fb5367148cb095043f21aab4eea7e53bc4d6ec9c;hpb=63fe317d7db724162561da52aa382c82ac3c29be;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/shaders/scene_override.h b/shaders/scene_override.h
index fb53671..b457233 100644
--- a/shaders/scene_override.h
+++ b/shaders/scene_override.h
@@ -71,6 +71,7 @@ static struct vg_shader _shader_scene_override = {
 "uniform vec4 uPlayerPos; /* w: distance to uSpawnPos */\n"
 "uniform vec4 uSpawnPos;  /* w: inverse distance to uPlayerPos */\n"
 "uniform bool uAlphatest;\n"
+"uniform float uIsoAmt;\n"
 "\n"
 "#line       1        1 \n"
 "// :D\n"
@@ -210,14 +211,18 @@ static struct vg_shader _shader_scene_override = {
 "   vec3 sun_colour  = mix( vec3(1.0), g_sunset_colour.rgb, g_sunset_phase*0.5 );\n"
 "        sun_colour *= sun_shape;\n"
 "\n"
-"\n"
+"   \n"
 "   float star = 0.0;\n"
-"   for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
-"      float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
-"      star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0 / pow(4.0, j));\n"
+"   float star_blend = 10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"\n"
+"   if( star_blend > 0.001 ){\n"
+"      for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
+"         float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
+"         star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0/pow(4.0, j));\n"
+"      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
@@ -435,7 +440,7 @@ static struct vg_shader _shader_scene_override = {
 "   return world_compute_lighting( diffuse, normal, co, compute_board_shadow() );\n"
 "}\n"
 "\n"
-"#line     11        0 \n"
+"#line     12        0 \n"
 "#line       1        2 \n"
 "const float k_motion_lerp_amount = 0.01;\n"
 "\n"
@@ -455,7 +460,7 @@ static struct vg_shader _shader_scene_override = {
 "   oMotionVec = (vmotion1-vmotion0) * (1.0/k_motion_lerp_amount);\n"
 "}\n"
 "\n"
-"#line     12        0 \n"
+"#line     13        0 \n"
 "\n"
 "vec2 smin( float a, float b, float k ){\n"
 "   float h = max( k-abs(a-b), 0.0 )/k;\n"
@@ -478,7 +483,7 @@ static struct vg_shader _shader_scene_override = {
 "\n"
 "   compute_motion_vectors();\n"
 "\n"
-"   vec3 vfrag = vec3(0.5);\n"
+"   vec3 vfrag = vec3(0.898,0.811,0.716);\n"
 "   vec3 qnorm = aNorm.xyz;\n"
 "\n"
 "   qnorm = normalize(floor(aNorm.xyz*4.0)*0.25);\n"
@@ -511,6 +516,12 @@ static struct vg_shader _shader_scene_override = {
 "   float d3 = distance(p0,aCo);\n"
 "   emit += vec3(fract(t*0.2-g_realtime+d3*0.2)*max(0.0,1.0-d3*0.2));\n"
 "\n"
+"   if( uIsoAmt > 0.0 ){\n"
+"      float height = fract( aCo.y * 0.1 );\n"
+"      float lg = 2.0*length(vec2(dFdx(height), dFdy(height)));\n"
+"      emit += vec3(lg*0.1*uIsoAmt);\n"
+"   }\n"
+"\n"
 "   oColour = vec4( vfrag+emit, 1.0 );\n"
 "   //oColour = vec4( vfrag, 1.0 );\n"
 "}\n"
@@ -528,6 +539,7 @@ static GLuint _uniform_scene_override_uPlane;
 static GLuint _uniform_scene_override_uPlayerPos;
 static GLuint _uniform_scene_override_uSpawnPos;
 static GLuint _uniform_scene_override_uAlphatest;
+static GLuint _uniform_scene_override_uIsoAmt;
 static GLuint _uniform_scene_override_g_world_depth;
 static GLuint _uniform_scene_override_uLightsArray;
 static GLuint _uniform_scene_override_uLightsIndex;
@@ -564,6 +576,9 @@ static void shader_scene_override_uSpawnPos(v4f v){
 static void shader_scene_override_uAlphatest(int b){
    glUniform1i(_uniform_scene_override_uAlphatest,b);
 }
+static void shader_scene_override_uIsoAmt(float f){
+   glUniform1f(_uniform_scene_override_uIsoAmt,f);
+}
 static void shader_scene_override_g_world_depth(int i){
    glUniform1i(_uniform_scene_override_g_world_depth,i);
 }
@@ -583,6 +598,7 @@ static void shader_scene_override_link(void){
    _uniform_scene_override_uPlayerPos = glGetUniformLocation( _shader_scene_override.id, "uPlayerPos" );
    _uniform_scene_override_uSpawnPos = glGetUniformLocation( _shader_scene_override.id, "uSpawnPos" );
    _uniform_scene_override_uAlphatest = glGetUniformLocation( _shader_scene_override.id, "uAlphatest" );
+   _uniform_scene_override_uIsoAmt = glGetUniformLocation( _shader_scene_override.id, "uIsoAmt" );
    _uniform_scene_override_g_world_depth = glGetUniformLocation( _shader_scene_override.id, "g_world_depth" );
    _uniform_scene_override_uLightsArray = glGetUniformLocation( _shader_scene_override.id, "uLightsArray" );
    _uniform_scene_override_uLightsIndex = glGetUniformLocation( _shader_scene_override.id, "uLightsIndex" );