X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=shaders%2Fscene_override.fs;h=ec2a89a3a49c19cdeba45eb0c8a7fcb69818f0f5;hb=4eccfd7252f8ff165670842df537441afae5458b;hp=2ab8d8daccdc5d92c54130bb4cb4d77d01a15858;hpb=70ff4a83e5a4b35436388d9bb999c939559ac23f;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/shaders/scene_override.fs b/shaders/scene_override.fs
index 2ab8d8d..ec2a89a 100644
--- a/shaders/scene_override.fs
+++ b/shaders/scene_override.fs
@@ -6,8 +6,9 @@ uniform vec4 uPlane;
 uniform vec4 uPlayerPos; /* w: distance to uSpawnPos */
 uniform vec4 uSpawnPos;  /* w: inverse distance to uPlayerPos */
 uniform bool uAlphatest;
-uniform float uIsoAmt;
+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"
 
@@ -28,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();
 
@@ -67,13 +72,12 @@ void main(){
 
    vfrag += emit;
 
-   if( uIsoAmt > 0.0 ){
+   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.4*uIsoAmt);
+      vfrag *= 1.0f+(lg*0.2*uMapInfo.z);
    }
 
-
    oColour = vec4( vfrag, 1.0 );
    //oColour = vec4( vfrag, 1.0 );
 }