X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FEnvironment%2Ffgclouds.hxx;h=d991893331b9e4d373c744d06a52e1f321efac9f;hb=c6f88e5b9be767d93fd34f3b01c0e949fbd0044b;hp=ae555b3631481e30f33554b8270d7685d86e9b0b;hpb=9090fb5bf4b1dc6c19299ca94894cc7c0f73db08;p=flightgear.git

diff --git a/src/Environment/fgclouds.hxx b/src/Environment/fgclouds.hxx
index ae555b363..d99189333 100644
--- a/src/Environment/fgclouds.hxx
+++ b/src/Environment/fgclouds.hxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 //
 #ifndef _FGCLOUDS_HXX
@@ -30,9 +30,9 @@
 #include <simgear/sound/soundmgr_openal.hxx>
 #include <Main/fg_props.hxx>
 
-#include STL_STRING
+#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 );
 
@@ -53,26 +53,32 @@ private:
 
 	void update_metar_properties( const FGMetar *m );
 
-	void FGClouds::update_env_config ();
+	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