projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
run to skate animation
[carveJwlIkooP6JGAAIwe30JlM.git]
/
shaders
/
water.fs
diff --git
a/shaders/water.fs
b/shaders/water.fs
index 938c6d1e04d04493226bdaa895d8bdf8a3990322..68fc66da863796327914985805df75c1ea1eac89 100644
(file)
--- a/
shaders/water.fs
+++ b/
shaders/water.fs
@@
-1,5
+1,3
@@
-out vec4 FragColor;
-
uniform sampler2D uTexMain;
uniform sampler2D uTexDudv;
uniform sampler2D uTexBack;
uniform sampler2D uTexMain;
uniform sampler2D uTexDudv;
uniform sampler2D uTexBack;
@@
-8,6
+6,8
@@
uniform vec2 uInvRes;
uniform float uTime;
uniform vec3 uCamera;
uniform float uSurfaceY;
uniform float uTime;
uniform vec3 uCamera;
uniform float uSurfaceY;
+uniform vec3 uBoard0;
+uniform vec3 uBoard1;
uniform vec3 uShoreColour;
uniform vec3 uOceanColour;
uniform vec3 uShoreColour;
uniform vec3 uOceanColour;
@@
-19,6
+19,7
@@
in vec3 aCo;
in vec3 aWorldCo;
#include "common_world.glsl"
in vec3 aWorldCo;
#include "common_world.glsl"
+#include "motion_vectors_fs.glsl"
vec4 water_surf( vec3 halfview, vec3 vnorm, float depthvalue,
vec4 beneath, vec4 above )
vec4 water_surf( vec3 halfview, vec3 vnorm, float depthvalue,
vec4 beneath, vec4 above )
@@
-43,6
+44,8
@@
vec4 water_surf( vec3 halfview, vec3 vnorm, float depthvalue,
void main()
{
void main()
{
+ compute_motion_vectors();
+
// Create texture coords
vec2 ssuv = gl_FragCoord.xy*uInvRes;
// Create texture coords
vec2 ssuv = gl_FragCoord.xy*uInvRes;
@@
-74,5
+77,5
@@
void main()
// Composite
vec4 vsurface = water_surf( halfview, surfnorm, depthvalue, beneath, above );
vsurface.a -= fdist;
// Composite
vec4 vsurface = water_surf( halfview, surfnorm, depthvalue, beneath, above );
vsurface.a -= fdist;
-
FragColo
r = mix( vsurface, vec4(1.0,1.0,1.0,0.5), fband );
+
oColou
r = mix( vsurface, vec4(1.0,1.0,1.0,0.5), fband );
}
}