1
0
Fork 0

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

This commit is contained in:
Vivian Meazza 2010-09-26 00:11:42 +01:00
commit 41519f0b04
3 changed files with 13 additions and 4 deletions

View file

@ -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;

View file

@ -347,6 +347,14 @@
</binding>
</item>
<item>
<label>Local Weather Config</label>
<binding>
<command>dialog-show</command>
<dialog-name>local_weather_config</dialog-name>
</binding>
</item>
<item>
<label>Time Settings</label>
<binding>

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>