Merge branch 'ehofman/sound'

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

diff --git a/simgear/scene/sky/cloudfield.hxx b/simgear/scene/sky/cloudfield.hxx
index f844a98df85b4b739794718e294fbc6164366d32..1b2f97f187bdaf5ed5a76bd4cdab2de803179e8f 100644 (file)
--- a/simgear/scene/sky/cloudfield.hxx
+++ b/simgear/scene/sky/cloudfield.hxx
@@ -83,7 +83,8 @@ private:
        double deltax, deltay, alt;
         double last_course;
         sgSphere field_sphere;
-       float   last_coverage;
+       float last_coverage;
+        float coverage;
         SGGeoc cld_pos;
         int reposition_count;
         struct CloudFog : public simgear::Singleton<CloudFog>
@@ -121,15 +122,14 @@ public:
 
        static sgVec3 view_vec, view_X, view_Y;
 
-       static float coverage;
         static float view_distance;
         static double timer_dt;
        static float fieldSize;
        
         bool defined3D;
 
-       static float getCoverage(void) { return coverage; }
-       static void setCoverage(float coverage) { coverage = coverage; }
+       float getCoverage(void) { return coverage; }
+       void setCoverage(float c) { coverage = c; }
 
         static float getVisRange(void) { return view_distance; }
         static void setVisRange(float d) { view_distance = d; }
@@ -137,9 +137,6 @@ public:
         void applyCoverage(void);
         void applyVisRange(void);
         
-        typedef std::map<std::string, osg::ref_ptr<osg::StateSet> > StateSetMap;
-        static StateSetMap cloudTextureMap;
-
         static osg::Fog* getFog()
         {
                 return CloudFog::instance()->fog.get();