fly/fgdata
1
0
Fork 0
Code Activity

ALS secondary lights work on water

Browse source
This commit is contained in:
Thorsten Renk 2014-10-09 10:52:44 +03:00
parent 63bfbcbb4a
commit b2fd34b3f4
6 changed files with 161 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
Effects/water-inland.eff
View file

@ -359,10 +359,11 @@
</texture-unit> </texture-unit>
<program> <program>
<vertex-shader>Shaders/water_lightfield.vert</vertex-shader> <vertex-shader>Shaders/water-ALS.vert</vertex-shader>
<fragment-shader>Shaders/water_lightfield.frag</fragment-shader> <fragment-shader>Shaders/water-ALS-high.frag</fragment-shader>
<fragment-shader>Shaders/cloud-shadowfunc.frag</fragment-shader> <fragment-shader>Shaders/cloud-shadowfunc.frag</fragment-shader>
<fragment-shader>Shaders/hazes.frag</fragment-shader> <fragment-shader>Shaders/hazes.frag</fragment-shader>
<fragment-shader>Shaders/secondary_lights.frag</fragment-shader>
</program> </program>
<!--<uniform> <!--<uniform>
<name>water_reflection</name> <name>water_reflection</name>
@ -543,6 +544,31 @@
<type>float</type> <type>float</type>
<value><use>air_pollution</use></value> <value><use>air_pollution</use></value>
</uniform> </uniform>
<uniform>
<name>view_pitch_offset</name>
<type>float</type>
<value><use>view_pitch_offset</use></value>
</uniform>
<uniform>
<name>view_heading_offset</name>
<type>float</type>
<value><use>view_heading_offset</use></value>
</uniform>
<uniform>
<name>field_of_view</name>
<type>float</type>
<value><use>view_fov</use></value>
</uniform>
<uniform>
<name>landing_light1_offset</name>
<type>float</type>
<value><use>landing_light1_offset</use></value>
</uniform>
<uniform>
<name>landing_light2_offset</name>
<type>float</type>
<value><use>landing_light2_offset</use></value>
</uniform>
<uniform> <uniform>
<name>cloudpos1_x</name> <name>cloudpos1_x</name>
<type>float</type> <type>float</type>
@ -770,6 +796,36 @@
<use>sea_b</use> <use>sea_b</use>
</value> </value>
</uniform> </uniform>
<uniform>
<name>use_searchlight</name>
<type>int</type>
<value> <use>use_searchlight</use></value>
</uniform>
<uniform>
<name>use_landing_light</name>
<type>int</type>
<value> <use>use_landing_light</use></value>
</uniform>
<uniform>
<name>use_alt_landing_light</name>
<type>int</type>
<value> <use>use_alt_landing_light</use></value>
</uniform>
<uniform>
<name>display_xsize</name>
<type>int</type>
<value><use>display_xsize</use></value>
</uniform>
<uniform>
<name>display_ysize</name>
<type>int</type>
<value><use>display_ysize</use></value>
</uniform>
<uniform>
<name>quality_level</name>
<type>int</type>
<value><use>quality_level</use></value>
</uniform>
<uniform> <uniform>
<name>ocean_flag</name> <name>ocean_flag</name>
<type>int</type> <type>int</type>
@ -961,8 +1017,8 @@
</texture-unit> </texture-unit>
<program> <program>
<vertex-shader>Shaders/water_lightfield.vert</vertex-shader> <vertex-shader>Shaders/water-ALS.vert</vertex-shader>
<fragment-shader>Shaders/water_lightfield_lr.frag</fragment-shader> <fragment-shader>Shaders/water-ALS-base.frag</fragment-shader>
</program> </program>
<!--<uniform> <!--<uniform>
<name>water_reflection</name> <name>water_reflection</name>

59
Effects/water.eff
View file

@ -371,10 +371,11 @@
</texture-unit> </texture-unit>
<program> <program>
<vertex-shader>Shaders/water_lightfield.vert</vertex-shader> <vertex-shader>Shaders/water-ALS.vert</vertex-shader>
<fragment-shader>Shaders/water_lightfield.frag</fragment-shader> <fragment-shader>Shaders/water-ALS-high.frag</fragment-shader>
<fragment-shader>Shaders/cloud-shadowfunc.frag</fragment-shader> <fragment-shader>Shaders/cloud-shadowfunc.frag</fragment-shader>
<fragment-shader>Shaders/hazes.frag</fragment-shader> <fragment-shader>Shaders/hazes.frag</fragment-shader>
<fragment-shader>Shaders/secondary_lights.frag</fragment-shader>
</program> </program>
<!--<uniform> <!--<uniform>
<name>water_reflection</name> <name>water_reflection</name>
@ -570,6 +571,31 @@
<type>float</type> <type>float</type>
<value><use>ice_cover</use></value> <value><use>ice_cover</use></value>
</uniform> </uniform>
<uniform>
<name>view_pitch_offset</name>
<type>float</type>
<value><use>view_pitch_offset</use></value>
</uniform>
<uniform>
<name>view_heading_offset</name>
<type>float</type>
<value><use>view_heading_offset</use></value>
</uniform>
<uniform>
<name>field_of_view</name>
<type>float</type>
<value><use>view_fov</use></value>
</uniform>
<uniform>
<name>landing_light1_offset</name>
<type>float</type>
<value><use>landing_light1_offset</use></value>
</uniform>
<uniform>
<name>landing_light2_offset</name>
<type>float</type>
<value><use>landing_light2_offset</use></value>
</uniform>
<uniform> <uniform>
<name>cloudpos1_x</name> <name>cloudpos1_x</name>
<type>float</type> <type>float</type>
@ -797,6 +823,31 @@
<use>sea_b</use> <use>sea_b</use>
</value> </value>
</uniform> </uniform>
<uniform>
<name>use_searchlight</name>
<type>int</type>
<value> <use>use_searchlight</use></value>
</uniform>
<uniform>
<name>use_landing_light</name>
<type>int</type>
<value> <use>use_landing_light</use></value>
</uniform>
<uniform>
<name>use_alt_landing_light</name>
<type>int</type>
<value> <use>use_alt_landing_light</use></value>
</uniform>
<uniform>
<name>display_xsize</name>
<type>int</type>
<value><use>display_xsize</use></value>
</uniform>
<uniform>
<name>display_ysize</name>
<type>int</type>
<value><use>display_ysize</use></value>
</uniform>
<uniform> <uniform>
<name>quality_level</name> <name>quality_level</name>
<type>int</type> <type>int</type>
@ -992,8 +1043,8 @@
</texture-unit> </texture-unit>
<program> <program>
<vertex-shader>Shaders/water_lightfield.vert</vertex-shader> <vertex-shader>Shaders/water-ALS.vert</vertex-shader>
<fragment-shader>Shaders/water_lightfield_lr.frag</fragment-shader> <fragment-shader>Shaders/water-ALS-base.frag</fragment-shader>
</program> </program>
<!--<uniform> <!--<uniform>
<name>water_reflection</name> <name>water_reflection</name>

3
Shaders/terrain-ALS-ultra.frag
View file

@ -19,9 +19,6 @@ uniform sampler2D dot_texture;
uniform sampler2D gradient_texture; uniform sampler2D gradient_texture;
//varying float yprime_alt;
//varying float mie_angle;
varying float steepness; varying float steepness;

0
Shaders/water_lightfield_lr.frag → Shaders/water-ALS-base.frag
View file

69
Shaders/water_lightfield.frag → Shaders/water-ALS-high.frag
View file

@ -60,26 +60,36 @@ uniform float sea_r;
uniform float sea_g; uniform float sea_g;
uniform float sea_b; uniform float sea_b;
uniform float air_pollution; uniform float air_pollution;
uniform float landing_light1_offset;
uniform float landing_light2_offset;
uniform int quality_level; uniform int quality_level;
uniform int ocean_flag; uniform int ocean_flag;
uniform int cloud_shadow_flag; uniform int cloud_shadow_flag;
uniform int use_searchlight;
uniform int use_landing_light;
uniform int use_alt_landing_light;
vec3 specular_light; vec3 specular_light;
//uniform int wquality_level;
const float terminator_width = 200000.0; const float terminator_width = 200000.0;
const float EarthRadius = 5800000.0; const float EarthRadius = 5800000.0;
////fog "include" /////
//uniform int fogType;
//vec3 fog_Func(vec3 color, int type); ////included functions /////
float shadow_func (in float x, in float y, in float noise, in float dist); float shadow_func (in float x, in float y, in float noise, in float dist);
float fog_func (in float targ, in float alt); float fog_func (in float targ, in float alt);
float rayleigh_in_func(in float dist, in float air_pollution, in float avisibility, in float eye_alt, in float vertex_alt); float rayleigh_in_func(in float dist, in float air_pollution, in float avisibility, in float eye_alt, in float vertex_alt);
float alt_factor(in float eye_alt, in float vertex_alt); float alt_factor(in float eye_alt, in float vertex_alt);
float light_distance_fading(in float dist);
float fog_backscatter(in float avisibility);
vec3 rayleigh_out_shift(in vec3 color, in float outscatter); vec3 rayleigh_out_shift(in vec3 color, in float outscatter);
vec3 searchlight();
vec3 landing_light(in float offset);
////////////////////// //////////////////////
/////// functions ///////// /////// functions /////////
@ -527,6 +537,8 @@ void main(void)
vec4 finalColor; vec4 finalColor;
// compute cloud shadow effect
float shadowValue; float shadowValue;
if (cloud_shadow_flag == 1) if (cloud_shadow_flag == 1)
{ {
@ -535,8 +547,29 @@ void main(void)
refl = refl * (0.7 + 0.3 *shadowValue); refl = refl * (0.7 + 0.3 *shadowValue);
} }
// compute secondary light effect
finalColor = refl + specular * smoothstep(0.3, 0.6, ground_scattering);
vec3 secondary_light = vec3 (0.0,0.0,0.0);
if (quality_level >5)
{
if (use_searchlight == 1)
{
secondary_light += searchlight();
}
if (use_landing_light == 1)
{
secondary_light += landing_light(landing_light1_offset);
}
if (use_alt_landing_light == 1)
{
secondary_light += landing_light(landing_light2_offset);
}
//specular.rgb+= secondary_light;
finalColor = refl + specular * smoothstep(0.3, 0.6, ground_scattering) + vec4 (secondary_light, 0.0) * light_distance_fading(dist) * 2.0 * pow(max(0.0,dot(E,N)), water_shininess);
//add foam //add foam
vec4 foam_texel = texture2D(sea_foam, vec2(waterTex2 * tscale) * 25.0); vec4 foam_texel = texture2D(sea_foam, vec2(waterTex2 * tscale) * 25.0);
@ -572,7 +605,11 @@ void main(void)
finalColor.a = 1.0; finalColor.a = 1.0;
finalColor *= ambient_light; }
//vec4 (secondary_light * light_distance_fading(dist), 0.0) * max(0.0,pow(dot(E,N)), water_shininess);
finalColor *= vec4 (ambient_light.rgb + secondary_light * light_distance_fading(dist), ambient_light.a);
// Rayleigh color shift due to out-scattering // Rayleigh color shift due to out-scattering
@ -588,7 +625,8 @@ float delta_z = hazeLayerAltitude - eye_alt;
if (dist > 40.0) //if (dist > 40.0)
if (dist > 0.04 * min(visibility,avisibility))
{ {
@ -650,21 +688,6 @@ transmission_arg = (dist-distance_in_layer)/avisibility;
float eqColorFactor; float eqColorFactor;
/*
if (visibility < avisibility)
{
transmission_arg = transmission_arg + (distance_in_layer/visibility);
// this combines the Weber-Fechner intensity
eqColorFactor = 1.0 - 0.1 * delta_zv/visibility - (1.0 -effective_scattering);
}
else
{
transmission_arg = transmission_arg + (distance_in_layer/avisibility);
// this combines the Weber-Fechner intensity
eqColorFactor = 1.0 - 0.1 * delta_zv/avisibility - (1.0 -effective_scattering);
}
*/
if (visibility < avisibility) if (visibility < avisibility)
{ {
if (quality_level > 3) if (quality_level > 3)
@ -747,7 +770,7 @@ if (intensity > 0.0) // this needs to be a condition, because otherwise hazeColo
float rayleighStrength = rayleigh_in_func(dist, air_pollution, avisibility/max(lightIntensity,0.05), eye_alt, eye_alt + relPos.z); float rayleighStrength = rayleigh_in_func(dist, air_pollution, avisibility/max(lightIntensity,0.05), eye_alt, eye_alt + relPos.z);
finalColor.rgb = mix(finalColor.rgb, rayleighColor, rayleighStrength); finalColor.rgb = mix(finalColor.rgb, rayleighColor, rayleighStrength);
finalColor.rgb = mix(eqColorFactor * hazeColor * eShade, finalColor.rgb,transmission); finalColor.rgb = mix(eqColorFactor * hazeColor * eShade +secondary_light * fog_backscatter(avisibility), finalColor.rgb,transmission);
} }

0
Shaders/water_lightfield.vert → Shaders/water-ALS.vert
View file