Mathias Froehlich:

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

diff --git a/src/Environment/environment_mgr.hxx b/src/Environment/environment_mgr.hxx
index d8757900bb33b237d1ad4a9ccded515643275fec..ff0111afeaeed2cb5dc92f6c8cec43e29a26413a 100644 (file)
--- a/src/Environment/environment_mgr.hxx
+++ b/src/Environment/environment_mgr.hxx
@@ -24,8 +24,7 @@
 #define _ENVIRONMENT_MGR_HXX
 
 #include <simgear/compiler.h>
-
-#include <Main/fgfs.hxx>
+#include <simgear/structure/subsystem_mgr.hxx>
 
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <cmath>
@@ -35,41 +34,60 @@
 
 class FGEnvironment;
 class FGEnvironmentCtrl;
-
+class FGClouds;
 
 /**
  * Manage environment information.
  */
-class FGEnvironmentMgr : public FGSubsystem
+class FGEnvironmentMgr : public SGSubsystemGroup
 {
 
 public:
 
+  enum {
+    MAX_CLOUD_LAYERS = 5
+  };
+
   FGEnvironmentMgr ();
   virtual ~FGEnvironmentMgr ();
 
   virtual void init ();
+  virtual void reinit ();
   virtual void bind ();
   virtual void unbind ();
-  virtual void update (int dt);
+  virtual void update (double dt);
 
   /**
    * Get the environment information for the plane's current position.
    */
-  virtual const FGEnvironment * getEnvironment () const;
+  virtual FGEnvironment getEnvironment () const;
 
 
   /**
    * Get the environment information for another location.
    */
-  virtual const FGEnvironment * getEnvironment (double lat, double lon,
-                                               double alt) const;
+  virtual FGEnvironment getEnvironment (double lat, double lon,
+                                       double alt) const;
 
 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_coverage (int index) const;
+  void set_cloud_layer_coverage (int index, const char * coverage);
+
   FGEnvironment * _environment;        // always the same, for now
   FGEnvironmentCtrl * _controller; // always the same, for now
 
+  FGClouds *fgClouds;
 };
 
 #endif // _ENVIRONMENT_MGR_HXX