X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FEnvironment%2Ffgclouds.cxx;h=58653e05364c3dce780ab2695d3f308743ff8406;hb=c152e7f118881183199285a8b1a9e33d3cbff750;hp=ccd21e0cec45317a5336747ff1b576630d9ff066;hpb=38af5a2a072f8cb218612df6347a22686a9cf022;p=flightgear.git diff --git a/src/Environment/fgclouds.cxx b/src/Environment/fgclouds.cxx index ccd21e0ce..58653e053 100644 --- a/src/Environment/fgclouds.cxx +++ b/src/Environment/fgclouds.cxx @@ -24,30 +24,31 @@ # include "config.h" #endif +#include "fgclouds.hxx" + #include +#include #include
#include #include #include -#include +//#include #include #include #include -#include #include #include
-#include #include
+#include +#include -#include "fgclouds.hxx" - -extern SGSky *thesky; - +// RNG seed to ensure cloud synchronization across multi-process +// deployments +static mt seed; FGClouds::FGClouds() : - snd_lightning(0), clouds_3d_enabled(false), index(0) { @@ -56,6 +57,10 @@ FGClouds::FGClouds() : FGClouds::~FGClouds() { + globals->get_commands()->removeCommand("add-cloud"); + globals->get_commands()->removeCommand("del-cloud"); + globals->get_commands()->removeCommand("move-cloud"); + } int FGClouds::get_update_event(void) const { @@ -67,24 +72,19 @@ void FGClouds::set_update_event(int count) { buildCloudLayers(); } -void FGClouds::Init(void) { - if( snd_lightning == NULL ) { - snd_lightning = new SGSoundSample("Sounds/thunder.wav", SGPath()); - snd_lightning->set_max_dist(7000.0f); - snd_lightning->set_reference_dist(3000.0f); - SGSoundMgr *smgr = globals->get_soundmgr(); - SGSampleGroup *sgr = smgr->find("weather", true); - sgr->add( snd_lightning, "thunder" ); - sgEnviro.set_sampleGroup( sgr ); - } +void FGClouds::Init(void) +{ + 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); + globals->get_commands()->addCommand("add-cloud", this, &FGClouds::add3DCloud); + globals->get_commands()->addCommand("del-cloud", this, &FGClouds::delete3DCloud); + globals->get_commands()->addCommand("move-cloud", this, &FGClouds::move3DCloud); } // Build an invidual cloud. Returns the extents of the cloud for coverage calculations -double FGClouds::buildCloud(SGPropertyNode *cloud_def_root, SGPropertyNode *box_def_root, const string& name, double grid_z_rand, SGCloudField *layer) { +double FGClouds::buildCloud(SGPropertyNode *cloud_def_root, SGPropertyNode *box_def_root, + const std::string& name, double grid_z_rand, SGCloudField *layer) +{ SGPropertyNode *box_def=NULL; SGPropertyNode *cld_def=NULL; double extent = 0.0; @@ -104,9 +104,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(); @@ -127,9 +127,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++) { @@ -142,21 +142,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()); @@ -176,6 +176,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); @@ -216,11 +218,10 @@ void FGClouds::buildLayer(int iLayer, const string& name, double coverage) { double count = acloud->getDoubleValue("count", 1.0); tCloudVariety[CloudVarietyCount].count = count; int variety = 0; - cloud_name = cloud_name + "-%d"; char variety_name[50]; do { variety++; - snprintf(variety_name, sizeof(variety_name) - 1, cloud_name.c_str(), variety); + snprintf(variety_name, sizeof(variety_name) - 1, "%s-%d", cloud_name.c_str(), variety); } while( box_def_root->getChild(variety_name, 0, false) ); totalCount += count; @@ -234,7 +235,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; @@ -268,6 +269,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); @@ -344,8 +346,7 @@ bool FGClouds::get_3dClouds() const * (Various) - cloud definition properties. See README.3DClouds * */ - static bool - do_add_3Dcloud (const SGPropertyNode *arg) + bool FGClouds::add3DCloud(const SGPropertyNode *arg) { int l = arg->getIntValue("layer", 0); int index = arg->getIntValue("index", 0); @@ -357,12 +358,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, &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); - 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; } /** @@ -374,12 +381,12 @@ bool FGClouds::get_3dClouds() const * index - the cloud index * */ - static bool - do_delete_3Dcloud (const SGPropertyNode *arg) + bool FGClouds::delete3DCloud(const SGPropertyNode *arg) { 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); } @@ -393,16 +400,18 @@ bool FGClouds::get_3dClouds() const * lon/lat/alt - the position for the cloud * */ - static bool - do_move_3Dcloud (const SGPropertyNode *arg) +bool FGClouds::move3DCloud(const SGPropertyNode *arg) { 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); }