Bugfix - untie property.

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

diff --git a/src/Environment/environment_ctrl.hxx b/src/Environment/environment_ctrl.hxx
index d22e30641496a8d2abb0dc01fa08f4f16cd517df..fd734e8bbe0fc43dcd0e7ed8b47a39b1d3edb15e 100644 (file)
--- a/src/Environment/environment_ctrl.hxx
+++ b/src/Environment/environment_ctrl.hxx
@@ -16,145 +16,19 @@
 //
 // 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_CTRL_HXX
 #define _ENVIRONMENT_CTRL_HXX
 
-#include <simgear/compiler.h>
 #include <simgear/structure/subsystem_mgr.hxx>
-#include <simgear/environment/metar.hxx>
 
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <cmath>
-#else
-#  include <math.h>
-#endif
-
-#include <vector>
-
-SG_USING_STD(vector);
-
-class SGPropertyNode;
-
-#include "environment.hxx"
-
-
-\f
-/**
- * Interface to control environment information for a specific location.
- */
-class FGEnvironmentCtrl : public SGSubsystem
-{
-
-public:
-
-  FGEnvironmentCtrl ();
-  virtual ~FGEnvironmentCtrl ();
-
-  virtual void setEnvironment (FGEnvironment * environment);
-
-  virtual FGEnvironment * getEnvironment () const { return _environment; }
-
-  virtual void setLongitudeDeg (double lon_deg);
-  virtual void setLatitudeDeg (double lat_deg);
-  virtual void setElevationFt (double elev_ft);
-  virtual void setPosition (double lon_deg, double lat_deg, double elev_ft);
-
-  virtual double getLongitudeDeg () const { return _lon_deg; }
-  virtual double getLatitudeDeg () const { return _lat_deg; }
-  virtual double getElevationFt () const { return _elev_ft; }
-
-protected:
-
-  FGEnvironment * _environment;
-  double _lon_deg;
-  double _lat_deg;
-  double _elev_ft;
-
-};
-
-
-\f
-/**
- * Environment controller using user-supplied parameters.
- */
-class FGUserDefEnvironmentCtrl : public FGEnvironmentCtrl
-{
-public:
-  FGUserDefEnvironmentCtrl ();
-  virtual ~FGUserDefEnvironmentCtrl ();
-
-  virtual void init ();
-  virtual void update (double dt);
-
-private:
-
-  SGPropertyNode * _base_wind_speed_node;
-  SGPropertyNode * _gust_wind_speed_node;
-
-  double _current_wind_speed_kt;
-  double _delta_wind_speed_kt;
-
-};
-
-
-\f
-/**
- * Interplation controller using user-supplied parameters.
- */
-class FGInterpolateEnvironmentCtrl : public FGEnvironmentCtrl
-{
-public:
-    FGInterpolateEnvironmentCtrl ();
-    virtual ~FGInterpolateEnvironmentCtrl ();
-    
-    virtual void init ();
-    virtual void reinit ();
-    virtual void update (double delta_time_sec);
-
-private:
-    
-    struct bucket {
-        double altitude_ft;
-        FGEnvironment environment;
-        bool operator< (const bucket &b) const;
+namespace Environment {
+    class LayerInterpolateController : public SGSubsystem {
+    public:
+        static LayerInterpolateController * createInstance( SGPropertyNode_ptr rootNode );
     };
-
-    void read_table (const SGPropertyNode * node, vector<bucket *> &table);
-    void do_interpolate (vector<bucket *> &table, double altitude_ft,
-                         FGEnvironment * environment);
-
-    FGEnvironment env1, env2;   // temporaries
-
-    vector<bucket *> _boundary_table;
-    vector<bucket *> _aloft_table;
-};
-
-
-\f
-/**
- * Interplation controller using the SGMetar class
- */
-class FGMetarEnvironmentCtrl : public FGEnvironmentCtrl
-{
-public:
-    FGMetarEnvironmentCtrl ();
-    virtual ~FGMetarEnvironmentCtrl ();
-
-    virtual void init ();
-    virtual void reinit ();
-    virtual void update (double delta_time_sec);
-
-    virtual void setEnvironment (FGEnvironment * environment);
-
-private:
-    FGInterpolateEnvironmentCtrl *env;
-
-    char *_icao;
-    void fetch_data (const char *icao);
-};
+} // namespace
 
 #endif // _ENVIRONMENT_CTRL_HXX