X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=shaders%2Fterrain.h;h=1c87e35d351d3ef02a3450aa76f131cfb1c819a1;hb=344f0153cf1907da87dd041db3ec517325b1c429;hp=436ca1fc06559333cc88d454a6fe48c9838e21bc;hpb=168eb5c363f510d60703498e01ffcdb52bf9fd07;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/shaders/terrain.h b/shaders/terrain.h index 436ca1f..1c87e35 100644 --- a/shaders/terrain.h +++ b/shaders/terrain.h @@ -23,14 +23,17 @@ static struct vg_shader _shader_terrain = { "out vec2 aUv;\n" "out vec3 aNorm;\n" "out vec3 aCo;\n" +"out vec3 aWorldCo;\n" "\n" "void main()\n" "{\n" -" gl_Position = uPv * vec4( uMdl * vec4(a_co,1.0), 1.0 );\n" +" vec3 world_pos = uMdl * vec4(a_co,1.0);\n" +" gl_Position = uPv * vec4( world_pos, 1.0 );\n" " aColour = a_colour;\n" " aUv = a_uv;\n" " aNorm = mat3(uMdl) * a_norm;\n" " aCo = a_co;\n" +" aWorldCo = world_pos;\n" "}\n" ""}, .fs = @@ -47,6 +50,7 @@ static struct vg_shader _shader_terrain = { "in vec2 aUv;\n" "in vec3 aNorm;\n" "in vec3 aCo;\n" +"in vec3 aWorldCo;\n" "\n" "#line 1 1 \n" "layout (std140) uniform ub_world_lighting\n" @@ -101,7 +105,7 @@ static struct vg_shader _shader_terrain = { "\n" "float shadow_sample( vec3 vdir )\n" "{\n" -" vec3 sample_pos = aCo + vdir;\n" +" vec3 sample_pos = aWorldCo + vdir;\n" " float height_sample = world_depth_sample( sample_pos );\n" "\n" " float fdelta = height_sample - sample_pos.y;\n" @@ -146,7 +150,7 @@ static struct vg_shader _shader_terrain = { " return mix( vfrag, vec3(0.55,0.76,1.0), min( 1.0, dist ) );\n" "}\n" "\n" -"#line 13 0 \n" +"#line 14 0 \n" "\n" "void main()\n" "{\n"