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

diff --git a/src/Environment/environment_mgr.hxx b/src/Environment/environment_mgr.hxx
index 0ad652e71..cc99ff8c1 100644
--- a/src/Environment/environment_mgr.hxx
+++ b/src/Environment/environment_mgr.hxx
@@ -16,16 +16,15 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// 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 <Main/fgfs.hxx>
+#include <simgear/structure/subsystem_mgr.hxx>
+#include <simgear/props/tiedpropertylist.hxx>
 
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <cmath>
@@ -34,13 +33,14 @@
 #endif
 
 class FGEnvironment;
-class FGEnvironmentCtrl;
-
+class FGClouds;
+class FGPrecipitationMgr;
+class SGSky;
 
 /**
  * Manage environment information.
  */
-class FGEnvironmentMgr : public FGSubsystem
+class FGEnvironmentMgr : public SGSubsystemGroup
 {
 
 public:
@@ -52,7 +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);
@@ -69,10 +71,10 @@ public:
   virtual FGEnvironment getEnvironment (double lat, double lon,
 					double alt) const;
 
+  virtual FGEnvironment getEnvironment(const SGGeod& aPos) const;
 private:
-
-  void _update_fdm () const;
-
+  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;
@@ -81,12 +83,24 @@ private:
   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);
+  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
-
+  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