diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-04-08 00:59:52 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-04-08 00:59:52 +0100 |
| commit | 34ea78ea50b015d660fbd9169f61506363959214 (patch) | |
| tree | 1cb1de6865c0c35e2c35fcd6e2b5610b0eedd8ab /gfx/gl/shaders/water.vs | |
| parent | Merge remote-tracking branch 'origin/deform-terrain' (diff) | |
| parent | Fix water texture wrapper in light of large position values (diff) | |
| download | ilt-34ea78ea50b015d660fbd9169f61506363959214.tar.bz2 ilt-34ea78ea50b015d660fbd9169f61506363959214.tar.xz ilt-34ea78ea50b015d660fbd9169f61506363959214.zip | |
Merge branch 'separate-water'
Diffstat (limited to 'gfx/gl/shaders/water.vs')
| -rw-r--r-- | gfx/gl/shaders/water.vs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gfx/gl/shaders/water.vs b/gfx/gl/shaders/water.vs index f6c7c8f..58bf7b6 100644 --- a/gfx/gl/shaders/water.vs +++ b/gfx/gl/shaders/water.vs @@ -1,7 +1,8 @@ #version 330 core -include(`meshIn.glsl') -include(`materialInterface.glsl') +layout(location = 0) in ivec3 position; +out vec3 FragPos; +out vec2 TexCoords; uniform mat4 viewProjection; uniform ivec3 viewPoint; @@ -10,12 +11,11 @@ uniform float waves; void main() { - vec3 wpos = vec3(position.x + (cos(waves) * 1000.0), position.y + (cos(waves * 0 / 2) * 1000.0), - cos(waves + (position.x / 1000000.0) + (position.y / 8000.0)) * 300.0); + vec3 wpos = vec3(position.x + (cos(waves) * 1000.0), position.y + (cos(waves * 1.4) * 1000.0), + cos(waves + (position.x / 1000000) + (position.y / 8000)) * 300.0); FragPos = vec3(wpos.xy, position.z); - TexCoords = texCoord; - Normal = normal; + TexCoords = (position.xy / 8192) - (viewPoint.xy / 8192); gl_Position = viewProjection * vec4(wpos - viewPoint, 1.0); } |