X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=shaders%2Fstandard.fs;h=321d7ada7833b84785d423a392c08e37886934ed;hb=23ef4d7f6bfe6a5a91c78822b081a9ea63cb74a6;hp=d3a6842926edc966466f1dfe774c11f7aff297c9;hpb=23a1be081ab9e378cba49a23b8ed4d4082b580c1;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/shaders/standard.fs b/shaders/standard.fs index d3a6842..321d7ad 100644 --- a/shaders/standard.fs +++ b/shaders/standard.fs @@ -1,9 +1,9 @@ -out vec4 FragColor; - uniform sampler2D uTexGarbage; uniform sampler2D uTexMain; uniform vec3 uCamera; uniform vec4 uPlane; +uniform vec3 uBoard0; +uniform vec3 uBoard1; in vec4 aColour; in vec2 aUv; @@ -12,9 +12,12 @@ in vec3 aCo; in vec3 aWorldCo; #include "common_world.glsl" +#include "motion_vectors_fs.glsl" void main() { + compute_motion_vectors(); + vec3 vfrag = vec3(0.5,0.5,0.5); vec4 vsamplemain = texture( uTexMain, aUv ); vec3 qnorm = normalize(aNorm); @@ -36,5 +39,5 @@ void main() vfrag = do_light_shadowing( vfrag ); vfrag = apply_fog( vfrag, fdist ); - FragColor = vec4(vfrag, 1.0); + oColour = vec4(vfrag, 1.0); }