X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FEnvironment%2Ffgclouds.cxx;h=e7273a7148ed6b44c05c13c74d6dba536c6d0431;hb=43bc61d1318abd52de6c723dbeef0e4058b1a823;hp=6bd1d5aa7caaeb1492ccd7ec5a3dff81d8315c47;hpb=94828f8acd201d9b2170666b57fb2b3169ba94b0;p=flightgear.git

diff --git a/src/Environment/fgclouds.cxx b/src/Environment/fgclouds.cxx
index 6bd1d5aa7..e7273a714 100644
--- a/src/Environment/fgclouds.cxx
+++ b/src/Environment/fgclouds.cxx
@@ -30,7 +30,7 @@
 #include <simgear/constants.h>
 #include <simgear/sound/soundmgr_openal.hxx>
 #include <simgear/scene/sky/sky.hxx>
-#include <simgear/environment/visual_enviro.hxx>
+//#include <simgear/environment/visual_enviro.hxx>
 #include <simgear/scene/sky/cloudfield.hxx>
 #include <simgear/scene/sky/newcloud.hxx>
 #include <simgear/structure/commands.hxx>
@@ -45,9 +45,14 @@
 
 extern SGSky *thesky;
 
+static bool do_delete_3Dcloud (const SGPropertyNode *arg);
+static bool do_move_3Dcloud (const SGPropertyNode *arg);
+static bool do_add_3Dcloud (const SGPropertyNode *arg);
 
 FGClouds::FGClouds() :
+#if 0
     snd_lightning(0),
+#endif
     clouds_3d_enabled(false),
     index(0)
 {
@@ -68,6 +73,7 @@ void FGClouds::set_update_event(int count) {
 }
 
 void FGClouds::Init(void) {
+#if 0
 	if( snd_lightning == NULL ) {
 		snd_lightning = new SGSoundSample("Sounds/thunder.wav", SGPath());
 		snd_lightning->set_max_dist(7000.0f);
@@ -75,8 +81,8 @@ void FGClouds::Init(void) {
 		SGSoundMgr *smgr = globals->get_soundmgr();
 		SGSampleGroup *sgr = smgr->find("weather", true);
 		sgr->add( snd_lightning, "thunder" );
-		sgEnviro.set_sampleGroup( sgr );
 	}
+#endif
 
 	globals->get_commands()->addCommand("add-cloud", do_add_3Dcloud);
 	globals->get_commands()->addCommand("del-cloud", do_delete_3Dcloud);
@@ -129,7 +135,7 @@ double FGClouds::buildCloud(SGPropertyNode *cloud_def_root, SGPropertyNode *box_
 			double c = abox->getDoubleValue("count", 5);
 			int count = (int) (c + (sg_random() - 0.5) * c);
 
-			extent = max(w*w, extent);
+			extent = std::max(w*w, extent);
 
 			for (int j = 0; j < count; j++)	{
 
@@ -155,7 +161,7 @@ double FGClouds::buildCloud(SGPropertyNode *cloud_def_root, SGPropertyNode *box_
 				y = w * (y - 0.5) + pos[1]; // E/W
 				z = h * z + pos[2]; // Up/Down. pos[2] is the cloudbase
 
-				SGVec3f newpos = SGVec3f(x, y, z);
+				//SGVec3f newpos = SGVec3f(x, y, z);
 				SGNewCloud cld = SGNewCloud(texture_root, cld_def);
 
 				//layer->addCloud(newpos, cld.genCloud());
@@ -408,7 +414,9 @@ bool FGClouds::get_3dClouds() const
 	 float lon = arg->getFloatValue("lon-deg", 0.0f);
 	 float lat = arg->getFloatValue("lat-deg", 0.0f);
 	 float alt = arg->getFloatValue("alt-ft",  0.0f);
+	 float x   = arg->getFloatValue("x-offset-m",  0.0f);
+	 float y   = arg->getFloatValue("y-offset-m",  0.0f);
 
    SGCloudField *layer = thesky->get_cloud_layer(l)->get_layer3D();
-	 return layer->repositionCloud(i, lon, lat, alt);
+	 return layer->repositionCloud(i, lon, lat, alt, x, y);
  }