Merge branch 'ehofman/sound'

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

diff --git a/simgear/scene/sky/cloud.hxx b/simgear/scene/sky/cloud.hxx
index 81c9e038b624622ae3fa8a6c61e45cf834197ea1..4b282a6164ca17842f5aca1354db08529029d5f7 100644 (file)
--- a/simgear/scene/sky/cloud.hxx
+++ b/simgear/scene/sky/cloud.hxx
@@ -32,8 +32,8 @@
 #include <simgear/math/SGMath.hxx>
 #include <simgear/structure/SGReferenced.hxx>
 
-#include STL_STRING
-SG_USING_STD(string);
+#include <string>
+using std::string;
 
 #include <osg/ref_ptr>
 #include <osg/Array>
@@ -162,6 +162,9 @@ public:
     /** build the cloud object */
     void rebuild();
 
+    /** Enable/disable 3D clouds in this layer */
+    void set_enable3dClouds(bool enable);
+
     /**
      * repaint the cloud colors based on the specified fog_color
      * @param fog_color the fog color
@@ -183,16 +186,18 @@ public:
                      double lon, double lat, double alt,
                      double dt = 0.0 );
 
-    osg::Switch* getNode() { return layer_root.get(); }
+    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; }
+
 protected:
     void setTextureOffset(const osg::Vec2& offset);
 private:
 
+    osg::ref_ptr<osg::Switch> cloud_root;
     osg::ref_ptr<osg::Switch> layer_root;
     osg::ref_ptr<osg::Group> group_top, group_bottom;
     osg::ref_ptr<osg::MatrixTransform> layer_transform;
@@ -225,6 +230,7 @@ private:
     osg::Vec2 base;
 
     SGCloudField *layer3D;
+
 };
 
 #endif // _SG_CLOUD_HXX_