projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
initial gui for remote players lobby
[carveJwlIkooP6JGAAIwe30JlM.git]
/
shaders
/
scene_vertex_blend.fs
diff --git
a/shaders/scene_vertex_blend.fs
b/shaders/scene_vertex_blend.fs
index 7efd6800dc6084b2218f2fdf3598c99fdff89871..0368b20a5fab902e288202c9ac8653d8ce12feab 100644
(file)
--- a/
shaders/scene_vertex_blend.fs
+++ b/
shaders/scene_vertex_blend.fs
@@
-1,8
+1,6
@@
uniform sampler2D uTexGarbage;
uniform sampler2D uTexGradients;
uniform vec3 uCamera;
uniform sampler2D uTexGarbage;
uniform sampler2D uTexGradients;
uniform vec3 uCamera;
-uniform vec3 uBoard0;
-uniform vec3 uBoard1;
#include "common_scene.glsl"
#include "motion_vectors_fs.glsl"
#include "common_scene.glsl"
#include "motion_vectors_fs.glsl"
@@
-40,6
+38,6
@@
void main()
vfrag = vec3(0.5);
}
vfrag = vec3(0.5);
}
- vfrag = scene_
do_lighting( vfrag, qnorm
);
+ vfrag = scene_
compute_lighting( vfrag, qnorm, aWorldCo
);
oColour = vec4(vfrag, 1.0);
}
oColour = vec4(vfrag, 1.0);
}