X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=shaders%2Fscene_standard.fs;h=58a472da906bf048d8cd1d2def94d505d4894910;hb=1d06671f87a9d24596fc6808d8e0db889a818750;hp=0675bff71f2a85046e430cb7e1e9b3c3dcfcebb9;hpb=aa4c26eae2208872824e0eb5b71bc05c16d43242;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/shaders/scene_standard.fs b/shaders/scene_standard.fs index 0675bff..58a472d 100644 --- a/shaders/scene_standard.fs +++ b/shaders/scene_standard.fs @@ -2,14 +2,6 @@ uniform sampler2D uTexGarbage; uniform sampler2D uTexMain; uniform vec3 uCamera; uniform vec4 uPlane; -uniform vec3 uBoard0; -uniform vec3 uBoard1; - -in vec2 aUv; -in vec4 aNorm; -in vec3 aCo; -in vec3 aWorldCo; -flat in ivec4 aLights; #include "common_scene.glsl" #include "motion_vectors_fs.glsl" @@ -29,6 +21,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 ); }