Merge branch 'jmt/acinclude'

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

diff --git a/src/Environment/fgclouds.hxx b/src/Environment/fgclouds.hxx
index 71fc0ecbcd05ab93e314a326f47fc0fddf61055b..8a956d74829c05b05c9f8ae973ce731bae7e8a18 100644 (file)
--- a/src/Environment/fgclouds.hxx
+++ b/src/Environment/fgclouds.hxx
@@ -34,45 +34,34 @@
 
 using std::string;
 
-class SGNewCloud;
+class SGSampleGroup;
 class SGCloudField;
+class SGNewCloud;
 class FGMetar;
-class FGEnvironmentCtrl;
+//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 buildMETAR(void);
-
-       void buildScenario( const string& scenario );
+       double buildCloud(SGPropertyNode *cloud_def_root, SGPropertyNode *box_def_root, const string& name, double grid_z_rand, SGCloudField *layer);
+       void buildLayer(int iLayer, const string& name, double alt, double coverage);
 
-       void setLayer( int iLayer, float alt_m, const string& coverage, const string& layer_type );
-
-       void update_metar_properties( const FGMetar *m );
-
-       void update_env_config ();
+       void buildCloudLayers(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;
 
 public:
-       FGClouds(FGEnvironmentCtrl * controller);
+       FGClouds();
        ~FGClouds();
 
-       void build(void);
-
        void init(void);
 
        int get_update_event(void) const;
        void set_update_event(int count);
-
+        bool get_3dClouds() const;
+        void set_3dClouds(bool enable);
 };
 
 #endif // _FGCLOUDS_HXX