toggle fullscreen: also adapt GUI plane when resizing

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

diff --git a/src/Environment/fgclouds.cxx b/src/Environment/fgclouds.cxx
index a6fd2c669f008e0bf74207612ff8b102e58a7621..c77eb284b465b6ab8429924220dbf920a4114100 100644 (file)
--- a/src/Environment/fgclouds.cxx
+++ b/src/Environment/fgclouds.cxx
@@ -34,13 +34,12 @@
 #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 <Main/renderer.hxx>
-#include <Airports/simple.hxx>
 #include <Main/util.hxx>
+#include <Viewer/renderer.hxx>
+#include <Airports/simple.hxx>
 
 #include "fgclouds.hxx"
 
@@ -56,6 +55,7 @@ FGClouds::FGClouds() :
     index(0)
 {
        update_event = 0;
+       mt_init_time_10(&seed);
 }
 
 FGClouds::~FGClouds()
@@ -109,9 +109,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();
@@ -132,7 +132,7 @@ 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 = std::max(w*w, extent);
 
@@ -147,13 +147,13 @@ 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
@@ -161,7 +161,7 @@ double FGClouds::buildCloud(SGPropertyNode *cloud_def_root, SGPropertyNode *box_
                                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);
+                               SGNewCloud cld(texture_root, cld_def);
 
                                //layer->addCloud(newpos, cld.genCloud());
                                layer->addCloud(lon, lat, z, x, y, index++, cld.genCloud());
@@ -241,7 +241,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;
@@ -370,8 +370,8 @@ bool FGClouds::get_3dClouds() const
 
    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);
+   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);