fly/flightgear
1
0
Fork 0
Code Activity

Adjust sunset/sun rise color scheme

Browse source
This commit is contained in:
ehofman 2003-05-16 16:33:23 +00:00
parent 6200c3cb62
commit ff7408fdf2
3 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Main/main.cxx
View file

@ -593,6 +593,7 @@ void fgRenderFrame() {
*/ */
thesky->repaint( cur_light_params.sky_color, thesky->repaint( cur_light_params.sky_color,
cur_light_params.adj_fog_color, cur_light_params.adj_fog_color,
cur_light_params.cloud_color,
cur_light_params.sun_angle, cur_light_params.sun_angle,
cur_light_params.moon_angle, cur_light_params.moon_angle,
globals->get_ephem()->getNumPlanets(), globals->get_ephem()->getNumPlanets(),

23
src/Time/light.cxx
View file

@ -122,14 +122,6 @@ void fgLIGHT::Update( void ) {
// calculate lighting parameters based on sun's relative angle to // calculate lighting parameters based on sun's relative angle to
// local up // local up
// base fog color
float *sun_color = thesky->get_sun_color();
base_fog_color[0] *= (1.25 - sun_color[0]/4.0); // 100% red
base_fog_color[1] *= (0.48 + sun_color[1]/1.923); // 40% green
base_fog_color[2] *= sun_color[2]; // 0% blue
deg = sun_angle * SGD_RADIANS_TO_DEGREES; deg = sun_angle * SGD_RADIANS_TO_DEGREES;
SG_LOG( SG_EVENT, SG_INFO, " Sun angle = " << deg ); SG_LOG( SG_EVENT, SG_INFO, " Sun angle = " << deg );
@ -169,11 +161,18 @@ void fgLIGHT::Update( void ) {
sky_color[2] = base_sky_color[2] * sky_brightness; sky_color[2] = base_sky_color[2] * sky_brightness;
sky_color[3] = base_sky_color[3]; sky_color[3] = base_sky_color[3];
// set cloud color
cloud_color[0] = base_fog_color[0] * sky_brightness;
cloud_color[1] = base_fog_color[1] * sky_brightness;
cloud_color[2] = base_fog_color[2] * sky_brightness;
cloud_color[3] = base_fog_color[3];
// set fog color // set fog color
fog_color[0] = base_fog_color[0] * sky_brightness; float *sun_color = thesky->get_sun_color();
fog_color[1] = base_fog_color[1] * sky_brightness; fog_color[0] = cloud_color[0] * (1.25 - sun_color[0]/4.0); // 100% red
fog_color[2] = base_fog_color[2] * sky_brightness; fog_color[1] = cloud_color[1] * (0.48 + sun_color[1]/1.923); // 40% green
fog_color[3] = base_fog_color[3]; fog_color[2] = cloud_color[2] * sun_color[2]; // 0% blue
fog_color[3] = cloud_color[3];
} }

3
src/Time/light.hxx
View file

@ -127,6 +127,9 @@ public:
// fog color adjusted for sunset effects // fog color adjusted for sunset effects
GLfloat adj_fog_color[4]; GLfloat adj_fog_color[4];
// cloud color
GLfloat cloud_color[4];
// clear screen color // clear screen color
GLfloat sky_color[4]; GLfloat sky_color[4];