X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=shaders%2Fscene_terrain.fs;h=47a98892cd15fb76e89e14ac2643bcb2fe5c3ea9;hb=078cdcbdb0cf93a994301dbb5eeca88d89df4e74;hp=b60c8d219dfacdac450814f4b97ffe5a314349ac;hpb=64f332257f336eb871231fd746a93ce02b6d4b4c;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/shaders/scene_terrain.fs b/shaders/scene_terrain.fs index b60c8d2..47a9889 100644 --- a/shaders/scene_terrain.fs +++ b/shaders/scene_terrain.fs @@ -1,7 +1,7 @@ uniform sampler2D uTexGarbage; uniform sampler2D uTexGradients; uniform vec3 uCamera; -uniform vec3 uSandColour; +uniform vec4 uSandColour; uniform vec2 uBlendOffset; #include "light_clearskies_stddef.glsl" @@ -36,7 +36,7 @@ void main() float amtsand = clamp( max((aCo.y - 10.0) * -0.1,0.0)*qnorm.y, 0.0, 1.0 ); vec2 uvgradients = aUv + vec2( amtgrass + rgarbage.a*0.8 )*uBlendOffset; vfrag = texture( uTexGradients, uvgradients ).rgb; - vfrag = mix( vfrag, uSandColour, amtsand ); + vfrag = mix( vfrag, uSandColour.rgb, amtsand*uSandColour.a ); qnorm = mix( qnorm, aNorm.xyz, amtsand ); if( g_light_preview == 1 )