X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FEnvironment%2Fenvironment_mgr.hxx;h=cc99ff8c194cb2120fe153dc4e686a2d0e524c50;hb=a1031b052dd40ca3a4ea68dcd7f572b7d9e4bb24;hp=d9c7703197dc96d980138eb8107f3f8a91eca46b;hpb=3d4d621a3b3c1b44f5b86d613a0157d003d10176;p=flightgear.git

diff --git a/src/Environment/environment_mgr.hxx b/src/Environment/environment_mgr.hxx
index d9c770319..cc99ff8c1 100644
--- a/src/Environment/environment_mgr.hxx
+++ b/src/Environment/environment_mgr.hxx
@@ -24,8 +24,7 @@
 
 #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>
@@ -34,10 +33,9 @@
 #endif
 
 class FGEnvironment;
-class FGMetarCtrl;
-class FGMetarFetcher;
 class FGClouds;
 class FGPrecipitationMgr;
+class SGSky;
 
 /**
  * Manage environment information.
@@ -54,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);
@@ -74,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;
@@ -94,9 +94,13 @@ private:
 
   FGEnvironment * _environment;	// always the same, for now
   FGClouds *fgClouds;
-  SGPropertyNode_ptr _altitudeNode;
   bool _cloudLayersDirty;
-  TiedPropertyList _tiedProperties;
+  SGPropertyNode_ptr _altitude_n;
+  SGPropertyNode_ptr _longitude_n;
+  SGPropertyNode_ptr _latitude_n;
+  simgear::TiedPropertyList _tiedProperties;
+  SGPropertyChangeListener * _3dCloudsEnableListener;
+  SGSky* _sky;
 };
 
 #endif // _ENVIRONMENT_MGR_HXX