FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust the fog punch through effect for oursun

Browse Source
This commit is contained in:
ehofman
2003-08-14 09:58:48 +00:00
parent 8ae39ae8d4
commit e5e1e165b9
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/sky/oursun.cxx
+14 -3
View File
@@ -91,7 +91,8 @@ static int sgSunHaloPreDraw( ssgEntity *e ) {
// cout << "push error = " << glGetError() << endl; // cout << "push error = " << glGetError() << endl;
glDisable( GL_DEPTH_TEST ); glDisable( GL_DEPTH_TEST );
// glDisable( GL_FOG ); // glDisable( GL_FOG );
glFogf (GL_FOG_DENSITY, sun_exp2_punch_through);
glBlendFunc ( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ) ; glBlendFunc ( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ) ;
return true; return true;
@@ -259,7 +260,7 @@ ssgBranch * SGSun::build( SGPath path, double sun_size ) {
sgSunOrbPreDraw, sgSunOrbPostDraw ); sgSunOrbPreDraw, sgSunOrbPostDraw );
// force a repaint of the sun colors with arbitrary defaults // force a repaint of the sun colors with arbitrary defaults
repaint( 0.0 ); repaint( 0.0, 1.0 );
// build the halo // build the halo
// sun_texbuf = new GLubyte[64*64*3]; // sun_texbuf = new GLubyte[64*64*3];
@@ -334,9 +335,19 @@ ssgBranch * SGSun::build( SGPath path, double sun_size ) {
// 0 degrees = high noon // 0 degrees = high noon
// 90 degrees = sun rise/set // 90 degrees = sun rise/set
// 180 degrees = darkest midnight // 180 degrees = darkest midnight
bool SGSun::repaint( double sun_angle ) { bool SGSun::repaint( double sun_angle, double new_visibility ) {
static float prev_sun_angle = 9999.0; static float prev_sun_angle = 9999.0;
if ( visibility != new_visibility ) {
static double sqrt_m_log01 = sqrt( -log( 0.01 ) );
visibility = new_visibility;
if ( visibility < 8000 ) {
sun_exp2_punch_through = sqrt_m_log01 / (visibility * 10);
} else {
sun_exp2_punch_through = sqrt_m_log01 / (8000 * 10);
}
}
if (prev_sun_angle != sun_angle) if (prev_sun_angle != sun_angle)
{ {
simgear/scene/sky/oursun.hxx
+4 -1
View File
@@ -34,6 +34,7 @@
#include <simgear/misc/sg_path.hxx> #include <simgear/misc/sg_path.hxx>
static double sun_exp2_punch_through;
class SGSun { class SGSun {
@@ -49,6 +50,8 @@ class SGSun {
GLuint sun_texid; GLuint sun_texid;
GLubyte *sun_texbuf; GLubyte *sun_texbuf;
double visibility;
public: public:
// Constructor // Constructor
@@ -65,7 +68,7 @@ public:
// 0 degrees = high noon // 0 degrees = high noon
// 90 degrees = sun rise/set // 90 degrees = sun rise/set
// 180 degrees = darkest midnight // 180 degrees = darkest midnight
bool repaint( double sun_angle ); bool repaint( double sun_angle, double new_visibility );
// reposition the sun at the specified right ascension and // reposition the sun at the specified right ascension and
// declination, offset by our current position (p) so that it // declination, offset by our current position (p) so that it
simgear/scene/sky/sky.cxx
+1 -1
View File
@@ -110,7 +110,7 @@ bool SGSky::repaint( const SGSkyColor &sc )
dome->repaint( sc.sky_color, sc.fog_color, sc.sun_angle, dome->repaint( sc.sky_color, sc.fog_color, sc.sun_angle,
effective_visibility ); effective_visibility );
oursun->repaint( sc.sun_angle ); oursun->repaint( sc.sun_angle, effective_visibility );
moon->repaint( sc.moon_angle ); moon->repaint( sc.moon_angle );