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 fa5617d37e21b7094b1334643dffd11d168855e5..01d6af0252f6e5124322c8dbf1a11e3f97bb63f6 100644 (file)
--- a/src/Time/light.cxx
+++ b/src/Time/light.cxx
@@ -81,6 +81,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 +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() );
 }
@@ -101,10 +106,10 @@ 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;
 
@@ -118,11 +123,12 @@ void fgLIGHT::Update( void ) {
 
     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 +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;
@@ -175,20 +186,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 ) {
+    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()->get_view_offset() );
+               << 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 +249,5 @@ fgLIGHT::~fgLIGHT( void ) {
 }
 
 
+
+