Merge branch 'ehofman/sound'

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

diff --git a/simgear/scene/sky/oursun.hxx b/simgear/scene/sky/oursun.hxx
index ceed47e209391119e7d4a5ab7342056232586218..3414c862656fd7078b44e63b6c8d76a7257cc32c 100644 (file)
--- a/simgear/scene/sky/oursun.hxx
+++ b/simgear/scene/sky/oursun.hxx
@@ -42,6 +42,7 @@ class SGSun : public SGReferenced {
     osg::ref_ptr<osg::MatrixTransform> sun_transform;
 
     osg::ref_ptr<osg::Vec4Array> sun_cl;
+    osg::ref_ptr<osg::Vec4Array> scene_cl;
     osg::ref_ptr<osg::Vec4Array> ihalo_cl;
     osg::ref_ptr<osg::Vec4Array> ohalo_cl;
 
@@ -75,12 +76,12 @@ public:
     // declination, offset by our current position (p) so that it
     // appears fixed at a great distance from the viewer.  Also add in
     // an optional rotation (i.e. for the current time of day.)
-    bool reposition( const SGVec3f& p, double angle,
-                    double rightAscension, double declination,
+    bool reposition( double rightAscension, double declination,
                     double sun_dist, double lat, double alt_asl, double sun_angle );
 
     // retrun the current color of the sun
     SGVec4f get_color();
+    SGVec4f get_scene_color();
 };