Moved some of the low level scene graph construction code over to simgear.

[flightgear.git] / src / Time / light.cxx

diff --git a/src/Time/light.cxx b/src/Time/light.cxx
index 409d65182b32075ae00560965e6b60db5f2c3028..a6021b17480206367ff866dd01ee21c290313ad9 100644 (file)
--- a/src/Time/light.cxx
+++ b/src/Time/light.cxx
@@ -30,8 +30,7 @@
 #  include <windows.h>
 #endif
 
-#include <GL/glut.h>
-#include <GL/gl.h>
+#include GLUT_H
 
 #include <simgear/compiler.h>
 
@@ -53,6 +52,7 @@ SG_USING_STD(string);
 #include <simgear/math/interpolater.hxx>
 #include <simgear/math/polar3d.hxx>
 #include <simgear/misc/sg_path.hxx>
+#include <simgear/sky/sky.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Main/globals.hxx>
@@ -61,6 +61,7 @@ SG_USING_STD(string);
 #include "light.hxx"
 #include "sunpos.hxx"
 
+extern SGSky *thesky;           // FIXME: from main.cxx
 
 fgLIGHT cur_light_params;
 
@@ -81,6 +82,8 @@ void fgLIGHT::Init( void ) {
     ambient.append( "Lighting/ambient" );
     SGPath diffuse = path;
     diffuse.append( "Lighting/diffuse" );
+    SGPath specular = path;
+    specular.append( "Lighting/specular" );
     SGPath sky = path;
     sky.append( "Lighting/sky" );
 
@@ -90,6 +93,9 @@ void fgLIGHT::Init( void ) {
     // initialize diffuse table
     diffuse_tbl = new SGInterpTable( diffuse.str() );
     
+    // initialize diffuse table
+    specular_tbl = new SGInterpTable( specular.str() );
+    
     // initialize sky table
     sky_tbl = new SGInterpTable( sky.str() );
 }
@@ -101,10 +107,13 @@ void fgLIGHT::Update( void ) {
     // if the 4th field is 0.0, this specifies a direction ...
     GLfloat white[4] = { 1.0, 1.0, 1.0, 1.0 };
     // base sky color
-    GLfloat base_sky_color[4] =        {0.60, 0.60, 0.90, 1.0};
-    // base fog color
-    GLfloat base_fog_color[4] = {0.90, 0.90, 1.00, 1.0};
-    double deg, ambient, diffuse, sky_brightness;
+#if defined (sgi) || defined( macintosh )
+    GLfloat base_sky_color[4] = { 0.252, 0.403, 0.657, 1.0 };
+#else // default
+    GLfloat base_sky_color[4] = { 0.336, 0.406, 0.574, 1.0 };
+#endif
+    GLfloat base_fog_color[4] = { 0.80, 0.83, 1.0, 1.0 };
+    double deg, ambient, diffuse, specular, sky_brightness;
 
     f = current_aircraft.fdm_state;
 
@@ -113,16 +122,25 @@ void fgLIGHT::Update( void ) {
     // calculate lighting parameters based on sun's relative angle to
     // 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;
     SG_LOG( SG_EVENT, SG_INFO, "  Sun angle = " << deg );
 
     ambient = ambient_tbl->interpolate( deg );
     diffuse = diffuse_tbl->interpolate( deg );
+    specular = specular_tbl->interpolate( deg );
     sky_brightness = sky_tbl->interpolate( deg );
 
     SG_LOG( SG_EVENT, SG_INFO, 
            "  ambient = " << ambient << "  diffuse = " << diffuse 
-           << "  sky = " << sky_brightness );
+           << "  specular = " << specular << "  sky = " << sky_brightness );
 
     // sky_brightness = 0.15;  // used to force a dark sky (when testing)
 
@@ -140,6 +158,11 @@ void fgLIGHT::Update( void ) {
     scene_diffuse[2] = white[2] * diffuse;
     scene_diffuse[3] = 1.0;
 
+    scene_specular[0] = white[0] * specular;
+    scene_specular[1] = white[1] * specular;
+    scene_specular[2] = white[2] * specular;
+    scene_specular[3] = 1.0;
+
     // set sky color
     sky_color[0] = base_sky_color[0] * sky_brightness;
     sky_color[1] = base_sky_color[1] * sky_brightness;
@@ -175,20 +198,17 @@ void fgLIGHT::UpdateAdjFog( void ) {
        SG_LOG( SG_EVENT, SG_ALERT, "Psi rotation bad = " << f->get_Psi() );
        exit(-1);
     }
-    if ( globals->get_current_view()->get_view_offset() < -2.0 * SGD_2PI ||
-        globals->get_current_view()->get_view_offset() > 2.0 * SGD_2PI ) {
-       SG_LOG( SG_EVENT, SG_ALERT, "Psi rotation bad = " 
-               << globals->get_current_view()->get_view_offset() );
+    if ( globals->get_current_view()->getHeadingOffset_deg() * SGD_DEGREES_TO_RADIANS < -2.0 * SGD_2PI ||
+        globals->get_current_view()->getHeadingOffset_deg() * SGD_DEGREES_TO_RADIANS > 2.0 * SGD_2PI ) {
+       SG_LOG( SG_EVENT, SG_ALERT, "current view()->view offset bad = " 
+               << globals->get_current_view()->getHeadingOffset_deg() * SGD_DEGREES_TO_RADIANS );
        exit(-1);
     }
 
     // first determine the difference between our view angle and local
     // direction to the sun
     rotation = -(sun_rotation + SGD_PI) 
-       - (f->get_Psi() - globals->get_current_view()->get_view_offset());
-    if ( globals->get_current_view()->get_reverse_view_offset() ) {
-       rotation += SGD_PI;
-    }
+       - (f->get_Psi() - globals->get_current_view()->getHeadingOffset_deg() * SGD_DEGREES_TO_RADIANS);
     while ( rotation < 0 ) {
        rotation += SGD_2PI;
     }
@@ -241,3 +261,5 @@ fgLIGHT::~fgLIGHT( void ) {
 }
 
 
+
+