fly/fgdata
1
0
Fork 0
Code Activity

WS30: Water texture for photoscenery

Browse source
This commit is contained in:
Stuart Buchanan 2022-11-20 19:51:12 +00:00
parent 79b0eb5730
commit ff8cfed80e
3 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Effects/ws30.eff
View file

@ -299,6 +299,8 @@
<internal-format><use>texture[6]/internal-format</use></internal-format>
</texture-unit>
<!-- texture unit 7 direct from VPBBuilder.cxx -->
<texture-unit>
<unit>8</unit>
<image><use>texture[8]/image</use></image>
@ -1265,6 +1267,11 @@
<name>perlin</name>
<type>sampler-2d</type>
<value type="int">6</value>
</uniform>
<uniform>
<name>coastline</name>
<type>sampler-2d</type>
<value type="int">7</value>
</uniform>
<uniform>
<name>swatch_size</name>

9
Shaders/ws30-ALS-detailed.frag
View file

@ -99,6 +99,9 @@ uniform vec4 fg_materialParams3[128];
uniform mat4 fg_zUpTransform;
uniform vec3 fg_modelOffset;
// Coastline texture - generated from VPBTechnique
uniform sampler2D coastline;
const float EarthRadius = 5800000.0;
const float terminator_width = 200000.0;
@ -316,7 +319,7 @@ float noise_2000m = Noise3D(worldPos.xyz, 2000.0);
// Mix factor of base textures for 2 neighbour landclass(es)
vec4 mfact;
bool water = false;
// Partial derivatives of s and t of ground texture coords for this fragment,
// with respect to window (screen space) x and y axes.
@ -330,12 +333,14 @@ float noise_2000m = Noise3D(worldPos.xyz, 2000.0);
if (fg_photoScenery) {
texel = texture(landclass, vec2(gl_TexCoord[0].s, 1.0 - gl_TexCoord[0].t));
water = (texture(coastline, vec2(tile_coord.s, tile_coord.t)).r > 0.1);
} else {
// Lookup the base texture texel for this fragment and any neighbors, with mixing
texel = get_mixed_texel(0, ground_tex_coord, lc, num_unique_neighbors, lc_n, mfact, dxdy_gc);
water = texture(landclass, vec2(tile_coord.s, tile_coord.t)).z > 0.9;
}
if ((water_shader == 1) && (fg_photoScenery == false) && fg_materialParams3[lc].x > 0.5) {
if ((water_shader == 1) && water) {
// This is a water fragment, so calculate the fragment color procedurally
fragColor = generateWaterTexel();
fragColor.rgb += getClusteredLightsContribution(eyePos.xyz, n, fragColor.rgb);

12
Shaders/ws30-ALS-ultra.frag
View file

@ -416,6 +416,8 @@ void main()
// Mix factor of base textures for 2 neighbour landclass(es)
vec4 mfact;
bool water = false;
// Partial derivatives of s and t of ground texture coords for this fragment,
// with respect to window (screen space) x and y axes.
@ -428,16 +430,18 @@ void main()
get_material(lc, ground_tex_coord, dxdy_gc, mat_shininess, mat_ambient, mat_diffuse, mat_specular, dxdy, st);
if (fg_photoScenery) {
// The photoscenery orthophots are stored in the landclass texture
// The photoscenery orthophotos are stored in the landclass texture
// and use normalised tile coordinates
texel = texture(landclass, vec2(tile_coord.s, 1.0 - tile_coord.t));
water = (texture(coastline, vec2(tile_coord.s, tile_coord.t)).r > 0.1);
// Do not attempt any mixing
flag = 0;
mix_flag = 0;
} else {
// Lookup the base texture texel for this fragment and any neighbors, with mixing
texel = get_mixed_texel(0, ground_tex_coord, lc, num_unique_neighbors, lc_n, mfact, dxdy_gc);
water = texture(landclass, vec2(tile_coord.s, tile_coord.t)).z > 0.9;
}
vec4 color = gl_Color * mat_ambient;
@ -459,7 +463,7 @@ void main()
fragColor = mix(generateWaterTexel(), texel, smoothstep(0.1,0.9,(coast.b + coast.a) / steepness));
//fragColor = mix(texel, generateWaterTexel(), smoothstep(waterline_min_steepness,waterline_max_steepness,steepness));
fragColor.rgb += getClusteredLightsContribution(ecPosition.xyz, n, fragColor.rgb);
} else if ((water_shader == 1) && (fg_photoScenery == false) && (fg_materialParams3[lc].x > 0.5)) {
} else if (water) {
// This is a water fragment, so calculate the fragment color procedurally
// and mix with some sand and cliff colour depending on steepness
//vec4 steep_texel = lookup_ground_texture_array(2, ground_tex_coord, lc, dxdy_gc); // Uses the same index as the gradient texture, which it is
@ -470,7 +474,7 @@ void main()
// texel = mix(steep_texel, beach_texel, smoothstep(waterline_max_steepness - 0.1, waterline_max_steepness - 0.03, steepness));
// Mix from the beach into the water, which produces a pleasing translucent shallow water effect.
//fragColor = mix(texel, generateWaterTexel(), smoothstep(waterline_min_steepness,waterline_max_steepness,steepness));
//fragColor = mix(texel, generateWaterTexel(), smoothstep(0.3,1.0,texture(coastline, vec2(tile_coord.s, tile_coord.t)).r));
fragColor = generateWaterTexel();
fragColor.rgb += getClusteredLightsContribution(ecPosition.xyz, n, fragColor.rgb);
} else {