Development for two new features:

[flightgear.git] / src / Environment / fgclouds.hxx

diff --git a/src/Environment/fgclouds.hxx b/src/Environment/fgclouds.hxx
index 8a14f7f6ff023556c2b09063cb7db69aa695e651..d991893331b9e4d373c744d06a52e1f321efac9f 100644 (file)
--- a/src/Environment/fgclouds.hxx
+++ b/src/Environment/fgclouds.hxx
@@ -32,7 +32,7 @@
 
 #include <string>
 
-SG_USING_STD(string);
+using std::string;
 
 class SGNewCloud;
 class SGCloudField;
@@ -42,10 +42,10 @@ class FGEnvironmentCtrl;
 class FGClouds {
 
 private:
-       SGNewCloud *buildCloud(SGPropertyNode *cloud_def_root, const string& name);
-       void buildLayer(SGCloudField *layer, const string& name, double alt, double coverage);
+void buildCloud(SGPropertyNode *cloud_def_root, SGPropertyNode *box_def_root, const string& name, sgVec3 pos, SGCloudField *layer);
+       void buildLayer(int iLayer, const string& name, double alt, double coverage);
 
-       void buildMETAR(void);
+       void buildCloudLayers(void);
 
        void buildScenario( const string& scenario );
 
@@ -55,24 +55,30 @@ private:
 
        void update_env_config ();
 
+        void build(void);
+
        int update_event;
        SGSoundSample *snd_lightning;
        FGEnvironmentCtrl * _controller;
        float station_elevation_ft;
-    string last_scenario;
-    SGPropertyNode *last_env_config, *last_env_clouds;
+        bool clouds_3d_enabled;
+        string last_scenario;
+        string scenario;
+        SGPropertyNode *last_env_config, *last_env_clouds;
 
 public:
        FGClouds(FGEnvironmentCtrl * controller);
        ~FGClouds();
 
-       void build(void);
-
        void init(void);
 
+        void set_scenario(const char * sc);
+        const char * get_scenario(void) const;
+
        int get_update_event(void) const;
        void set_update_event(int count);
-
+        bool get_3dClouds() const;
+        void set_3dClouds(bool enable);
 };
 
 #endif // _FGCLOUDS_HXX