projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5de80f8
)
fix terrain shader invalid colours
author
hgn
<hgodden00@gmail.com>
Fri, 29 Mar 2024 22:28:10 +0000
(22:28 +0000)
committer
hgn
<hgodden00@gmail.com>
Fri, 29 Mar 2024 22:28:10 +0000
(22:28 +0000)
shaders/scene_terrain.fs
patch
|
blob
|
history
diff --git
a/shaders/scene_terrain.fs
b/shaders/scene_terrain.fs
index 6be11459126be8a36d848d2599d483142801726a..b60c8d219dfacdac450814f4b97ffe5a314349ac 100644
(file)
--- a/
shaders/scene_terrain.fs
+++ b/
shaders/scene_terrain.fs
@@
-33,11
+33,10
@@
void main()
// Colour blending
float amtgrass = step(qnorm.y,0.6);
// Colour blending
float amtgrass = step(qnorm.y,0.6);
- float amtsand =
min(max((aCo.y - 10.0) * -0.1,0.0)*qnorm.y,1.0
);
+ 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 );
vec2 uvgradients = aUv + vec2( amtgrass + rgarbage.a*0.8 )*uBlendOffset;
vfrag = texture( uTexGradients, uvgradients ).rgb;
vfrag = mix( vfrag, uSandColour, amtsand );
-
qnorm = mix( qnorm, aNorm.xyz, amtsand );
if( g_light_preview == 1 )
qnorm = mix( qnorm, aNorm.xyz, amtsand );
if( g_light_preview == 1 )