fly/fgdata
1
0
Fork 0
Code Activity

Earthview: support for heightmapping and moonlight illumination

Browse source
This commit is contained in:
Thorsten Renk 2017-04-20 11:27:47 +03:00
parent f5be115145
commit 60f63cb2af
4 changed files with 76 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Effects/planet-cloudlayer.eff
View file

@ -23,20 +23,21 @@
<use-cloud-normals><use>/earthview/cloud-normal-flag</use></use-cloud-normals>
<shade-effect><use>/earthview/shade-effect</use></shade-effect>
<sun-angle><use>/sim/time/sun-angle-rad</use></sun-angle>
<air_pollution><use>/environment/air-pollution-norm</use></air_pollution>
<moonlight><use>/environment/moonlight</use></moonlight>
<air_pollution><use>/environment/air-pollution-norm</use></air_pollution>
<roi_x1><use>/earthview/roi-x1</use></roi_x1>
<roi_y1><use>/earthview/roi-y1</use></roi_y1>
<lightning><use>/earthview/lightning</use></lightning>
<use_filtering><use>/sim/rendering/als-filters/use-filtering</use></use_filtering>
<gamma><use>/sim/rendering/als-filters/gamma</use></gamma>
<brightness><use>/sim/rendering/als-filters/brightness</use></brightness>
<delta_T><use>/environment/surface/delta-T-cloud</use></delta_T>
<gamma><use>/sim/rendering/als-filters/gamma</use></gamma>
<brightness><use>/sim/rendering/als-filters/brightness</use></brightness>
<delta_T><use>/environment/surface/delta-T-cloud</use></delta_T>
<fact_grey><use>/sim/rendering/als-filters/grey-factor</use></fact_grey>
<fact_black><use>/sim/rendering/als-filters/black-factor</use></fact_black>
<use_night_vision><use>/sim/rendering/als-filters/use-night-vision</use></use_night_vision>
<use_IR_vision><use>/sim/rendering/als-filters/use-IR-vision</use></use_IR_vision>
<display_xsize><use>/sim/startup/xsize</use></display_xsize>
<display_ysize><use>/sim/startup/ysize</use></display_ysize>
<fact_black><use>/sim/rendering/als-filters/black-factor</use></fact_black>
<use_night_vision><use>/sim/rendering/als-filters/use-night-vision</use></use_night_vision>
<use_IR_vision><use>/sim/rendering/als-filters/use-IR-vision</use></use_IR_vision>
<display_xsize><use>/sim/startup/xsize</use></display_xsize>
<display_ysize><use>/sim/startup/ysize</use></display_ysize>
</parameters>
<generate>
@ -199,6 +200,13 @@
<use>sun-angle</use>
</value>
</uniform>
<uniform>
<name>moonlight</name>
<type>float</type>
<value>
<use>moonlight</use>
</value>
</uniform>
<uniform>
<name>lightning</name>
<type>float</type>

23
Effects/planet.eff
View file

@ -40,16 +40,18 @@
<use-cloud-shadows><use>/earthview/cloud-shadow-flag</use></use-cloud-shadows>
<use-overlay-textures><use>/earthview/overlay-texture-flag</use></use-overlay-textures>
<sun-angle><use>/sim/time/sun-angle-rad</use></sun-angle>
<moonlight><use>/environment/moonlight</use></moonlight>
<use_filtering><use>/sim/rendering/als-filters/use-filtering</use></use_filtering>
<gamma><use>/sim/rendering/als-filters/gamma</use></gamma>
<brightness><use>/sim/rendering/als-filters/brightness</use></brightness>
<delta_T><use>/environment/surface/delta-T-cloud</use></delta_T>
<brightness><use>/sim/rendering/als-filters/brightness</use></brightness>
<delta_T><use>/environment/surface/delta-T-cloud</use></delta_T>
<fact_grey><use>/sim/rendering/als-filters/grey-factor</use></fact_grey>
<fact_black><use>/sim/rendering/als-filters/black-factor</use></fact_black>
<use_night_vision><use>/sim/rendering/als-filters/use-night-vision</use></use_night_vision>
<use_IR_vision><use>/sim/rendering/als-filters/use-IR-vision</use></use_IR_vision>
<display_xsize><use>/sim/startup/xsize</use></display_xsize>
<display_ysize><use>/sim/startup/ysize</use></display_ysize>
<fact_black><use>/sim/rendering/als-filters/black-factor</use></fact_black>
<use_night_vision><use>/sim/rendering/als-filters/use-night-vision</use></use_night_vision>
<use_IR_vision><use>/sim/rendering/als-filters/use-IR-vision</use></use_IR_vision>
<display_xsize><use>/sim/startup/xsize</use></display_xsize>
<display_ysize><use>/sim/startup/ysize</use></display_ysize>
</parameters>
<generate>
<normal type="int">15</normal>
@ -197,6 +199,13 @@
<use>visibility</use>
</value>
</uniform>
<uniform>
<name>moonlight</name>
<type>float</type>
<value>
<use>moonlight</use>
</value>
</uniform>
<uniform>
<name>air_pollution</name>
<type>float</type>

4
Shaders/planet-cloudlayer.frag
View file

@ -11,6 +11,7 @@ varying vec3 VTangent;
uniform float shade_effect;
uniform float sun_angle;
uniform float air_pollution;
uniform float moonlight;
uniform float roi_x1;
uniform float roi_y1;
@ -138,6 +139,9 @@ void main()
float darkness_fact = 1.0 - smoothstep(0.0,0.2, length(color.rgb));
color.rgb += lightning_color(gl_TexCoord[0].st) * (1.0 - texel.a) * lightning * darkness_fact;
vec3 moonLightColor = vec3 (0.095, 0.095, 0.15) * moonlight;
color.rgb += moonLightColor;
color.a = 1.0;//diffuse_term.a;
color = clamp(color, 0.0, 1.0);

45
Shaders/planet-high.frag
View file

@ -10,6 +10,7 @@ varying vec3 VTangent;
uniform float visibility;
uniform float air_pollution;
uniform float moonlight;
uniform float sun_angle;
uniform bool use_clouds;
uniform bool use_cloud_shadows;
@ -41,26 +42,45 @@ void main()
// normal should be reversed.
n = (2.0 * gl_Color.a - 1.0) * normal;
n = normalize(n);
vec4 nmap = texture2D(normal_texture, gl_TexCoord[0].st);
float parallaxFactor = max(1.0 - dot(normalize(ecViewDir), n),0.0);
vec3 VBinormal;
VBinormal = normalize(cross(normal, VTangent));
float xOffset1 = -1.0 * dot(ecViewDir, normalize(VTangent));
float yOffset1 = -1.0 * dot(ecViewDir, VBinormal);
vec2 grad_dir = normalize (vec2 (xOffset1, yOffset1));
vec4 nmap = texture2D(normal_texture, gl_TexCoord[0].st);
float hmap = 1.0 - nmap.a;
nmap = texture2D(normal_texture, gl_TexCoord[0].st - 0.0005 * grad_dir * hmap * 2.0 * parallaxFactor);
// sanity processing for normal map when alpha is close to zero
nmap.rgb = normalize(nmap.rgb);
//if (nmap.b < 0.0) {nmap.b = -nmap.b;}
vec3 N = nmap.rgb * 2.0 - 1.0;
N = normalize(N.x * normalize(VTangent) * 0.6 + N.y * VBinormal * 0.6 + N.z * n);
N = normalize(N.x * normalize(VTangent) * 0.6 + N.y * VBinormal * 0.6 + N.z * n);
float xOffset = -0.005 * dot(lightDir, normalize(VTangent));
float yOffset = -0.005 * dot(lightDir, VBinormal);
if ((use_cloud_shadows)&&(use_clouds))
{shadowTexel = texture2D(shadowtex, vec2(gl_TexCoord[0].s-xOffset, gl_TexCoord[0].t-yOffset));}
else
{shadowTexel = vec4 (0.0,0.0,0.0,0.0);}
texel = texture2D(texture, gl_TexCoord[0].st);
texel = texture2D(texture, gl_TexCoord[0].st - 0.0005 * grad_dir * hmap * 2.0 * parallaxFactor);
float night_light = (1.0 -texel.a);
texel.a = 1.0;
grainTexel = texture2D(grain_texture, gl_TexCoord[0].st * 40.0);
@ -114,6 +134,10 @@ void main()
* light_specular * (1.0-shadowTexel.a)
* pow(NdotHV, gl_FrontMaterial.shininess));
}
vec3 moonLightColor = vec3 (0.095, 0.095, 0.15) * moonlight;
color.rgb += moonLightColor;
color.a = diffuse_term.a;
@ -146,14 +170,23 @@ void main()
vec4 fogColor = vec4 (0.83,0.9,1.0,1.0) * fogLighting;
vec3 rayleighColor = vec3 (0.17, 0.52, 0.87) * fogLighting;
float heightFactor = exp(-hmap * 0.8);
distance_through_atmosphere *= heightFactor;
float fogFactor = exp(-distance_through_atmosphere/(visibility/1000.0));
float rayleighFactor = exp(-distance_through_atmosphere/(300.0 / (1.0 + 4.0 * air_pollution)) );
fragColor.rgb = mix(rayleighColor, fragColor.rgb, rayleighFactor);
fragColor = mix(fogColor, fragColor, fogFactor);
fragColor.rgb = filter_combined(fragColor.rgb);
gl_FragColor = clamp(fragColor, 0.0, 1.0);
gl_FragColor = clamp(fragColor, 0.0, 1.0);
}