# include "config.h"
#endif
+#include <cstring>
+#include <cstdio>
#include <Main/fg_props.hxx>
#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/math/sg_random.h>
+#include <simgear/structure/commands.hxx>
#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 "environment_ctrl.hxx"
-#include "environment_mgr.hxx"
-#include "fgmetar.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(FGEnvironmentCtrl * controller) :
+FGClouds::FGClouds() :
+#if 0
snd_lightning(0),
- _controller(controller),
- station_elevation_ft(0.0),
+#endif
clouds_3d_enabled(false),
- last_scenario( "unset" ),
- last_env_config( new SGPropertyNode ),
- last_env_clouds( new SGPropertyNode )
+ index(0)
{
update_event = 0;
}
-FGClouds::~FGClouds() {
+FGClouds::~FGClouds()
+{
}
int FGClouds::get_update_event(void) const {
buildCloudLayers();
}
-void FGClouds::init(void) {
+void FGClouds::Init(void) {
+#if 0
if( snd_lightning == NULL ) {
- snd_lightning = new SGSoundSample(globals->get_fg_root().c_str(), "Sounds/thunder.wav");
+ snd_lightning = new SGSoundSample("Sounds/thunder.wav", SGPath());
snd_lightning->set_max_dist(7000.0f);
snd_lightning->set_reference_dist(3000.0f);
- SGSoundMgr *soundMgr = globals->get_soundmgr();
- soundMgr->add( snd_lightning, "thunder" );
- sgEnviro.set_soundMgr( soundMgr );
+ SGSoundMgr *smgr = globals->get_soundmgr();
+ SGSampleGroup *sgr = smgr->find("weather", true);
+ sgr->add( snd_lightning, "thunder" );
}
+#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);
}
-void FGClouds::buildCloud(SGPropertyNode *cloud_def_root, SGPropertyNode *box_def_root, const string& name, sgVec3 pos, SGCloudField *layer) {
+// 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) {
SGPropertyNode *box_def=NULL;
- SGPropertyNode *cld_def=NULL;
-
- SGPath texture_root = globals->get_fg_root();
- texture_root.append("Textures");
- texture_root.append("Sky");
+ SGPropertyNode *cld_def=NULL;
+ double extent = 0.0;
+
+ SGPath texture_root = globals->get_fg_root();
+ texture_root.append("Textures");
+ texture_root.append("Sky");
box_def = box_def_root->getChild(name.c_str());
-
+
string base_name = name.substr(0,2);
if( !box_def ) {
if( name[2] == '-' ) {
box_def = box_def_root->getChild(base_name.c_str());
}
if( !box_def )
- return;
+ return 0.0;
}
-
+
+ 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();
+
+ SGVec3f pos(x,y,z);
+
for(int i = 0; i < box_def->nChildren() ; i++) {
SGPropertyNode *abox = box_def->getChild(i);
if( strcmp(abox->getName(), "box") == 0) {
- double x = abox->getDoubleValue("x") + pos[0];
- double y = abox->getDoubleValue("y") + pos[1];
- double z = abox->getDoubleValue("z") + pos[2];
- SGVec3f newpos = SGVec3f(x, z, y);
-
- string type = abox->getStringValue("type", "cu-small");
-
- cld_def = cloud_def_root->getChild(type.c_str());
- if ( !cld_def ) return;
-
- double min_width = cld_def->getDoubleValue("min-cloud-width-m", 500.0);
- double max_width = cld_def->getDoubleValue("max-cloud-width-m", 1000.0);
- double min_height = cld_def->getDoubleValue("min-cloud-height-m", min_width);
- double max_height = cld_def->getDoubleValue("max-cloud-height-m", max_width);
- double min_sprite_width = cld_def->getDoubleValue("min-sprite-width-m", 200.0);
- double max_sprite_width = cld_def->getDoubleValue("max-sprite-width-m", min_sprite_width);
- double min_sprite_height = cld_def->getDoubleValue("min-sprite-height-m", min_sprite_width);
- double max_sprite_height = cld_def->getDoubleValue("max-sprite-height-m", max_sprite_width);
- int num_sprites = cld_def->getIntValue("num-sprites", 20);
- int num_textures_x = cld_def->getIntValue("num-textures-x", 1);
- int num_textures_y = cld_def->getIntValue("num-textures-y", 1);
- double bottom_shade = cld_def->getDoubleValue("bottom-shade", 1.0);
- string texture = cld_def->getStringValue("texture", "cl_cumulus.rgb");
-
- SGNewCloud *cld =
- new SGNewCloud(type,
- texture_root,
- texture,
- min_width,
- max_width,
- min_height,
- max_height,
- min_sprite_width,
- max_sprite_width,
- min_sprite_height,
- max_sprite_height,
- bottom_shade,
- num_sprites,
- num_textures_x,
- num_textures_y);
- layer->addCloud(newpos, cld);
+
+ string type = abox->getStringValue("type", "cu-small");
+ cld_def = cloud_def_root->getChild(type.c_str());
+ if ( !cld_def ) return 0.0;
+
+ double w = abox->getDoubleValue("width", 1000.0);
+ double h = abox->getDoubleValue("height", 1000.0);
+ int hdist = abox->getIntValue("hdist", 1);
+ int vdist = abox->getIntValue("vdist", 1);
+
+ double c = abox->getDoubleValue("count", 5);
+ int count = (int) (c + (mt_rand(&seed) - 0.5) * c);
+
+ extent = std::max(w*w, extent);
+
+ for (int j = 0; j < count; j++) {
+
+ // Locate the clouds randomly in the defined space. The hdist and
+ // vdist values control the horizontal and vertical distribution
+ // by simply summing random components.
+ double x = 0.0;
+ double y = 0.0;
+ double z = 0.0;
+
+ for (int k = 0; k < hdist; k++)
+ {
+ x += (mt_rand(&seed) / hdist);
+ y += (mt_rand(&seed) / hdist);
+ }
+
+ for (int k = 0; k < vdist; k++)
+ {
+ 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(texture_root, cld_def, &seed);
+
+ //layer->addCloud(newpos, cld.genCloud());
+ layer->addCloud(lon, lat, z, x, y, index++, cld.genCloud());
+ }
}
}
+
+ // Return the maximum extent of the cloud
+ return extent;
}
-void FGClouds::buildLayer(int iLayer, const string& name, double alt, double coverage) {
+void FGClouds::buildLayer(int iLayer, const string& name, double coverage) {
struct {
string name;
double count;
} tCloudVariety[20];
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);
- SGCloudField *layer = thesky->get_cloud_layer(iLayer)->get_layer3D();
+ SGCloudField *layer = thesky->get_cloud_layer(iLayer)->get_layer3D();
layer->clear();
-
+
// If we don't have the required properties, then render the cloud in 2D
- if ((! clouds_3d_enabled) || coverage == 0.0 ||
- layer_def_root == NULL || cloud_def_root == NULL || box_def_root == NULL)
- {
- thesky->get_cloud_layer(iLayer)->set_enable3dClouds(false);
- return;
- }
-
- // If we can't find a definition for this cloud type, then render the cloud in 2D
+ if ((! clouds_3d_enabled) || coverage == 0.0 ||
+ layer_def_root == NULL || cloud_def_root == NULL || box_def_root == NULL) {
+ thesky->get_cloud_layer(iLayer)->set_enable3dClouds(false);
+ return;
+ }
+
+ // If we can't find a definition for this cloud type, then render the cloud in 2D
SGPropertyNode *layer_def=NULL;
layer_def = layer_def_root->getChild(name.c_str());
if( !layer_def ) {
string base_name = name.substr(0,2);
layer_def = layer_def_root->getChild(base_name.c_str());
}
- if( !layer_def )
- {
- thesky->get_cloud_layer(iLayer)->set_enable3dClouds(false);
- return;
- }
+ if( !layer_def ) {
+ thesky->get_cloud_layer(iLayer)->set_enable3dClouds(false);
+ return;
+ }
}
-
- // At this point, we know we've got some 3D clouds to generate.
- thesky->get_cloud_layer(iLayer)->set_enable3dClouds(true);
-
- double grid_x_size = layer_def->getDoubleValue("grid-x-size", 1000.0);
- double grid_y_size = layer_def->getDoubleValue("grid-y-size", 1000.0);
- double grid_x_rand = layer_def->getDoubleValue("grid-x-rand", grid_x_size);
- double grid_y_rand = layer_def->getDoubleValue("grid-y-rand", grid_y_size);
+
+ // At this point, we know we've got some 3D clouds to generate.
+ thesky->get_cloud_layer(iLayer)->set_enable3dClouds(true);
+
double grid_z_rand = layer_def->getDoubleValue("grid-z-rand");
for(int i = 0; i < layer_def->nChildren() ; i++) {
char variety_name[50];
do {
variety++;
- snprintf(variety_name, sizeof(variety_name), cloud_name.c_str(), variety);
+ snprintf(variety_name, sizeof(variety_name) - 1, cloud_name.c_str(), variety);
} while( box_def_root->getChild(variety_name, 0, false) );
totalCount += count;
}
}
totalCount = 1.0 / totalCount;
-
- for(double px = 0.0; px < SGCloudField::fieldSize; px += grid_x_size) {
- for(double py = 0.0; py < SGCloudField::fieldSize; py += grid_y_size) {
- double x = px + grid_x_rand * (sg_random() - 0.5) - (SGCloudField::fieldSize / 2.0);
- double y = py + grid_y_rand * (sg_random() - 0.5) - (SGCloudField::fieldSize / 2.0);
- double z = grid_z_rand * (sg_random() - 0.5);
-
- if (sg_random() < coverage)
- {
- double choice = sg_random();
-
- for(int i = 0; i < CloudVarietyCount ; i ++) {
- choice -= tCloudVariety[i].count * totalCount;
- if( choice <= 0.0 ) {
- sgVec3 pos={x,z,y};
-
- buildCloud(cloud_def_root,
- box_def_root,
- tCloudVariety[i].name,
- pos,
- layer);
- break;
- }
- }
- }
+
+ // Determine how much cloud coverage we need in m^2.
+ double cov = coverage * SGCloudField::fieldSize * SGCloudField::fieldSize;
+
+ while (cov > 0.0f) {
+ double choice = mt_rand(&seed);
+
+ for(int i = 0; i < CloudVarietyCount ; i ++) {
+ choice -= tCloudVariety[i].count * totalCount;
+ if( choice <= 0.0 ) {
+ cov -= buildCloud(cloud_def_root,
+ box_def_root,
+ tCloudVariety[i].name,
+ grid_z_rand,
+ layer);
+ break;
+ }
}
}
- // Now we've built any clouds, enable them and set the density (coverage)
- //layer->setCoverage(coverage);
- //layer->applyCoverage();
- thesky->get_cloud_layer(iLayer)->set_enable3dClouds(clouds_3d_enabled);
+ // Now we've built any clouds, enable them and set the density (coverage)
+ //layer->setCoverage(coverage);
+ //layer->applyCoverage();
+ thesky->get_cloud_layer(iLayer)->set_enable3dClouds(clouds_3d_enabled);
}
void FGClouds::buildCloudLayers(void) {
//double wind_speed_kt = metar_root->getDoubleValue("wind-speed-kt");
double temperature_degc = metar_root->getDoubleValue("temperature-sea-level-degc");
- double dewpoint_degc = metar_root->getDoubleValue("dewpoint-sea-level-degc");
- double pressure_mb = metar_root->getDoubleValue("pressure-sea-level-inhg") * SG_INHG_TO_PA / 100.0;
-
- double dewp = pow(10.0, 7.5 * dewpoint_degc / (237.7 + dewpoint_degc));
- double temp = pow(10.0, 7.5 * temperature_degc / (237.7 + temperature_degc));
- double rel_humidity = dewp * 100 / temp;
+ double dewpoint_degc = metar_root->getDoubleValue("dewpoint-sea-level-degc");
+ double pressure_mb = metar_root->getDoubleValue("pressure-sea-level-inhg") * SG_INHG_TO_PA / 100.0;
+ double rel_humidity = metar_root->getDoubleValue("relative-humidity");
// formule d'Epsy, base d'un cumulus
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);
double alt_ft = cloud_root->getDoubleValue("elevation-ft");
double alt_m = alt_ft * SG_FEET_TO_METER;
- string coverage = cloud_root->getStringValue("coverage");
-
-
+ string coverage = cloud_root->getStringValue("coverage");
+
double coverage_norm = 0.0;
if( coverage == "few" )
coverage_norm = 2.0/8.0; // <1-2
coverage_norm = 8.0/8.0; // 8
string layer_type = "nn";
+
if( coverage == "cirrus" ) {
layer_type = "ci";
} else if( alt_ft > 16500 ) {
layer_type = "ns";
} else {
// layer_type = "st|cu|cb|sc";
- if( cumulus_base * 0.80 < alt_m && cumulus_base * 1.20 > alt_m ) {
- // +/- 20% from cumulus probable base
- layer_type = "cu";
- } else if( stratus_base * 0.80 < alt_m && stratus_base * 1.40 > alt_m ) {
- // +/- 20% from stratus probable base
- layer_type = "st";
- } else {
+ if( cumulus_base * 0.80 < alt_m && cumulus_base * 1.20 > alt_m ) {
+ // +/- 20% from cumulus probable base
+ layer_type = "cu";
+ } else if( stratus_base * 0.80 < alt_m && stratus_base * 1.40 > alt_m ) {
+ // +/- 20% from stratus probable base
+ layer_type = "st";
+ } else {
// above formulae is far from perfect
- if ( alt_ft < 2000 )
+ if ( alt_ft < 2000 )
layer_type = "st";
else if( alt_ft < 4500 )
layer_type = "cu";
layer_type = "sc";
}
}
-
- buildLayer(iLayer, layer_type, alt_m, coverage_norm);
- }
-}
-
-// copy from FGMetarEnvironmentCtrl until better
-void
-FGClouds::update_metar_properties( const FGMetar *m )
-{
- int i;
-
- fgSetString("/environment/metar/station-id", m->getId());
- fgSetDouble("/environment/metar/min-visibility-m",
- m->getMinVisibility().getVisibility_m() );
- fgSetDouble("/environment/metar/max-visibility-m",
- m->getMaxVisibility().getVisibility_m() );
-
- SGPropertyNode *metar = fgGetNode("/environment/metar", true);
- const SGMetarVisibility *dirvis = m->getDirVisibility();
-
- for (i = 0; i < 8; i++, dirvis++) {
- SGPropertyNode *vis = metar->getChild("visibility", i, true);
- double v = dirvis->getVisibility_m();
-
- vis->setDoubleValue("min-m", v);
- vis->setDoubleValue("max-m", v);
- }
-
- fgSetInt("/environment/metar/base-wind-range-from",
- m->getWindRangeFrom() );
- fgSetInt("/environment/metar/base-wind-range-to",
- m->getWindRangeTo() );
- fgSetDouble("/environment/metar/base-wind-speed-kt",
- m->getWindSpeed_kt() );
- fgSetDouble("/environment/metar/gust-wind-speed-kt",
- m->getGustSpeed_kt() );
- fgSetDouble("/environment/metar/temperature-degc",
- m->getTemperature_C() );
- fgSetDouble("/environment/metar/dewpoint-degc",
- m->getDewpoint_C() );
- fgSetDouble("/environment/metar/rel-humidity-norm",
- m->getRelHumidity() );
- fgSetDouble("/environment/metar/pressure-inhg",
- m->getPressure_inHg() );
-
- vector<SGMetarCloud> cv = m->getClouds();
- vector<SGMetarCloud>::const_iterator cloud, cloud_end = cv.end();
-
- // Load into both the METAR and environment properties to stop interpolation
- SGPropertyNode *metar_clouds = fgGetNode("/environment/metar/clouds", true);
- SGPropertyNode *clouds = fgGetNode("/environment/clouds", true);
-
- for (i = 0, cloud = cv.begin(); i < FGEnvironmentMgr::MAX_CLOUD_LAYERS; i++) {
- const char *coverage_string[5] = { "clear", "few", "scattered", "broken", "overcast" };
- const double thickness_value[5] = { 0, 65, 600, 750, 1000 };
-
- const char *coverage = "clear";
- double elevation = -9999.0;
- double thickness = 0.0;
- const double span = 40000.0;
-
- if (cloud != cloud_end) {
- int c = cloud->getCoverage();
- coverage = coverage_string[c];
- elevation = cloud->getAltitude_ft() + station_elevation_ft;
- thickness = thickness_value[c];
- ++cloud;
- }
-
- SGPropertyNode *layer;
- layer = metar_clouds->getChild("layer", i, true);
- layer->setStringValue("coverage", coverage);
- layer->setDoubleValue("elevation-ft", elevation);
- layer->setDoubleValue("thickness-ft", thickness);
- layer->setDoubleValue("span-m", span);
-
- layer = clouds->getChild("layer", i, true);
- layer->setStringValue("coverage", coverage);
- layer->setDoubleValue("elevation-ft", elevation);
- layer->setDoubleValue("thickness-ft", thickness);
- layer->setDoubleValue("span-m", span);
- }
-
- fgSetDouble("/environment/metar/rain-norm", m->getRain());
- fgSetDouble("/environment/metar/hail-norm", m->getHail());
- fgSetDouble("/environment/metar/snow-norm", m->getSnow());
- fgSetBool("/environment/metar/snow-cover", m->getSnowCover());
-}
-
-void
-FGClouds::update_env_config ()
-{
- fgSetupWind( fgGetDouble("/environment/metar/base-wind-range-from"),
- fgGetDouble("/environment/metar/base-wind-range-to"),
- fgGetDouble("/environment/metar/base-wind-speed-kt"),
- fgGetDouble("/environment/metar/gust-wind-speed-kt") );
- fgDefaultWeatherValue( "visibility-m",
- fgGetDouble("/environment/metar/min-visibility-m") );
-#if 0
- set_temp_at_altitude( fgGetDouble("/environment/metar/temperature-degc"),
- station_elevation_ft );
- set_dewpoint_at_altitude( fgGetDouble("/environment/metar/dewpoint-degc"),
- station_elevation_ft );
-#endif
- fgDefaultWeatherValue( "pressure-sea-level-inhg",
- fgGetDouble("/environment/metar/pressure-inhg") );
-}
-
-void FGClouds::setLayer( int iLayer, float alt_ft, const string& coverage, const string& layer_type ) {
- double coverage_norm = 0.0;
- if( coverage == "few" )
- coverage_norm = 2.0/8.0; // <1-2
- else if( coverage == "scattered" )
- coverage_norm = 4.0/8.0; // 3-4
- else if( coverage == "broken" )
- coverage_norm = 6.0/8.0; // 5-7
- else if( coverage == "overcast" )
- coverage_norm = 8.0/8.0; // 8
-
- buildLayer(iLayer, layer_type, station_elevation_ft + alt_ft * SG_FEET_TO_METER, coverage_norm);
-}
-
-void FGClouds::buildScenario( const string& scenario ) {
- string fakeMetar="";
- string station = fgGetString("/environment/metar/station-id", "XXXX");
-
- // fetch station elevation if exists
- if( station == "XXXX" )
- station_elevation_ft = fgGetDouble("/position/ground-elev-m", 0.0);
- else {
- const FGAirport* a = FGAirport::findByIdent(station);
- station_elevation_ft = (a ? a->getElevation() : 0.0);
- }
-
- for(int iLayer = 0 ; iLayer < thesky->get_cloud_layer_count(); iLayer++) {
- thesky->get_cloud_layer(iLayer)
- ->setCoverage(SGCloudLayer::SG_CLOUD_CLEAR);
- thesky->get_cloud_layer(iLayer)->get_layer3D()->clear();
+ cloud_root->setStringValue("layer-type",layer_type);
+ buildLayer(iLayer, layer_type, coverage_norm);
}
-
- station += " 011000Z ";
- if( scenario == "Fair weather" ) {
- fakeMetar = "15003KT 12SM SCT041 FEW200 20/08 Q1015 NOSIG";
- //setLayer(0, 3300.0, "scattered", "cu");
- } else if( scenario == "Thunderstorm" ) {
- fakeMetar = "15012KT 08SM TSRA SCT040 BKN070 20/12 Q0995";
- setLayer(0, 4000.0, "scattered", "cb");
- setLayer(1, 7000.0, "scattered", "ns");
- } else
- return;
- FGMetar *m = new FGMetar( station + fakeMetar );
- update_metar_properties( m );
- update_env_config();
- // propagate aloft tables
- //_controller->reinit();
-
- fgSetString("/environment/metar/last-metar", m->getData());
- // TODO:de-activate real metar updates
- if( scenario == "Fair weather" ) {
- fgSetString("/environment/clouds/layer[1]/coverage", "cirrus");
- }
-}
-
-void FGClouds::set_scenario(const char * sc) {
-
- scenario = string(sc);
-
-// if(!rebuild_required && (scenario == last_scenario))
-// return;
-
- if( last_scenario == "none" ) {
- // save clouds and weather conditions
- SGPropertyNode *param = fgGetNode("/environment/config", true);
- copyProperties( param, last_env_config );
- param = fgGetNode("/environment/clouds", true);
- copyProperties( param, last_env_clouds );
- }
-
- if( scenario == "METAR" ) {
- string realMetar = fgGetString("/environment/metar/real-metar", "");
-
- if( realMetar != "" ) {
- fgSetString("/environment/metar/last-metar", realMetar.c_str());
- FGMetar *m = new FGMetar( realMetar );
- update_metar_properties( m );
- update_env_config();
- // propagate aloft tables
- _controller->reinit();
- buildCloudLayers();
- }
- }
- else if( scenario == "none" ) {
- // restore clouds and weather conditions
- SGPropertyNode *param = fgGetNode("/environment/config", true);
- copyProperties( last_env_config, param );
- param = fgGetNode("/environment/clouds", true);
- copyProperties( last_env_clouds, param );
- fgSetDouble("/environment/metar/rain-norm", 0.0);
- fgSetDouble("/environment/metar/snow-norm", 0.0);
-// update_env_config();
- // propagate aloft tables
- _controller->reinit();
- buildCloudLayers();
- }
- else {
- buildScenario( scenario );
- _controller->reinit();
- buildCloudLayers();
- }
-
- last_scenario = scenario;
-
- if( snd_lightning == NULL )
- init();
}
-const char * FGClouds::get_scenario(void) const
+void FGClouds::set_3dClouds(bool enable)
{
- return scenario.c_str();
+ if (enable != clouds_3d_enabled) {
+ clouds_3d_enabled = enable;
+ buildCloudLayers();
+ }
}
-void FGClouds::set_3dClouds(bool enable)
+bool FGClouds::get_3dClouds() const
{
- if (enable != clouds_3d_enabled) {
- clouds_3d_enabled = enable;
- buildCloudLayers();
- }
+ return clouds_3d_enabled;
}
-bool FGClouds::get_3dClouds() const {
- return clouds_3d_enabled;
-}
-
+/**
+ * Adds a 3D cloud to a cloud layer.
+ *
+ * Property arguments
+ * layer - the layer index to add this cloud to. (Defaults to 0)
+ * index - the index for this cloud (to be used later)
+ * lon/lat/alt - the position for the cloud
+ * (Various) - cloud definition properties. See README.3DClouds
+ *
+ */
+ static bool
+ do_add_3Dcloud (const SGPropertyNode *arg)
+ {
+ int l = arg->getIntValue("layer", 0);
+ int index = arg->getIntValue("index", 0);
+
+ SGPath texture_root = globals->get_fg_root();
+ texture_root.append("Textures");
+ texture_root.append("Sky");
+
+ 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);
+
+ return success;
+ }
+
+ /**
+ * Removes a 3D cloud from a cloud layer
+ *
+ * Property arguments
+ *
+ * layer - the layer index to remove this cloud from. (defaults to 0)
+ * index - the cloud index
+ *
+ */
+ static bool
+ do_delete_3Dcloud (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);
+ }
+
+/**
+ * Move a cloud within a 3D layer
+ *
+ * Property arguments
+ * layer - the layer index to add this cloud to. (Defaults to 0)
+ * index - the cloud index to move.
+ * lon/lat/alt - the position for the cloud
+ *
+ */
+ static bool
+ do_move_3Dcloud (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, x, y);
+ }
projects / flightgear.git / blobdiff