Added some OSG headers for the correct evaluation of the OSG_VERSION_LESS_THAN macro.

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

diff --git a/simgear/scene/sky/cloud.hxx b/simgear/scene/sky/cloud.hxx
index fa65a6adedcc05cbfef8d3bde5c8b1afe8f20a02..fb4cf3c55fe06e408dd292fb6c7d3ab594deaf66 100644 (file)
--- a/simgear/scene/sky/cloud.hxx
+++ b/simgear/scene/sky/cloud.hxx
@@ -33,7 +33,6 @@
 #include <simgear/structure/SGReferenced.hxx>
 
 #include <string>
-using std::string;
 
 #include <osg/ref_ptr>
 #include <osg/Array>
@@ -74,7 +73,7 @@ public:
      * Constructor
      * @param tex_path the path to the set of cloud textures
      */
-    SGCloudLayer( const string &tex_path );
+    SGCloudLayer( const std::string &tex_path );
 
     /**
      * Destructor
@@ -141,16 +140,16 @@ public:
     void setCoverage (Coverage coverage);
 
     /** get coverage as string */
-    const string & getCoverageString() const;
+    const std::string & getCoverageString() const;
 
     /** get coverage as string */
-    static const string & getCoverageString( Coverage coverage );
+    static const std::string & getCoverageString( Coverage coverage );
 
     /** get coverage type from string */
     static Coverage getCoverageType( const std::string & coverage );
 
     /** set coverage as string */
-    void setCoverageString( const string & coverage );
+    void setCoverageString( const std::string & coverage );
 
     /**
      * set the cloud movement direction
@@ -215,20 +214,18 @@ public:
      * orientation.
      * @param p position vector
      * @param up the local up vector
-     * @param lon specifies a rotation about the Z axis
-     * @param lat specifies a rotation about the new Y axis
-     * @param spin specifies a rotation about the new Z axis
-     *        (and orients the sunrise/set effects)
+     * @param lon TODO
+     * @param lat TODO
+     * @param alt TODO
      * @param dt the time elapsed since the last call
      */
-    bool reposition( const SGVec3f& p, const SGVec3f& up,
+    bool reposition( const SGVec3f& p,
+                     const SGVec3f& up,
                      double lon, double lat, double alt,
                      double dt = 0.0 );
 
     osg::Switch* getNode() { return cloud_root.get(); }
 
-    static bool enable_bump_mapping;
-
     /** return the 3D layer cloud associated with this 2D layer */
     SGCloudField *get_layer3D(void) { return layer3D; }