X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=sidebyside;f=shaders%2Fscene_terrain.fs;h=6be11459126be8a36d848d2599d483142801726a;hb=4eccfd7252f8ff165670842df537441afae5458b;hp=7f7648a045a5c8a90eb1a97207917039de294cce;hpb=aa4c26eae2208872824e0eb5b71bc05c16d43242;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/shaders/scene_terrain.fs b/shaders/scene_terrain.fs index 7f7648a..6be1145 100644 --- a/shaders/scene_terrain.fs +++ b/shaders/scene_terrain.fs @@ -3,15 +3,8 @@ uniform sampler2D uTexGradients; uniform vec3 uCamera; uniform vec3 uSandColour; uniform vec2 uBlendOffset; -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" @@ -52,6 +45,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); }