Sync. w. JSBSim CVS

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

diff --git a/src/Time/light.hxx b/src/Time/light.hxx
index 9517adb8191da47fe353f2385e8eae153bbbb2f8..ffffa5ab28c51c779c22b227ba0f5a9a0e1ed7cd 100644 (file)
--- a/src/Time/light.hxx
+++ b/src/Time/light.hxx
@@ -34,19 +34,10 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include <simgear/compiler.h>
 
-#include SG_GL_H
-
-#include <plib/sg.h>                   // plib include
-
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/math/interpolater.hxx>
-#include <simgear/math/point3d.hxx>
 
 
 // Define a structure containing the global lighting parameters
@@ -66,7 +57,7 @@ private:
      */
 
     // in geocentric coordinates
-    double _sun_lon, _sun_gc_lat;
+    double _sun_lon, _sun_lat;
     double _moon_lon, _moon_gc_lat;
 
     // in cartesian coordiantes
@@ -133,6 +124,7 @@ public:
     inline const SGVec4f& sky_color () const { return _sky_color; }
     inline const SGVec4f& cloud_color () const { return _cloud_color; }
     inline const SGVec4f& adj_fog_color () const { return _adj_fog_color; }
+    inline const SGVec4f& adj_sky_color () const { return _adj_sky_color; }
 
 
     // Sun related functions
@@ -146,8 +138,8 @@ public:
     inline double get_sun_lon () const { return _sun_lon; }
     inline void set_sun_lon (double l) { _sun_lon = l; }
 
-    inline double get_sun_gc_lat () const { return _sun_gc_lat; }
-    inline void set_sun_gc_lat (double l) { _sun_gc_lat = l; }
+    inline double get_sun_lat () const { return _sun_lat; }
+    inline void set_sun_lat (double l) { _sun_lat = l; }
 
     inline const SGVec3d& get_sunpos () const { return _sunpos; }
     inline void set_sunpos (const SGVec3d& p) { _sunpos = p; }