Added support for initializing and maintaining up to five cloud

layers.  The properties controlling each layer are inside
/environment/clouds/layer[n], and the available properties are type
("clear", "overcast", "mostly-cloudy", "mostly-sunny", or "cirrus"),
span-m (should be about 40000), elevation-ft, thickness-ft, and
transition-ft.

diff --git a/src/Environment/environment_mgr.cxx b/src/Environment/environment_mgr.cxx
index 909ca1fd387f50582fa637b5138b9e40f7e499f0..61cfb69ee6ccc4bb905501a8222b7bfc6c0c6c74 100644 (file)
--- a/src/Environment/environment_mgr.cxx
+++ b/src/Environment/environment_mgr.cxx
@@ -21,6 +21,7 @@
 // $Id$
 
 #include <simgear/debug/logstream.hxx>
+#include <simgear/sky/sky.hxx>
 
 #include <Main/fg_props.hxx>
 #include <Aircraft/aircraft.hxx>
@@ -29,6 +30,10 @@
 #include "environment_ctrl.hxx"
 #include "environment_mgr.hxx"
 
+extern SGSky *thesky;          // FIXME: from main.cxx
+
+#define MAX_CLOUD_LAYERS 5
+
 
 FGEnvironmentMgr::FGEnvironmentMgr ()
   : _environment(new FGEnvironment),
@@ -49,6 +54,14 @@ 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
@@ -98,6 +111,30 @@ FGEnvironmentMgr::bind ()
        &FGEnvironment::get_wind_from_down_fps,
        &FGEnvironment::set_wind_from_down_fps);
   fgSetArchivable("/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);
+    fgTie(buf, this, i,
+         &FGEnvironmentMgr::get_cloud_layer_span_m,
+         &FGEnvironmentMgr::set_cloud_layer_span_m);
+    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);
+    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);
+    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);
+    fgTie(buf, this, i,
+         &FGEnvironmentMgr::get_cloud_layer_type,
+         &FGEnvironmentMgr::set_cloud_layer_type);
+  }
 }
 
 void
@@ -163,4 +200,98 @@ FGEnvironmentMgr::_update_fdm () const
   }
 }
 
+double
+FGEnvironmentMgr::get_cloud_layer_span_m (int index) const
+{
+  return thesky->get_cloud_layer(index)->getSpan_m();
+}
+
+void
+FGEnvironmentMgr::set_cloud_layer_span_m (int index, double span_m)
+{
+  thesky->get_cloud_layer(index)->setSpan_m(span_m);
+}
+
+double
+FGEnvironmentMgr::get_cloud_layer_elevation_ft (int index) const
+{
+  return thesky->get_cloud_layer(index)->getElevation_m() * SG_METER_TO_FEET;
+}
+
+void
+FGEnvironmentMgr::set_cloud_layer_elevation_ft (int index, double elevation_ft)
+{
+  thesky->get_cloud_layer(index)
+    ->setElevation_m(elevation_ft * SG_FEET_TO_METER);
+}
+
+double
+FGEnvironmentMgr::get_cloud_layer_thickness_ft (int index) const
+{
+  return thesky->get_cloud_layer(index)->getThickness_m() * SG_METER_TO_FEET;
+}
+
+void
+FGEnvironmentMgr::set_cloud_layer_thickness_ft (int index, double thickness_ft)
+{
+  thesky->get_cloud_layer(index)
+    ->setThickness_m(thickness_ft * SG_FEET_TO_METER);
+}
+
+double
+FGEnvironmentMgr::get_cloud_layer_transition_ft (int index) const
+{
+  return thesky->get_cloud_layer(index)->getTransition_m() * SG_METER_TO_FEET;
+}
+
+void
+FGEnvironmentMgr::set_cloud_layer_transition_ft (int index,
+                                                double transition_ft)
+{
+  thesky->get_cloud_layer(index)
+    ->setTransition_m(transition_ft * SG_FEET_TO_METER);
+}
+
+const char *
+FGEnvironmentMgr::get_cloud_layer_type (int index) const
+{
+  switch (thesky->get_cloud_layer(index)->getType()) {
+  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_CIRRUS:
+    return "cirrus";
+  case SGCloudLayer::SG_CLOUD_CLEAR:
+    return "clear";
+  default:
+    return "unknown";
+  }
+}
+
+void
+FGEnvironmentMgr::set_cloud_layer_type (int index, const char * type_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;
+  else {
+    SG_LOG(SG_INPUT, SG_WARN, "Unknown cloud type " << type_name);
+    type = SGCloudLayer::SG_CLOUD_CLEAR;
+  }
+  thesky->get_cloud_layer(index)->setType(type);
+}
+
+
+
 // end of environment-mgr.cxx

diff --git a/src/Environment/environment_mgr.hxx b/src/Environment/environment_mgr.hxx
index 82bd4cf4b941d5b7b1a76db688fcf69e38b7b9be..4caf6e22ec7b24b7c43a56b00515eec88e059635 100644 (file)
--- a/src/Environment/environment_mgr.hxx
+++ b/src/Environment/environment_mgr.hxx
@@ -69,6 +69,17 @@ private:
 
   void _update_fdm () const;
 
+  double get_cloud_layer_span_m (int index) const;
+  void set_cloud_layer_span_m (int index, double span_m);
+  double get_cloud_layer_elevation_ft (int index) const;
+  void set_cloud_layer_elevation_ft (int index, double elevation_ft);
+  double get_cloud_layer_thickness_ft (int index) const;
+  void set_cloud_layer_thickness_ft (int index, double thickness_ft);
+  double get_cloud_layer_transition_ft (int index) const;
+  void set_cloud_layer_transition_ft (int index, double transition_ft);
+  const char * get_cloud_layer_type (int index) const;
+  void set_cloud_layer_type (int index, const char * type);
+
   FGEnvironment * _environment;        // always the same, for now
   FGEnvironmentCtrl * _controller; // always the same, for now