X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=shaders%2Fscene_override.fs;h=ec2a89a3a49c19cdeba45eb0c8a7fcb69818f0f5;hb=4eccfd7252f8ff165670842df537441afae5458b;hp=60bf90d9c962cf25ac5f2e38f48bad2e7f398f27;hpb=00653e446d6b1310fa89d3aace70800f9fef4122;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/shaders/scene_override.fs b/shaders/scene_override.fs index 60bf90d..ec2a89a 100644 --- a/shaders/scene_override.fs +++ b/shaders/scene_override.fs @@ -6,7 +6,9 @@ uniform vec4 uPlane; uniform vec4 uPlayerPos; /* w: distance to uSpawnPos */ uniform vec4 uSpawnPos; /* w: inverse distance to uPlayerPos */ uniform bool uAlphatest; +uniform vec4 uMapInfo; /* x: min, y: max, z: iso line amount */ +#include "light_clearskies_stddef.glsl" #include "common_scene.glsl" #include "motion_vectors_fs.glsl" @@ -27,7 +29,11 @@ void main(){ float dither = fract( vDither.g / 71.0 ) - 0.5; float dcam = (-8.0+distance( aCo, uCamera ))/4.0; - if( min(aCo.y*0.5 + dither, dcam + dither) < 0.51 ) discard; + float dy0 = aCo.y - uMapInfo.x; + float dy1 = uMapInfo.y - aCo.y; + + if( min(min(dy0,dy1)*0.5, dcam) + dither < 0.51 ) + discard; compute_motion_vectors(); @@ -64,6 +70,14 @@ void main(){ float d3 = distance(p0,aCo); emit += vec3(fract(t*0.2-g_realtime+d3*0.2)*max(0.0,1.0-d3*0.2)); - oColour = vec4( vfrag+emit, 1.0 ); + vfrag += emit; + + if( uMapInfo.z > 0.0 ){ + float height = fract( aCo.y * 0.1 ); + float lg = 2.0*length(vec2(dFdx(height), dFdy(height))); + vfrag *= 1.0f+(lg*0.2*uMapInfo.z); + } + + oColour = vec4( vfrag, 1.0 ); //oColour = vec4( vfrag, 1.0 ); }