Make FlightGear work with 16bpp:

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

diff --git a/src/Time/light.cxx b/src/Time/light.cxx
index 7f5bf61d6b48ae0f397e37cae64f93a689f80519..b7378aeeff59a09cd28e86eda396e6ff24281a98 100644 (file)
--- a/src/Time/light.cxx
+++ b/src/Time/light.cxx
@@ -66,7 +66,12 @@ SG_USING_STD(string);
 
 // Constructor
 FGLight::FGLight ()
-    : _prev_sun_angle(-9999.0),
+    : _ambient_tbl( NULL ),
+      _diffuse_tbl( NULL ),
+      _specular_tbl( NULL ),
+      _sky_tbl( NULL ),
+      _prev_sun_angle(-9999.0),
+      _sun_rotation( 0.0 ),
       _dt_total( 0.0 )
 {
 }
@@ -74,6 +79,10 @@ FGLight::FGLight ()
 // Destructor
 FGLight::~FGLight ()
 {
+    delete _ambient_tbl;
+    delete _diffuse_tbl;
+    delete _specular_tbl;
+    delete _sky_tbl;
 }
 
 
@@ -109,6 +118,13 @@ void FGLight::reinit () {
     _prev_sun_angle = -9999.0;
     _dt_total = 0;
 
+    delete _ambient_tbl;
+    delete _diffuse_tbl;
+    delete _specular_tbl;
+    delete _sky_tbl;
+
+    init();
+
     fgUpdateSunPos();
     fgUpdateMoonPos();
 
@@ -117,34 +133,38 @@ void FGLight::reinit () {
 }
 
 void FGLight::bind () {
+    SGPropertyNode *prop = globals->get_props();
+    prop->tie("/sim/time/sun-angle-rad",SGRawValuePointer<double>(&_sun_angle));
 }
 
 void FGLight::unbind () {
+    SGPropertyNode *prop = globals->get_props();
+    prop->untie("/sim/time/sun-angle-rad");
 }
 
 
 // update lighting parameters based on current sun position
 void FGLight::update( double dt ) {
 
-    update_adj_fog_color();
-
     _dt_total += dt;
-    if (_dt_total > 0.5) {
+    if (_dt_total >= 0.5) {
         _dt_total -= 0.5;
         fgUpdateSunPos();
         fgUpdateMoonPos();
     }
 
+    update_adj_fog_color();
+
     if (_prev_sun_angle != _sun_angle) {
+       _prev_sun_angle = _sun_angle;
         update_sky_color();
-        _prev_sun_angle = _sun_angle;
     }
 }
 
 void FGLight::update_sky_color () {
     // if the 4th field is 0.0, this specifies a direction ...
-    const GLfloat white[4]          = { 1.0,  1.0,  1.0,  1.0 };
-    const GLfloat base_sky_color[4] = { 0.39, 0.50, 0.74, 1.0 };
+    // const GLfloat white[4]          = { 1.0,  1.0,  1.0,  1.0 };
+    const GLfloat base_sky_color[4] = { 0.31, 0.43, 0.69, 1.0 };
     const GLfloat base_fog_color[4] = { 0.84, 0.87, 1.0,  1.0 };
 
     SG_LOG( SG_EVENT, SG_INFO, "Updating light parameters." );
@@ -228,17 +248,17 @@ void FGLight::update_adj_fog_color () {
     // 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);
+       return;
     }
 
     if ( heading < -2.0 * SGD_2PI || heading > 2.0 * SGD_2PI ) {
        SG_LOG( SG_EVENT, SG_ALERT, "Heading rotation bad = " << heading );
-       exit(-1);
+       return;
     }
 
     if ( heading_offset < -2.0 * SGD_2PI || heading_offset > 2.0 * SGD_2PI ) {
        SG_LOG( SG_EVENT, SG_ALERT, "Heading offset bad = " << heading_offset );
-       exit(-1);
+       return;
     }
 
     double rotation;
@@ -277,6 +297,9 @@ void FGLight::update_adj_fog_color () {
     float avf = 0.87 - (45000 - av) / 83333.33;
     float sif = 0.5 - cos(_sun_angle*2)/2;
 
+    if (sif < 1e-4)
+       sif = 1e-4;
+
     float rf1 = fabs((rotation - SGD_PI) / SGD_PI);             // 0.0 .. 1.0
     float rf2 = avf * pow(rf1 * rf1, 1/sif);
     float rf3 = 0.94 - rf2;