Pull Sound-manager out of FGGlobals

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

diff --git a/src/Environment/environment_mgr.hxx b/src/Environment/environment_mgr.hxx
index d9c7703197dc96d980138eb8107f3f8a91eca46b..08e0b7fe233e8d4ea85f8028f7b148145937c9c3 100644 (file)
--- a/src/Environment/environment_mgr.hxx
+++ b/src/Environment/environment_mgr.hxx
@@ -24,20 +24,14 @@
 
 #include <simgear/compiler.h>
 #include <simgear/structure/subsystem_mgr.hxx>
-#include <simgear/math/SGMath.hxx>
-#include "tiedpropertylist.hxx"
+#include <simgear/props/tiedpropertylist.hxx>
 
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <cmath>
-#else
-#  include <math.h>
-#endif
+#include <cmath>
 
 class FGEnvironment;
-class FGMetarCtrl;
-class FGMetarFetcher;
 class FGClouds;
 class FGPrecipitationMgr;
+class SGSky;
 
 /**
  * Manage environment information.
@@ -54,8 +48,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);
@@ -74,7 +69,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;
@@ -94,9 +90,10 @@ private:
 
   FGEnvironment * _environment;        // always the same, for now
   FGClouds *fgClouds;
-  SGPropertyNode_ptr _altitudeNode;
   bool _cloudLayersDirty;
-  TiedPropertyList _tiedProperties;
+  simgear::TiedPropertyList _tiedProperties;
+  SGPropertyChangeListener * _3dCloudsEnableListener;
+  SGSky* _sky;
 };
 
 #endif // _ENVIRONMENT_MGR_HXX