Added static port system and a new altimeter model connected to it.

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

diff --git a/src/Time/light.cxx b/src/Time/light.cxx
index a7dcda076d82ae371994c3f455f9eb2e02adee3c..01d6af0252f6e5124322c8dbf1a11e3f97bb63f6 100644 (file)
--- a/src/Time/light.cxx
+++ b/src/Time/light.cxx
@@ -31,11 +31,11 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
+#include <GL/gl.h>
 
 #include <simgear/compiler.h>
 
-#ifdef FG_MATH_EXCEPTION_CLASH
+#ifdef SG_MATH_EXCEPTION_CLASH
 #  define exception c_exception
 #endif
 
@@ -46,16 +46,17 @@
 #endif
 
 #include <string>
-FG_USING_STD(string);
+SG_USING_STD(string);
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/math/interpolater.hxx>
 #include <simgear/math/polar3d.hxx>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Main/globals.hxx>
+#include <Main/viewer.hxx>
 
 #include "light.hxx"
 #include "sunpos.hxx"
@@ -71,16 +72,18 @@ fgLIGHT::fgLIGHT( void ) {
 
 // initialize lighting tables
 void fgLIGHT::Init( void ) {
-    FG_LOG( FG_EVENT, FG_INFO, 
+    SG_LOG( SG_EVENT, SG_INFO, 
            "Initializing Lighting interpolation tables." );
 
     // build the path name to the ambient lookup table
-    FGPath path( globals->get_fg_root() );
-    FGPath ambient = path;
+    SGPath path( globals->get_fg_root() );
+    SGPath ambient = path;
     ambient.append( "Lighting/ambient" );
-    FGPath diffuse = path;
+    SGPath diffuse = path;
     diffuse.append( "Lighting/diffuse" );
-    FGPath sky = path;
+    SGPath specular = path;
+    specular.append( "Lighting/specular" );
+    SGPath sky = path;
     sky.append( "Lighting/sky" );
 
     // initialize ambient table
@@ -89,6 +92,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() );
 }
@@ -100,28 +106,29 @@ 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};
+    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;
+    GLfloat base_fog_color[4] = { 0.90, 0.90, 1.00, 1.0 };
+    double deg, ambient, diffuse, specular, sky_brightness;
 
     f = current_aircraft.fdm_state;
 
-    FG_LOG( FG_EVENT, FG_INFO, "Updating light parameters." );
+    SG_LOG( SG_EVENT, SG_INFO, "Updating light parameters." );
 
     // calculate lighting parameters based on sun's relative angle to
     // local up
 
-    deg = sun_angle * RAD_TO_DEG;
-    FG_LOG( FG_EVENT, FG_INFO, "  Sun angle = " << deg );
+    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 );
 
-    FG_LOG( FG_EVENT, FG_INFO, 
+    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)
 
@@ -139,6 +146,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;
@@ -160,30 +172,43 @@ void fgLIGHT::UpdateAdjFog( void ) {
 
     f = current_aircraft.fdm_state;
 
-    FG_LOG( FG_EVENT, FG_DEBUG, "Updating adjusted fog parameters." );
+    SG_LOG( SG_EVENT, SG_DEBUG, "Updating adjusted fog parameters." );
 
     // set fog color (we'll try to match the sunset color in the
     // direction we are looking
 
+    // Do some sanity checking ...
+    if ( sun_rotation < -2.0 * SGD_2PI || sun_rotation > 2.0 * SGD_2PI ) {
+       SG_LOG( SG_EVENT, SG_ALERT, "Sun rotation bad = " << sun_rotation );
+       exit(-1);
+    }
+    if ( f->get_Psi() < -2.0 * SGD_2PI || f->get_Psi() > 2.0 * SGD_2PI ) {
+       SG_LOG( SG_EVENT, SG_ALERT, "Psi rotation bad = " << f->get_Psi() );
+       exit(-1);
+    }
+    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 + FG_PI) 
-       - (f->get_Psi() - globals->get_current_view()->get_view_offset());
-    if ( globals->get_current_view()->get_reverse_view_offset() ) {
-       rotation += FG_PI;
-    }
+    rotation = -(sun_rotation + SGD_PI) 
+       - (f->get_Psi() - globals->get_current_view()->getHeadingOffset_deg() * SGD_DEGREES_TO_RADIANS);
     while ( rotation < 0 ) {
-       rotation += FG_2PI;
+       rotation += SGD_2PI;
     }
-    while ( rotation > FG_2PI ) {
-       rotation -= FG_2PI;
+    while ( rotation > SGD_2PI ) {
+       rotation -= SGD_2PI;
     }
-    rotation *= RAD_TO_DEG;
-    // fgPrintf( FG_EVENT, FG_INFO, 
+    rotation *= SGD_RADIANS_TO_DEGREES;
+    // fgPrintf( SG_EVENT, SG_INFO, 
     //           "  View to sun difference in degrees = %.2f\n", rotation);
 
     // next check if we are in a sunset/sunrise situation
-    sun_angle_deg = sun_angle * RAD_TO_DEG;
+    sun_angle_deg = sun_angle * SGD_RADIANS_TO_DEGREES;
     if ( (sun_angle_deg > 80.0) && (sun_angle_deg < 100.0) ) {
        /* 0.0 - 0.6 */
        param1[0] = (10.0 - fabs(90.0 - sun_angle_deg)) / 20.0;
@@ -224,3 +249,5 @@ fgLIGHT::~fgLIGHT( void ) {
 }
 
 
+
+