Give the FGAirport class a sane filename.

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

diff --git a/src/Environment/fgclouds.cxx b/src/Environment/fgclouds.cxx
index d5d9fbbc0302951e69d7149ddd68ca4b6c9e4946..f19d9d6fc5738255c943cf2bb81586a6fd688ce7 100644 (file)
--- a/src/Environment/fgclouds.cxx
+++ b/src/Environment/fgclouds.cxx
@@ -25,6 +25,7 @@
 #endif
 
 #include <cstring>
+#include <cstdio>
 #include <Main/fg_props.hxx>
 
 #include <simgear/constants.h>
@@ -34,17 +35,22 @@
 #include <simgear/scene/sky/cloudfield.hxx>
 #include <simgear/scene/sky/newcloud.hxx>
 #include <simgear/structure/commands.hxx>
-#include <simgear/math/sg_random.h>
 #include <simgear/props/props_io.hxx>
 
 #include <Main/globals.hxx>
-#include <Airports/simple.hxx>
 #include <Main/util.hxx>
+#include <Viewer/renderer.hxx>
+#include <Airports/airport.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);
 
+// RNG seed to ensure cloud synchronization across multi-process
+// deployments
+static mt seed;
 
 FGClouds::FGClouds() :
 #if 0
@@ -81,6 +87,8 @@ void FGClouds::Init(void) {
        }
 #endif
 
+       mt_init_time_10(&seed);
+
        globals->get_commands()->addCommand("add-cloud", do_add_3Dcloud);
        globals->get_commands()->addCommand("del-cloud", do_delete_3Dcloud);
        globals->get_commands()->addCommand("move-cloud", do_move_3Dcloud);
@@ -107,9 +115,9 @@ double FGClouds::buildCloud(SGPropertyNode *cloud_def_root, SGPropertyNode *box_
                        return 0.0;
        }
 
-       double x = sg_random() * SGCloudField::fieldSize - (SGCloudField::fieldSize / 2.0);
-       double y = sg_random() * SGCloudField::fieldSize - (SGCloudField::fieldSize / 2.0);
-       double z = grid_z_rand * (sg_random() - 0.5);
+       double x = mt_rand(&seed) * SGCloudField::fieldSize - (SGCloudField::fieldSize / 2.0);
+       double y = mt_rand(&seed) * SGCloudField::fieldSize - (SGCloudField::fieldSize / 2.0);
+       double z = grid_z_rand * (mt_rand(&seed) - 0.5);
 
        float lon = fgGetNode("/position/longitude-deg", false)->getFloatValue();
        float lat = fgGetNode("/position/latitude-deg", false)->getFloatValue();
@@ -130,9 +138,9 @@ double FGClouds::buildCloud(SGPropertyNode *cloud_def_root, SGPropertyNode *box_
                        int vdist = abox->getIntValue("vdist", 1);
 
                        double c = abox->getDoubleValue("count", 5);
-                       int count = (int) (c + (sg_random() - 0.5) * c);
+                       int count = (int) (c + (mt_rand(&seed) - 0.5) * c);
 
-                       extent = max(w*w, extent);
+                       extent = std::max(w*w, extent);
 
                        for (int j = 0; j < count; j++) {
 
@@ -145,21 +153,21 @@ double FGClouds::buildCloud(SGPropertyNode *cloud_def_root, SGPropertyNode *box_
 
                                for (int k = 0; k < hdist; k++)
                                {
-                                       x += (sg_random() / hdist);
-                                       y += (sg_random() / hdist);
+                                       x += (mt_rand(&seed) / hdist);
+                                       y += (mt_rand(&seed) / hdist);
                                }
 
                                for (int k = 0; k < vdist; k++)
                                {
-                                       z += (sg_random() / vdist);
+                                       z += (mt_rand(&seed) / vdist);
                                }
 
                                x = w * (x - 0.5) + pos[0]; // N/S
                                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, &seed);
 
                                //layer->addCloud(newpos, cld.genCloud());
                                layer->addCloud(lon, lat, z, x, y, index++, cld.genCloud());
@@ -179,6 +187,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);
@@ -237,7 +247,7 @@ void FGClouds::buildLayer(int iLayer, const string& name, double coverage) {
        double cov = coverage * SGCloudField::fieldSize * SGCloudField::fieldSize;
 
        while (cov > 0.0f) {
-               double choice = sg_random();
+               double choice = mt_rand(&seed);
 
                for(int i = 0; i < CloudVarietyCount ; i ++) {
                        choice -= tCloudVariety[i].count * totalCount;
@@ -271,6 +281,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);
 
@@ -363,10 +374,10 @@ bool FGClouds::get_3dClouds() const
         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 = SGNewCloud(texture_root, arg);
-        bool success = layer->addCloud(lon, lat, alt, x, y, index, cld.genCloud());
+   SGNewCloud cld(texture_root, arg, &seed);
+   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);
@@ -389,6 +400,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);
  }
@@ -407,7 +419,8 @@ 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);