Merge branch 'ehofman/sound'

[simgear.git] / simgear / scene / sky / sky.hxx

diff --git a/simgear/scene/sky/sky.hxx b/simgear/scene/sky/sky.hxx
index af78a4e9d8cb37d9c2015bdd7988684420fbf7c0..28678041ac820ea441acd39c7b64a6f63d738f84 100644 (file)
--- a/simgear/scene/sky/sky.hxx
+++ b/simgear/scene/sky/sky.hxx
@@ -45,6 +45,7 @@
 #include <osg/Switch>
 
 #include <simgear/ephemeris/ephemeris.hxx>
+#include <simgear/math/SGMath.hxx>
 
 #include <simgear/scene/sky/cloud.hxx>
 #include <simgear/scene/sky/dome.hxx>
@@ -56,8 +57,10 @@ using std::vector;
 
 
 typedef struct {
-       SGVec3f view_pos, zero_elev, view_up;
-       double lon, lat, alt, spin;
+        SGVec3d pos;
+        SGGeod pos_geod;
+        SGQuatd ori;
+        double spin;
        double gst;
        double sun_dist;
        double moon_dist;
@@ -65,7 +68,9 @@ typedef struct {
 } SGSkyState;
 
 typedef struct {
-       SGVec3f sky_color, fog_color;
+       SGVec3f sky_color;
+        SGVec3f adj_sky_color;
+        SGVec3f fog_color;
        SGVec3f cloud_color;
        double sun_angle, moon_angle;
 } SGSkyColor;
@@ -364,6 +369,11 @@ public:
      */
     inline SGVec4f get_sun_color() { return oursun->get_color(); }
 
+    /**
+     * Get the current scene color
+     */
+    inline SGVec4f get_scene_color() { return oursun->get_scene_color(); }
+
     /**
      * Add a cloud layer.
      *