simgear/scene/sky/sky.cxx: Include sg_inlines.h with simgear/ prefix as all other...

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

diff --git a/simgear/scene/sky/cloudfield.hxx b/simgear/scene/sky/cloudfield.hxx
index f844a98df85b4b739794718e294fbc6164366d32..38fa9e95a3bc73b125efbd8e746990d154042ea2 100644 (file)
--- a/simgear/scene/sky/cloudfield.hxx
+++ b/simgear/scene/sky/cloudfield.hxx
@@ -23,7 +23,6 @@
 #ifndef _CLOUDFIELD_HXX
 #define _CLOUDFIELD_HXX
 
-#include <plib/sg.h>
 #include <simgear/compiler.h>
 #include <vector>
 
@@ -44,6 +43,7 @@ namespace osg
 
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/structure/Singleton.hxx>
+#include <simgear/math/SGMath.hxx>
 
 using std::vector;
 
@@ -58,7 +58,7 @@ private:
        class Cloud  {
        public:
                SGNewCloud      *aCloud;
-               sgVec3          pos;
+               SGVec3f         pos;
                bool            visible;
        };
 
@@ -69,7 +69,7 @@ private:
         static const int QUADTREE_SIZE = 32;
 
        // this is a relative position only, with that we can move all clouds at once
-       sgVec3 relative_position;
+       SGVec3f relative_position;
         //     double lon, lat;
 
         osg::ref_ptr<osg::Group> field_root;
@@ -82,8 +82,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>
@@ -119,17 +119,16 @@ public:
        // visibility distance for clouds in meters
        static float CloudVis;
 
-       static sgVec3 view_vec, view_X, view_Y;
+       static SGVec3f 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 +136,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();