fly/fgdata
1
0
Fork 0
Code Activity

Merge branch 'master' of git://gitorious.org/fg/fgdata

Browse source
This commit is contained in:
BARANGER Emmanuel 2010-09-26 18:47:38 +02:00
commit 9c3fd34f04
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Nasal/startup.nas
View file

@ -1,6 +1,8 @@
var set_runway_from_metar_wind = func {
if (!getprop("/environment/params/real-world-weather-fetch"))
if (!getprop("/environment/realwx/enabled"))
return printlog("info", "metar-rwy: no live weather");
if (!getprop("/environment/metar/valid"))
return printlog("info", "metar-rwy: no valid metar");
if (!getprop("/sim/startup/options/airport"))
return printlog("info", "metar-rwy: no airport requested");
if (getprop("/sim/startup/options/runway"))

8
Shaders/urban.frag
View file

@ -1,6 +1,6 @@
// -*- mode: C; -*-
// Licence: GPL v2
// Author: Frederic Bouvier.
// Author: Frederic Bouvier.
// Adapted from the paper by F. Policarpo et al. : Real-time Relief Mapping on Arbitrary Polygonal Surfaces
#version 120
@ -34,7 +34,7 @@ float ray_intersect(sampler2D reliefMap, vec2 dp, vec2 ds)
for(int i = 0; i < linear_search_steps - 1; ++i)
{
depth += size;
float t = texture2D(reliefMap, dp + ds * depth).a;
float t = step(0.95, texture2D(reliefMap, dp + ds * depth).a);
if(best_depth > 0.996)
if(depth >= t)
best_depth = depth;
@ -46,7 +46,7 @@ float ray_intersect(sampler2D reliefMap, vec2 dp, vec2 ds)
for(int i = 0; i < binary_search_steps; ++i)
{
size *= 0.5;
float t = texture2D(reliefMap, dp + ds * depth).a;
float t = step(0.95, texture2D(reliefMap, dp + ds * depth).a);
if(depth >= t)
{
best_depth = depth;
@ -129,7 +129,7 @@ void main (void)
finalColor = mix(finalColor, clamp(n+nvL[2]*4.1+vec4(0.1, 0.1, nvL[2]*2.2, 1.0), 0.7, 1.0),
step(0.8,Nz)*(1.0-emis)*smoothstep(snowlevel+300.0, snowlevel+360.0, (rawpos.z)+nvL[1]*3000.0));
finalColor *= ambient_light;
if (gl_Fog.density == 1.0)
fogFactor=1.0;

1
preferences.xml
View file

@ -148,6 +148,7 @@ Started September 2000 by David Megginson, david@megginson.com
</headshake>
<crop-shader userarchive="y">0</crop-shader>
<landmass-shader userarchive="y">0</landmass-shader>
<transition-shader userarchive="y">0</transition-shader>
<water-shader userarchive="y">0</water-shader>
<urban-shader userarchive="y">0</urban-shader>
<contrail-shader userarchive="y">0</contrail-shader>