X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=shaders%2Fterrain.fs;h=3f5cd3abdf28a3a43a80a9a5ead999fd35764e1b;hb=23ef4d7f6bfe6a5a91c78822b081a9ea63cb74a6;hp=f093904b0f46ce5538bf9e78479cb992a877b5a4;hpb=1f0e3292c021e8263716e5f4544a1efcedf3f03d;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/shaders/terrain.fs b/shaders/terrain.fs index f093904..3f5cd3a 100644 --- a/shaders/terrain.fs +++ b/shaders/terrain.fs @@ -1,10 +1,10 @@ -out vec4 FragColor; - uniform sampler2D uTexGarbage; uniform sampler2D uTexGradients; uniform vec3 uCamera; uniform vec3 uSandColour; uniform vec2 uBlendOffset; +uniform vec3 uBoard0; +uniform vec3 uBoard1; in vec4 aColour; in vec2 aUv; @@ -13,9 +13,14 @@ in vec3 aCo; in vec3 aWorldCo; #include "common_world.glsl" +#include "motion_vectors_fs.glsl" void main() { + compute_motion_vectors(); + + // Colour + // ------ vec3 vfrag = vec3(0.5,0.5,0.5); // ws modulation @@ -55,5 +60,5 @@ void main() vfrag = do_light_shadowing( vfrag ); vfrag = apply_fog( vfrag, fdist ); - FragColor = vec4(vfrag, 1.0 ); + oColour = vec4(vfrag, 1.0 ); }