Update the SoundSample api so we can request that a copy of the sample be

[simgear.git] / simgear / scene / sky / dome.cxx

diff --git a/simgear/scene/sky/dome.cxx b/simgear/scene/sky/dome.cxx
index 813ef95ddb82d8d22569b975af62d2459ab7b793..4084c09b41609a22c4343a012300e11c1b4c3667 100644 (file)
--- a/simgear/scene/sky/dome.cxx
+++ b/simgear/scene/sky/dome.cxx
@@ -33,7 +33,7 @@
 
 #include <math.h>
 
-#include GLUT_H
+#include <GL/gl.h>
 
 #include <plib/sg.h>
 
@@ -332,33 +332,37 @@ bool SGSkyDome::repaint( sgVec4 sky_color, sgVec4 fog_color, double sun_angle,
     sgVec4 lower_color[12];
     sgVec4 bottom_color[12];
 
-    double vis_factor;
+    double vis_factor, cvf = vis;
 
-    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;
+    if (cvf > 45000)
+        cvf = 45000;
+
+    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);
 
-           upper_color[i][j] = sky_color[j] - diff * ( 1.0 - vis_factor * 0.7);
-           middle_color[i][j] = sky_color[j] - diff * ( 1.0 - vis_factor * 0.1)
-               + middle_amt[j];
+           upper_color[i][j] = sky_color[j] - diff *
+                                 ( 1.0 - vis_factor * (0.7 + 0.3 * cvf/45000) );
+           middle_color[i][j] = sky_color[j] - diff *
+                                 ( 1.0 - vis_factor * (0.1 + 0.85 * cvf/45000) )
+                                + middle_amt[j];
            lower_color[i][j] = fog_color[j] + outer_amt[j];
 
            if ( upper_color[i][j] > 1.0 ) { upper_color[i][j] = 1.0; }
@@ -392,14 +396,17 @@ 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);
 
-           upper_color[i][j] = sky_color[j] - diff * ( 1.0 - vis_factor * 0.7);
-           middle_color[i][j] = sky_color[j] - diff * ( 1.0 - vis_factor * 0.1)
-               + middle_amt[j];
+           upper_color[i][j] = sky_color[j] - diff *
+                                 ( 1.0 - vis_factor * (0.7 + 0.3 * cvf/45000) );
+           middle_color[i][j] = sky_color[j] - diff *
+                                 ( 1.0 - vis_factor * (0.1 + 0.85 * cvf/45000) )
+                                  + middle_amt[j];
            lower_color[i][j] = fog_color[j] + outer_amt[j];
 
            if ( upper_color[i][j] > 1.0 ) { upper_color[i][j] = 1.0; }