- adjusted for no-value constructor for FGPanel

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

diff --git a/src/Time/light.cxx b/src/Time/light.cxx
index be46d20ca43271852a248248a4fc8a28a70801b4..7202a3670849c1c3d8e67dee1effee508deb13d2 100644 (file)
--- a/src/Time/light.cxx
+++ b/src/Time/light.cxx
@@ -31,7 +31,7 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
+#include <GL/gl.h>
 
 #include <simgear/compiler.h>
 
@@ -52,7 +52,7 @@ SG_USING_STD(string);
 #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>
@@ -71,16 +71,16 @@ 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 sky = path;
     sky.append( "Lighting/sky" );
 
     // initialize ambient table
@@ -107,19 +107,19 @@ void fgLIGHT::Update( void ) {
 
     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 );
     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 );
 
@@ -160,7 +160,7 @@ 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
@@ -178,12 +178,12 @@ void fgLIGHT::UpdateAdjFog( void ) {
     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;