Merge branch 'next' of gitorious.org:fg/flightgear into next

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

diff --git a/src/Environment/fgclouds.cxx b/src/Environment/fgclouds.cxx
index ccd21e0cec45317a5336747ff1b576630d9ff066..d5db1ed204b7c3a78e37ca1e8bba0426f200dac4 100644 (file)
--- 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>
@@ -38,16 +38,20 @@
 #include <simgear/props/props_io.hxx>
 
 #include <Main/globals.hxx>
-#include <Airports/simple.hxx>
 #include <Main/util.hxx>
+#include <Viewer/renderer.hxx>
+#include <Airports/simple.hxx>
 
 #include "fgclouds.hxx"
 
-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 +72,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 +80,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 +134,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,8 +160,8 @@ 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);
-                               SGNewCloud cld = SGNewCloud(texture_root, cld_def);
+                               //SGVec3f newpos = SGVec3f(x, y, z);
+                               SGNewCloud cld(texture_root, cld_def);
 
                                //layer->addCloud(newpos, cld.genCloud());
                                layer->addCloud(lon, lat, z, x, y, index++, cld.genCloud());
@@ -176,6 +181,8 @@ void FGClouds::buildLayer(int iLayer, const string& name, double coverage) {
        int CloudVarietyCount = 0;
        double totalCount = 0.0;
 
+    SGSky* thesky = globals->get_renderer()->getSky();
+    
        SGPropertyNode *cloud_def_root = fgGetNode("/environment/cloudlayers/clouds", false);
        SGPropertyNode *box_def_root   = fgGetNode("/environment/cloudlayers/boxes", false);
        SGPropertyNode *layer_def_root = fgGetNode("/environment/cloudlayers/layers", false);
@@ -268,6 +275,7 @@ void FGClouds::buildCloudLayers(void) {
        double cumulus_base = 122.0 * (temperature_degc - dewpoint_degc);
        double stratus_base = 100.0 * (100.0 - rel_humidity) * SG_FEET_TO_METER;
 
+    SGSky* thesky = globals->get_renderer()->getSky();
        for(int iLayer = 0 ; iLayer < thesky->get_cloud_layer_count(); iLayer++) {
                SGPropertyNode *cloud_root = fgGetNode("/environment/clouds/layer", iLayer, true);
 
@@ -357,12 +365,18 @@ 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);
+
+   SGSky* thesky = globals->get_renderer()->getSky();
+   SGCloudField *layer = thesky->get_cloud_layer(l)->get_layer3D();
+   SGNewCloud cld(texture_root, arg);
+   bool success = layer->addCloud(lon, lat, alt, x, y, index, cld.genCloud());
 
    // Adding a 3D cloud immediately makes this layer 3D.
    thesky->get_cloud_layer(l)->set_enable3dClouds(true);
-   SGCloudField *layer = thesky->get_cloud_layer(l)->get_layer3D();
-   SGNewCloud cld = SGNewCloud(texture_root, arg);
-        return layer->addCloud(lon, lat, alt, index, cld.genCloud());
+
+   return success;
  }
 
  /**
@@ -380,6 +394,7 @@ bool FGClouds::get_3dClouds() const
    int l = arg->getIntValue("layer", 0);
    int i = arg->getIntValue("index", 0);
 
+   SGSky* thesky = globals->get_renderer()->getSky();
    SGCloudField *layer = thesky->get_cloud_layer(l)->get_layer3D();
         return layer->deleteCloud(i);
  }
@@ -398,11 +413,14 @@ bool FGClouds::get_3dClouds() const
  {
    int l = arg->getIntValue("layer", 0);
    int i = arg->getIntValue("index", 0);
-
+      SGSky* thesky = globals->get_renderer()->getSky();
+     
         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);
  }