projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix again
[carveJwlIkooP6JGAAIwe30JlM.git]
/
shaders
/
scene_standard.fs
diff --git
a/shaders/scene_standard.fs
b/shaders/scene_standard.fs
index 0675bff71f2a85046e430cb7e1e9b3c3dcfcebb9..58a472da906bf048d8cd1d2def94d505d4894910 100644
(file)
--- 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 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"
#include "common_scene.glsl"
#include "motion_vectors_fs.glsl"
@@
-29,6
+21,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 );
}