From f4c828c4de3264afe64b64ab465ea68e4daba234 Mon Sep 17 00:00:00 2001 From: Thorsten Renk <thorsten.i.renk@jyu.fi> Date: Fri, 14 Dec 2012 15:27:26 +0200 Subject: [PATCH] Yet more bugfixes --- Shaders/runway-lightfield.frag | 2 +- Shaders/terrain-haze-detailed.frag | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Shaders/runway-lightfield.frag b/Shaders/runway-lightfield.frag index 14e444ee0..99337eb33 100644 --- a/Shaders/runway-lightfield.frag +++ b/Shaders/runway-lightfield.frag @@ -363,7 +363,7 @@ if ((dist < 5000.0)&& (quality_level > 3) && (wetness>0.0)) } if (quality_level > 4) { - NdotL = NdotL + 3.0 * N + 0.1 * (noise_01m-0.5) ; + NdotL = NdotL + 3.0 * N.r + 0.1 * (noise_01m-0.5) ; } if (NdotL > 0.0) { color += diffuse_term * NdotL; diff --git a/Shaders/terrain-haze-detailed.frag b/Shaders/terrain-haze-detailed.frag index 52fad01fb..94b052a2f 100644 --- a/Shaders/terrain-haze-detailed.frag +++ b/Shaders/terrain-haze-detailed.frag @@ -227,7 +227,7 @@ float noise_2000m = Noise2D(rawPos.xy, 2000.0); sfactor = sqrt(2.0 * (1.0-steepness)/0.03) + abs(ct)/0.15; noise_term = noise_term + 0.2 * (noise_50m -0.5) * (1.0 - smoothstep(18000.0*sfactor, 40000.0*sfactor, dist) ) ; noise_term = noise_term + 0.3 * (noise_10m -0.5) * (1.0 - smoothstep(4000.0 * sfactor, 8000.0 * sfactor, dist) ) ; - if (dist < 3000*sfactor){ noise_term = noise_term + 0.3 * (noise_5m -0.5) * (1.0 - smoothstep(1000.0 * sfactor, 3000.0 *sfactor, dist) );} + if (dist < 3000.0*sfactor){ noise_term = noise_term + 0.3 * (noise_5m -0.5) * (1.0 - smoothstep(1000.0 * sfactor, 3000.0 *sfactor, dist) );} snow_texel.a = snow_texel.a * 0.2+0.8* smoothstep(0.2,0.8, 0.3 +noise_term + snow_thickness_factor +0.0001*(relPos.z +eye_alt -snowlevel) ); }