X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=shaders%2Fscene_vertex_blend.fs;h=12a00140e2af1d4e4808ff1057b3835f0bc12b70;hb=be5e25dee2c54c2a22ca3bbb5bbe0eb6149343be;hp=86466d0b5e410a280e919fe49b9aaaacc29936a4;hpb=aa4c26eae2208872824e0eb5b71bc05c16d43242;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/shaders/scene_vertex_blend.fs b/shaders/scene_vertex_blend.fs index 86466d0..12a0014 100644 --- a/shaders/scene_vertex_blend.fs +++ b/shaders/scene_vertex_blend.fs @@ -1,15 +1,8 @@ uniform sampler2D uTexGarbage; uniform sampler2D uTexGradients; uniform vec3 uCamera; -uniform vec3 uBoard0; -uniform vec3 uBoard1; - -in vec2 aUv; -in vec4 aNorm; -in vec3 aCo; -in vec3 aWorldCo; -flat in ivec4 aLights; +#include "light_clearskies_stddef.glsl" #include "common_scene.glsl" #include "motion_vectors_fs.glsl" @@ -46,6 +39,6 @@ void main() vfrag = vec3(0.5); } - vfrag = scene_do_lighting( vfrag, qnorm ); + vfrag = scene_compute_lighting( vfrag, qnorm, aWorldCo ); oColour = vec4(vfrag, 1.0); }