Moved random ground cover object management code (userdata.[ch]xx) over

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

diff --git a/src/Environment/environment_mgr.cxx b/src/Environment/environment_mgr.cxx
index 61cfb69ee6ccc4bb905501a8222b7bfc6c0c6c74..26633176f45f170eda525fbeb35437f70a3a9f7e 100644 (file)
--- a/src/Environment/environment_mgr.cxx
+++ b/src/Environment/environment_mgr.cxx
@@ -32,8 +32,6 @@
 
 extern SGSky *thesky;          // FIXME: from main.cxx
 
-#define MAX_CLOUD_LAYERS 5
-
 
 FGEnvironmentMgr::FGEnvironmentMgr ()
   : _environment(new FGEnvironment),
@@ -54,14 +52,6 @@ FGEnvironmentMgr::init ()
   _controller->setEnvironment(_environment);
   _controller->init();
   _update_fdm();
-
-  SGPath texture_path(globals->get_fg_root());
-  texture_path.append("Textures");
-  texture_path.append("Sky");
-  for (int i = 0; i < MAX_CLOUD_LAYERS; i++) {
-    SGCloudLayer * layer = new SGCloudLayer(texture_path.str());
-    thesky->add_cloud_layer(layer);
-  }
 }
 
 void
@@ -75,25 +65,21 @@ FGEnvironmentMgr::bind ()
        &FGEnvironment::set_temperature_sea_level_degc);
   fgSetArchivable("/environment/temperature-sea-level-degc");
   fgTie("/environment/temperature-degc", _environment,
-       &FGEnvironment::get_temperature_degc,
-       &FGEnvironment::set_temperature_degc);
-  fgSetArchivable("/environment/temperature-degc");
+       &FGEnvironment::get_temperature_degc); // FIXME: read-only for now
+  fgTie("/environment/dewpoint-sea-level-degc", _environment,
+       &FGEnvironment::get_dewpoint_sea_level_degc,
+       &FGEnvironment::set_dewpoint_sea_level_degc);
+  fgSetArchivable("/environment/dewpoint-sea-level-degc");
+  fgTie("/environment/dewpoint-degc", _environment,
+       &FGEnvironment::get_dewpoint_degc); // FIXME: read-only for now
   fgTie("/environment/pressure-sea-level-inhg", _environment,
        &FGEnvironment::get_pressure_sea_level_inhg,
        &FGEnvironment::set_pressure_sea_level_inhg);
   fgSetArchivable("/environment/pressure-sea-level-inhg");
   fgTie("/environment/pressure-inhg", _environment,
-       &FGEnvironment::get_pressure_inhg,
-       &FGEnvironment::set_pressure_inhg);
-  fgSetArchivable("/environment/pressure-inhg");
-  fgTie("/environment/density-sea-level-slugft3", _environment,
-       &FGEnvironment::get_density_sea_level_slugft3,
-       &FGEnvironment::set_density_sea_level_slugft3);
-  fgSetArchivable("/environment/density-sea-level-slugft3");
+       &FGEnvironment::get_pressure_inhg); // FIXME: read-only for now
   fgTie("/environment/density-slugft3", _environment,
-       &FGEnvironment::get_density_slugft3,
-       &FGEnvironment::set_density_slugft3);
-  fgSetArchivable("/environment/density-inhg");
+       &FGEnvironment::get_density_slugft3); // read-only
   fgTie("/environment/wind-from-heading-deg", _environment,
        &FGEnvironment::get_wind_from_heading_deg,
        &FGEnvironment::set_wind_from_heading_deg);
@@ -118,22 +104,27 @@ FGEnvironmentMgr::bind ()
     fgTie(buf, this, i,
          &FGEnvironmentMgr::get_cloud_layer_span_m,
          &FGEnvironmentMgr::set_cloud_layer_span_m);
+    fgSetArchivable(buf);
     sprintf(buf, "/environment/clouds/layer[%d]/elevation-ft", i);
     fgTie(buf, this, i,
          &FGEnvironmentMgr::get_cloud_layer_elevation_ft,
          &FGEnvironmentMgr::set_cloud_layer_elevation_ft);
+    fgSetArchivable(buf);
     sprintf(buf, "/environment/clouds/layer[%d]/thickness-ft", i);
     fgTie(buf, this, i,
          &FGEnvironmentMgr::get_cloud_layer_thickness_ft,
          &FGEnvironmentMgr::set_cloud_layer_thickness_ft);
+    fgSetArchivable(buf);
     sprintf(buf, "/environment/clouds/layer[%d]/transition-ft", i);
     fgTie(buf, this, i,
          &FGEnvironmentMgr::get_cloud_layer_transition_ft,
          &FGEnvironmentMgr::set_cloud_layer_transition_ft);
-    sprintf(buf, "/environment/clouds/layer[%d]/type", i);
+    fgSetArchivable(buf);
+    sprintf(buf, "/environment/clouds/layer[%d]/coverage", i);
     fgTie(buf, this, i,
-         &FGEnvironmentMgr::get_cloud_layer_type,
-         &FGEnvironmentMgr::set_cloud_layer_type);
+         &FGEnvironmentMgr::get_cloud_layer_coverage,
+         &FGEnvironmentMgr::set_cloud_layer_coverage);
+    fgSetArchivable(buf);
   }
 }
 
@@ -141,11 +132,29 @@ void
 FGEnvironmentMgr::unbind ()
 {
   fgUntie("/environment/visibility-m");
-  fgUntie("/environment/wind-from-heading-deg");
-  fgUntie("/environment/wind-speed-kt");
+  fgUntie("/environment/temperature-sea-level-degc");
+  fgUntie("/environment/temperature-degc");
+  fgUntie("/environment/dewpoint-sea-level-degc");
+  fgUntie("/environment/dewpoint-degc");
+  fgUntie("/environment/pressure-sea-level-inhg");
+  fgUntie("/environment/pressure-inhg");
+  fgUntie("/environment/density-inhg");
   fgUntie("/environment/wind-from-north-fps");
   fgUntie("/environment/wind-from-east-fps");
   fgUntie("/environment/wind-from-down-fps");
+  for (int i = 0; i < MAX_CLOUD_LAYERS; i++) {
+    char buf[128];
+    sprintf(buf, "/environment/clouds/layer[%d]/span-m", i);
+    fgUntie(buf);
+    sprintf(buf, "/environment/clouds/layer[%d]/elevation-ft", i);
+    fgUntie(buf);
+    sprintf(buf, "/environment/clouds/layer[%d]/thickness-ft", i);
+    fgUntie(buf);
+    sprintf(buf, "/environment/clouds/layer[%d]/transition-ft", i);
+    fgUntie(buf);
+    sprintf(buf, "/environment/clouds/layer[%d]/type", i);
+    fgUntie(buf);
+  }
 }
 
 void
@@ -190,7 +199,7 @@ FGEnvironmentMgr::_update_fdm () const
                                // convert from Rankine to Celsius
     cur_fdm_state
       ->set_Static_temperature((9.0/5.0)
-                              * _environment->get_temperature_degc() + 492.0);
+                              * (_environment->get_temperature_degc() + 273.15));
                                // convert from inHG to PSF
     cur_fdm_state
       ->set_Static_pressure(_environment->get_pressure_inhg() * 70.726566);
@@ -253,15 +262,17 @@ FGEnvironmentMgr::set_cloud_layer_transition_ft (int index,
 }
 
 const char *
-FGEnvironmentMgr::get_cloud_layer_type (int index) const
+FGEnvironmentMgr::get_cloud_layer_coverage (int index) const
 {
-  switch (thesky->get_cloud_layer(index)->getType()) {
+  switch (thesky->get_cloud_layer(index)->getCoverage()) {
   case SGCloudLayer::SG_CLOUD_OVERCAST:
     return "overcast";
-  case SGCloudLayer::SG_CLOUD_MOSTLY_CLOUDY:
-    return "mostly-cloudy";
-  case SGCloudLayer::SG_CLOUD_MOSTLY_SUNNY:
-    return "mostly-sunny";
+  case SGCloudLayer::SG_CLOUD_BROKEN:
+    return "broken";
+  case SGCloudLayer::SG_CLOUD_SCATTERED:
+    return "scattered";
+  case SGCloudLayer::SG_CLOUD_FEW:
+    return "few";
   case SGCloudLayer::SG_CLOUD_CIRRUS:
     return "cirrus";
   case SGCloudLayer::SG_CLOUD_CLEAR:
@@ -272,24 +283,27 @@ FGEnvironmentMgr::get_cloud_layer_type (int index) const
 }
 
 void
-FGEnvironmentMgr::set_cloud_layer_type (int index, const char * type_name)
+FGEnvironmentMgr::set_cloud_layer_coverage (int index,
+                                            const char * coverage_name)
 {
-  SGCloudLayer::Type type;
-  if (!strcmp(type_name, "overcast"))
-    type = SGCloudLayer::SG_CLOUD_OVERCAST;
-  else if (!strcmp(type_name, "mostly-cloudy"))
-    type = SGCloudLayer::SG_CLOUD_MOSTLY_CLOUDY;
-  else if (!strcmp(type_name, "mostly-sunny"))
-    type = SGCloudLayer::SG_CLOUD_MOSTLY_SUNNY;
-  else if (!strcmp(type_name, "cirrus"))
-    type = SGCloudLayer::SG_CLOUD_CIRRUS;
-  else if (!strcmp(type_name, "clear"))
-    type = SGCloudLayer::SG_CLOUD_CLEAR;
+  SGCloudLayer::Coverage coverage;
+  if (!strcmp(coverage_name, "overcast"))
+    coverage = SGCloudLayer::SG_CLOUD_OVERCAST;
+  else if (!strcmp(coverage_name, "broken"))
+    coverage = SGCloudLayer::SG_CLOUD_BROKEN;
+  else if (!strcmp(coverage_name, "scattered"))
+    coverage = SGCloudLayer::SG_CLOUD_SCATTERED;
+  else if (!strcmp(coverage_name, "few"))
+    coverage = SGCloudLayer::SG_CLOUD_FEW;
+  else if (!strcmp(coverage_name, "cirrus"))
+    coverage = SGCloudLayer::SG_CLOUD_CIRRUS;
+  else if (!strcmp(coverage_name, "clear"))
+    coverage = SGCloudLayer::SG_CLOUD_CLEAR;
   else {
-    SG_LOG(SG_INPUT, SG_WARN, "Unknown cloud type " << type_name);
-    type = SGCloudLayer::SG_CLOUD_CLEAR;
+    SG_LOG(SG_INPUT, SG_WARN, "Unknown cloud type " << coverage_name);
+    coverage = SGCloudLayer::SG_CLOUD_CLEAR;
   }
-  thesky->get_cloud_layer(index)->setType(type);
+  thesky->get_cloud_layer(index)->setCoverage(coverage);
 }