From d2344cbabba2b19666f60c009f6aabdfbd65d6c9 Mon Sep 17 00:00:00 2001
From: david <david>
Date: Fri, 5 Apr 2002 18:46:47 +0000
Subject: [PATCH] Removed dependency on viewmgr.hxx from globals.hxx, so that
 changes to the viewer code do not require most of FlightGear to be rebuilt.
 Added some now-required includes to environment.cxx.

---
 src/Environment/environment.cxx | 3 +++
 src/Main/globals.cxx            | 7 +++++++
 src/Main/globals.hxx            | 7 ++-----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/Environment/environment.cxx b/src/Environment/environment.cxx
index bb5894443..8a8f13c41 100644
--- a/src/Environment/environment.cxx
+++ b/src/Environment/environment.cxx
@@ -31,6 +31,9 @@
 
 #include <math.h>
 
+#include <plib/sg.h>
+
+#include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 
 #include <Main/fg_props.hxx>
diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index 15c898998..b03f7f0a8 100644
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -26,6 +26,8 @@
 #include <Environment/environment_mgr.hxx>
 
 #include "globals.hxx"
+#include "viewmgr.hxx"
+
 #include "fg_props.hxx"
 
 
@@ -100,5 +102,10 @@ FGGlobals::get_environment (double lat, double lon, double alt) const
   return environment_mgr->getEnvironment(lat, lon, alt);
 }
 
+FGViewer *
+FGGlobals::get_current_view () const
+{
+  return viewmgr->get_current_view();
+}
 
 // end of globals.cxx
diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index 4bcdf73e9..4d4d12364 100644
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -29,8 +29,6 @@
 #include <vector>
 #include STL_STRING
 
-#include "viewmgr.hxx"
-
 SG_USING_STD( vector );
 SG_USING_STD( string );
 
@@ -61,6 +59,7 @@ class FGControls;
 class FGSoundMgr;
 class FGAutopilot;
 class FGFX;
+class FGViewMgr;
 class FGViewer;
 class FGATCMgr;
 class FGATCDisplay;
@@ -235,9 +234,7 @@ public:
 
     inline FGViewMgr *get_viewmgr() const { return viewmgr; }
     inline void set_viewmgr( FGViewMgr *vm ) { viewmgr = vm; }
-    inline FGViewer *get_current_view() const {
-      return viewmgr->get_current_view();
-    }
+    FGViewer *get_current_view() const;
 
     inline SGPropertyNode *get_props () { return props; }
     inline void set_props( SGPropertyNode *n ) { props = n; }
-- 
2.39.5