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

Changes to tke sky dome coloring

Browse Source
This commit is contained in:
ehofman
2004-02-18 14:33:16 +00:00
parent 5b8e5fce20
commit 16ad232e0d
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
simgear/scene/sky/dome.cxx
View File

@@ -337,24 +337,23 @@ bool SGSkyDome::repaint( sgVec4 sky_color, sgVec4 fog_color, double sun_angle,
if (cvf > 45000)
cvf = 45000;
if ( vis < 3000.0 ) {
vis_factor = (vis - 1000.0) / 2000.0;
if ( vis_factor < 0.0 ) {
vis_factor = 0.0;
}
} else {
vis_factor = 1.0;
vis_factor = (vis - 1000.0) / 2000.0;
if ( vis_factor < 0.0 ) {
vis_factor = 0.0;
} else if ( vis_factor > 1.0) {
vis_factor = 1.0;
}
for ( j = 0; j < 3; j++ ) {
diff = sky_color[j] - fog_color[j];
center_color[j] = sky_color[j] - diff * ( 1.0 - vis_factor );
center_color[j] = sky_color[j]; // - diff * ( 1.0 - vis_factor );
}
center_color[3] = 1.0;
for ( i = 0; i < 6; i++ ) {
for ( j = 0; j < 3; j++ ) {
diff = sky_color[j] - fog_color[j];
double saif = sun_angle/SG_PI;
diff = (sky_color[j] - fog_color[j]) * (0.8 + j * 0.2) * (0.8 + saif - ((6-i)/10));
// printf("sky = %.2f fog = %.2f diff = %.2f\n",
// l->sky_color[j], l->fog_color[j], diff);
@@ -397,7 +396,8 @@ bool SGSkyDome::repaint( sgVec4 sky_color, sgVec4 fog_color, double sun_angle,
for ( i = 6; i < 12; i++ ) {
for ( j = 0; j < 3; j++ ) {
diff = sky_color[j] - fog_color[j];
double saif = sun_angle/SG_PI;
diff = (sky_color[j] - fog_color[j]) * (0.8 + j * 0.2) * (0.8 + saif - ((-i+12)/10));
// printf("sky = %.2f fog = %.2f diff = %.2f\n",
// sky_color[j], fog_color[j], diff);

11
simgear/scene/sky/oursun.cxx
View File

@@ -341,11 +341,18 @@ bool SGSun::repaint( double sun_angle, double new_visibility ) {
if (prev_sun_angle != sun_angle) {
prev_sun_angle = sun_angle;
float sun_factor = 4*cos(sun_angle);
double vis_factor = (new_visibility - 5000.0) / 10000.0;
if ( vis_factor < 0.0 ) {
vis_factor = 0.0;
} else if ( vis_factor > 1.0) {
vis_factor = 1.0;
}
float sun_factor = 4 * (cos(sun_angle) + cos(sun_angle)/2) * vis_factor;
if (sun_factor > 1) sun_factor = 1.0;
if (sun_factor < -1) sun_factor = -1.0;
sun_factor = sun_factor/2 + 0.5;
sun_factor = (sun_factor/2) + 0.5;
sgVec4 color;
color[1] = sqrt(sun_factor);