NavDisplay - custom symbol support enabled.

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

diff --git a/src/Environment/environment_mgr.hxx b/src/Environment/environment_mgr.hxx
index 490340c4aec2a4988313b2c0104b9912fcda734d..cc99ff8c194cb2120fe153dc4e686a2d0e524c50 100644 (file)
--- a/src/Environment/environment_mgr.hxx
+++ b/src/Environment/environment_mgr.hxx
@@ -18,14 +18,13 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
-// $Id$
 
 #ifndef _ENVIRONMENT_MGR_HXX
 #define _ENVIRONMENT_MGR_HXX
 
 #include <simgear/compiler.h>
 #include <simgear/structure/subsystem_mgr.hxx>
-#include <simgear/math/SGMath.hxx>
+#include <simgear/props/tiedpropertylist.hxx>
 
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <cmath>
@@ -34,11 +33,9 @@
 #endif
 
 class FGEnvironment;
-class FGEnvironmentCtrl;
-class FGMetarCtrl;
-class FGMetarFetcher;
 class FGClouds;
 class FGPrecipitationMgr;
+class SGSky;
 
 /**
  * Manage environment information.
@@ -55,8 +52,9 @@ public:
   FGEnvironmentMgr ();
   virtual ~FGEnvironmentMgr ();
 
-  virtual void init ();
+  virtual InitStatus incrementalInit ();
   virtual void reinit ();
+  virtual void shutdown ();
   virtual void bind ();
   virtual void unbind ();
   virtual void update (double dt);
@@ -75,7 +73,8 @@ public:
 
   virtual FGEnvironment getEnvironment(const SGGeod& aPos) const;
 private:
-
+  void updateClosestAirport();
+  
   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;
@@ -86,14 +85,22 @@ private:
   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);
+  int get_cloud_layer_coverage_type (int index) const;
+  void set_cloud_layer_coverage_type (int index, int type );
+  double get_cloud_layer_visibility_m (int index) const;
+  void set_cloud_layer_visibility_m (int index, double visibility_m);
+  double get_cloud_layer_maxalpha (int index ) const;
+  void set_cloud_layer_maxalpha (int index, double maxalpha);
 
   FGEnvironment * _environment;        // always the same, for now
-  FGEnvironmentCtrl * _controller; // always the same, for now
-  FGMetarCtrl * _metarcontroller; 
-  FGMetarFetcher * _metarfetcher;
-  FGPrecipitationMgr* _precipitationManager;
-
   FGClouds *fgClouds;
+  bool _cloudLayersDirty;
+  SGPropertyNode_ptr _altitude_n;
+  SGPropertyNode_ptr _longitude_n;
+  SGPropertyNode_ptr _latitude_n;
+  simgear::TiedPropertyList _tiedProperties;
+  SGPropertyChangeListener * _3dCloudsEnableListener;
+  SGSky* _sky;
 };
 
 #endif // _ENVIRONMENT_MGR_HXX