projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
large reduction, redoing things
[carveJwlIkooP6JGAAIwe30JlM.git]
/
shaders
/
scene_route.fs
diff --git
a/shaders/scene_route.fs
b/shaders/scene_route.fs
index 5bb973d380e81b753493e1d4a9682ad9e70a58a0..3ce337b73d721e6dbc77641caf393b8c23c12229 100644
(file)
--- a/
shaders/scene_route.fs
+++ b/
shaders/scene_route.fs
@@
-5,12
+5,6
@@
uniform vec4 uColour;
uniform vec3 uBoard0;
uniform vec3 uBoard1;
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"
#include "common_scene.glsl"
#include "motion_vectors_fs.glsl"
@@
-47,7
+41,6
@@
void main()
}
// Lighting
}
// Lighting
-
- vfrag = scene_do_lighting( vfrag, qnorm );
+ vfrag = scene_compute_lighting( vfrag, qnorm, aWorldCo );
oColour = vec4(vfrag, 1.0);
}
oColour = vec4(vfrag, 1.0);
}