Move viewer-related sources to separate folder.

Simple source directory clean-up, so "Main" folder contains fewer stuff
and the list of files in the editors a lot shorter.

src/AIModel/AIAircraft.cxx

@@ -25,7 +25,7 @@
 #include <simgear/route/waypoint.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
-#include <Main/viewer.hxx>
+#include <Viewer/viewer.hxx>
 #include <Scenery/scenery.hxx>
 #include <Scenery/tilemgr.hxx>
 #include <Airports/dynamics.hxx>

src/AIModel/AICarrier.cxx

@@ -31,7 +31,7 @@
 
 #include <math.h>
 #include <Main/util.hxx>
-#include <Main/viewer.hxx>
+#include <Viewer/viewer.hxx>
 
 #include "AICarrier.hxx"
 

src/AIModel/AIEscort.cxx

@@ -32,7 +32,7 @@
 
 #include <math.h>
 #include <Main/util.hxx>
-#include <Main/viewer.hxx>
+#include <Viewer/viewer.hxx>
 
 #include <Scenery/scenery.hxx>
 

src/AIModel/AIGroundVehicle.cxx

@@ -24,7 +24,7 @@
 
 #include <simgear/sg_inlines.h>
 
-#include <Main/viewer.hxx>
+#include <Viewer/viewer.hxx>
 #include <Scenery/scenery.hxx>
 #include <Airports/dynamics.hxx>
 

src/CMakeLists.txt

@@ -27,9 +27,11 @@ foreach( mylibfolder
 		Time
 		Traffic
 		FDM
+		Viewer
 		Main
-    )
+	)
+
+	add_subdirectory(${mylibfolder})
 
-    add_subdirectory(${mylibfolder})
 endforeach( mylibfolder )
 

src/Cockpit/panel.cxx

@@ -57,10 +57,10 @@
 
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
-#include <Main/viewmgr.hxx>
+#include <Viewer/viewmgr.hxx>
+#include <Viewer/viewer.hxx>
 #include <Time/light.hxx>
 #include <GUI/FGFontCache.hxx>	
-#include <Main/viewer.hxx>
 #include <Instrumentation/dclgps.hxx>
 
 #define WIN_X 0

src/Environment/environment_mgr.cxx

@@ -31,8 +31,8 @@
 #include <simgear/structure/event_mgr.hxx>
 
 #include <Main/main.hxx>
-#include <Main/renderer.hxx>
 #include <Main/fg_props.hxx>
+#include <Viewer/renderer.hxx>
 #include <FDM/flight.hxx>
 
 #include "environment.hxx"

src/Environment/fgclouds.cxx

@@ -38,9 +38,9 @@
 #include <simgear/props/props_io.hxx>
 
 #include <Main/globals.hxx>
-#include <Main/renderer.hxx>
-#include <Airports/simple.hxx>
 #include <Main/util.hxx>
+#include <Viewer/renderer.hxx>
+#include <Airports/simple.hxx>
 
 #include "fgclouds.hxx"
 

src/Environment/precipitation_mgr.cxx

@@ -39,7 +39,7 @@
 
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
-#include <Main/renderer.hxx>
+#include <Viewer/renderer.hxx>
 #include <Scenery/scenery.hxx>
 
 #include "precipitation_mgr.hxx"

src/GUI/gui.cxx

@@ -43,7 +43,7 @@
 #include <Main/globals.hxx>
 #include <Main/locale.hxx>
 #include <Main/fg_props.hxx>
-#include <Main/WindowSystemAdapter.hxx>
+#include <Viewer/WindowSystemAdapter.hxx>
 #include <GUI/new_gui.hxx>
 #include <GUI/FGFontCache.hxx>
 

src/GUI/gui_funcs.cxx

@@ -49,10 +49,10 @@
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/fg_os.hxx>
-#include <Main/renderer.hxx>
-#include <Main/viewmgr.hxx>
-#include <Main/WindowSystemAdapter.hxx>
-#include <Main/CameraGroup.hxx>
+#include <Viewer/renderer.hxx>
+#include <Viewer/viewmgr.hxx>
+#include <Viewer/WindowSystemAdapter.hxx>
+#include <Viewer/CameraGroup.hxx>
 #include <GUI/new_gui.hxx>
 
 

src/Input/FGMouseInput.hxx

@@ -37,7 +37,8 @@
 #include <list>
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/scene/util/SGPickCallback.hxx>
-#include <Main/renderer.hxx>
+#include <Viewer/renderer.hxx>
+
 /**
   * List of currently pressed mouse button events
   */

src/Instrumentation/HUD/HUD.cxx

@@ -37,8 +37,8 @@
 #include <plib/fnt.h>
 
 #include <Main/globals.hxx>
-#include <Main/viewmgr.hxx>
-#include <Main/viewer.hxx>
+#include <Viewer/viewmgr.hxx>
+#include <Viewer/viewer.hxx>
 #include <GUI/FGFontCache.hxx>
 
 #include "HUD.hxx"

src/Instrumentation/HUD/HUD_ladder.cxx

@@ -25,7 +25,7 @@
 
 #include <sstream>
 #include <simgear/math/SGGeometry.hxx>
-#include <Main/viewer.hxx>
+#include <Viewer/viewer.hxx>
 #include "HUD.hxx"
 
 // FIXME

src/Instrumentation/HUD/HUD_runway.cxx

@@ -33,8 +33,8 @@
 #include <FDM/flight.hxx>
 #include <Environment/environment.hxx>
 #include <Environment/environment_mgr.hxx>
-#include <Main/viewer.hxx>
-#include <Main/viewmgr.hxx>
+#include <Viewer/viewer.hxx>
+#include <Viewer/viewmgr.hxx>
 #include <ATCDCL/ATCutils.hxx>
 
 #include "HUD.hxx"

src/Instrumentation/groundradar.cxx

@@ -36,7 +36,7 @@
 
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
-#include <Main/renderer.hxx>
+#include <Viewer/renderer.hxx>
 #include <Cockpit/panel.hxx>
 #include <Airports/simple.hxx>
 #include <Airports/runways.hxx>

src/Instrumentation/od_gauge.cxx

@@ -42,7 +42,7 @@
 #include <simgear/debug/logstream.hxx>
 
 #include <Main/globals.hxx>
-#include <Main/renderer.hxx>
+#include <Viewer/renderer.hxx>
 #include <Scenery/scenery.hxx>
 #include "od_gauge.hxx"
 

src/Main/CMakeLists.txt

@@ -8,51 +8,32 @@ if (MSVC)
 endif (MSVC)
 
 set(SOURCES
-	CameraGroup.cxx
-	FGEventHandler.cxx
-	WindowBuilder.cxx
-	WindowSystemAdapter.cxx
 	bootstrap.cxx
 	fg_commands.cxx
 	fg_init.cxx
 	fg_io.cxx
 	fg_os_common.cxx
-	fg_os_osgviewer.cxx
 	fg_props.cxx
-	fgviewer.cxx
 	globals.cxx
 	locale.cxx
 	logger.cxx
 	main.cxx
 	options.cxx
-	renderer.cxx
-	splash.cxx
 	util.cxx
-	viewer.cxx
-	viewmgr.cxx
 	${RESOURCE_FILE}
 	)
 
 set(HEADERS
-	CameraGroup.hxx
-	FGEventHandler.hxx
-	WindowBuilder.hxx
-	WindowSystemAdapter.hxx
 	fg_commands.hxx
 	fg_init.hxx
 	fg_io.hxx
 	fg_props.hxx
-	fgviewer.hxx
 	globals.hxx
 	locale.hxx
 	logger.hxx
 	main.hxx
 	options.hxx
-	renderer.hxx
-	splash.hxx
 	util.hxx
-	viewer.hxx
-	viewmgr.hxx
 	)
 
 get_property(FG_SOURCES GLOBAL PROPERTY FG_SOURCES)

src/Main/bootstrap.cxx

@@ -57,10 +57,10 @@
 using std::cerr;
 using std::endl;
 
+#include <Viewer/fgviewer.hxx>
 #include "main.hxx"
 #include "globals.hxx"
 #include "fg_props.hxx"
-#include "fgviewer.hxx"
 
 
 #include "fg_os.hxx"

src/Main/fg_commands.cxx

@@ -38,6 +38,9 @@
 #include <Sound/sample_queue.hxx>
 #include <Airports/xmlloader.hxx>
 #include <Network/HTTPClient.hxx>
+#include <Viewer/viewmgr.hxx>
+#include <Viewer/viewer.hxx>
+#include <Environment/presets.hxx>
 
 #include "fg_init.hxx"
 #include "fg_io.hxx"
@@ -47,10 +50,7 @@
 #include "globals.hxx"
 #include "logger.hxx"
 #include "util.hxx"
-#include "viewmgr.hxx"
 #include "main.hxx"
-#include <Main/viewer.hxx>
-#include <Environment/presets.hxx>
 
 #include <boost/scoped_array.hpp>
 

src/Main/fg_init.cxx

@@ -109,6 +109,8 @@
 #include <FDM/fdm_shell.hxx>
 #include <Environment/ephemeris.hxx>
 #include <Environment/environment_mgr.hxx>
+#include <Viewer/renderer.hxx>
+#include <Viewer/viewmgr.hxx>
 
 #include "fg_init.hxx"
 #include "fg_io.hxx"
@@ -117,8 +119,6 @@
 #include "options.hxx"
 #include "globals.hxx"
 #include "logger.hxx"
-#include "renderer.hxx"
-#include "viewmgr.hxx"
 #include "main.hxx"
 
 

src/Main/fg_os_common.cxx

@@ -24,10 +24,10 @@
 #include <plib/pu.h>
 #include <osg/GraphicsContext>
 
+#include <Viewer/renderer.hxx>
+#include <Viewer/FGEventHandler.hxx>
 #include "fg_os.hxx"
 #include "globals.hxx"
-#include "renderer.hxx"
-#include "FGEventHandler.hxx"
 
 // fg_os callback registration APIs
 //

src/Main/globals.cxx

@@ -55,10 +55,10 @@
 #include <Scenery/scenery.hxx>
 #include <Scenery/tilemgr.hxx>
 #include <Navaids/navlist.hxx>
+#include <Viewer/renderer.hxx>
+#include <Viewer/viewmgr.hxx>
 
 #include "globals.hxx"
-#include "renderer.hxx"
-#include "viewmgr.hxx"
 #include "locale.hxx"
 
 #include "fg_props.hxx"

src/Main/main.cxx

@@ -70,19 +70,19 @@
 #include <GUI/gui.h>
 #include <GUI/new_gui.hxx>
 #include <MultiPlayer/multiplaymgr.hxx>
+#include <Viewer/CameraGroup.hxx>
+#include <Viewer/viewer.hxx>
+#include <Viewer/WindowSystemAdapter.hxx>
+#include <Viewer/splash.hxx>
+#include <Viewer/renderer.hxx>
 
-#include "CameraGroup.hxx"
 #include "fg_commands.hxx"
 #include "fg_io.hxx"
-#include "renderer.hxx"
-#include "splash.hxx"
 #include "main.hxx"
 #include "util.hxx"
 #include "fg_init.hxx"
 #include "fg_os.hxx"
-#include "WindowSystemAdapter.hxx"
-#include <Main/viewer.hxx>
-#include <Main/fg_props.hxx>
+#include "fg_props.hxx"
 
 using namespace flightgear;
 

src/Main/options.cxx

@@ -57,10 +57,10 @@
 #include "fg_props.hxx"
 #include "options.hxx"
 #include "util.hxx"
-#include "viewmgr.hxx"
 #include "main.hxx"
-#include <Main/viewer.hxx>
-#include <Main/locale.hxx>
+#include "locale.hxx"
+#include <Viewer/viewer.hxx>
+#include <Viewer/viewmgr.hxx>
 #include <Environment/presets.hxx>
 
 #include <osg/Version>

src/Model/acmodel.cxx

@@ -18,9 +18,9 @@
 
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
-#include <Main/renderer.hxx>
-#include <Main/viewmgr.hxx>
-#include <Main/viewer.hxx>
+#include <Viewer/renderer.hxx>
+#include <Viewer/viewmgr.hxx>
+#include <Viewer/viewer.hxx>
 #include <Scenery/scenery.hxx>
 #include <Sound/fg_fx.hxx>
 

src/Network/jpg-httpd.cxx

@@ -42,7 +42,7 @@
 
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
-#include <Main/renderer.hxx>
+#include <Viewer/renderer.hxx>
 
 #include "jpg-httpd.hxx"
 

src/Network/props.cxx

@@ -39,7 +39,7 @@
 #include <errno.h>
 
 #include <Main/globals.hxx>
-#include <Main/viewmgr.hxx>
+#include <Viewer/viewmgr.hxx>
 
 #include <simgear/io/sg_netChat.hxx>
 

src/Scenery/scenery.cxx

@@ -45,7 +45,7 @@
 #include <simgear/scene/bvh/BVHNode.hxx>
 #include <simgear/scene/bvh/BVHLineSegmentVisitor.hxx>
 
-#include <Main/renderer.hxx>
+#include <Viewer/renderer.hxx>
 #include <Main/fg_props.hxx>
 
 #include "tilemgr.hxx"

src/Scenery/tilemgr.cxx

@@ -40,8 +40,8 @@
 
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
-#include <Main/renderer.hxx>
-#include <Main/viewer.hxx>
+#include <Viewer/renderer.hxx>
+#include <Viewer/viewer.hxx>
 #include <Scripting/NasalSys.hxx>
 
 #include "scenery.hxx"

src/Time/light.cxx

@@ -42,8 +42,8 @@
 #include <Main/main.hxx>
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
-#include <Main/renderer.hxx>
-#include <Main/viewer.hxx>
+#include <Viewer/renderer.hxx>
+#include <Viewer/viewer.hxx>
 
 #include "light.hxx"
 #include "sunsolver.hxx"

src/Viewer/CMakeLists.txt

@@ -0,0 +1,28 @@
+include(FlightGearComponent)
+
+set(SOURCES
+	CameraGroup.cxx
+	FGEventHandler.cxx
+	WindowBuilder.cxx
+	WindowSystemAdapter.cxx
+	fg_os_osgviewer.cxx
+	fgviewer.cxx
+	renderer.cxx
+	splash.cxx
+	viewer.cxx
+	viewmgr.cxx
+	)
+
+set(HEADERS
+	CameraGroup.hxx
+	FGEventHandler.hxx
+	WindowBuilder.hxx
+	WindowSystemAdapter.hxx
+	fgviewer.hxx
+	renderer.hxx
+	splash.hxx
+	viewer.hxx
+	viewmgr.hxx
+	)
+
+flightgear_component(Viewer "${SOURCES}" "${HEADERS}")

src/Viewer/CameraGroup.cxx

@@ -21,8 +21,8 @@
 
 #include "CameraGroup.hxx"
 
-#include "fg_props.hxx"
-#include "globals.hxx"
+#include <Main/fg_props.hxx>
+#include <Main/globals.hxx>
 #include "renderer.hxx"
 #include "FGEventHandler.hxx"
 #include "WindowBuilder.hxx"

src/Viewer/FGEventHandler.hxx

@@ -7,7 +7,7 @@
 #include <osgViewer/ViewerEventHandlers>
 #include <simgear/structure/OSGVersion.hxx>
 
-#include "fg_os.hxx"
+#include <Main/fg_os.hxx>
 
 namespace flightgear
 {

src/Viewer/WindowBuilder.cxx

@@ -21,7 +21,7 @@
 #include "WindowBuilder.hxx"
 
 #include "WindowSystemAdapter.hxx"
-#include "fg_props.hxx"
+#include <Main/fg_props.hxx>
 
 #include <sstream>
 

src/Viewer/fg_os_osgviewer.cxx

@@ -48,10 +48,10 @@
 #include <osgViewer/GraphicsWindow>
 
 #include <Scenery/scenery.hxx>
-#include "fg_os.hxx"
-#include "fg_props.hxx"
-#include "util.hxx"
-#include "globals.hxx"
+#include <Main/fg_os.hxx>
+#include <Main/fg_props.hxx>
+#include <Main/util.hxx>
+#include <Main/globals.hxx>
 #include "renderer.hxx"
 #include "CameraGroup.hxx"
 #include "FGEventHandler.hxx"

src/Viewer/fgviewer.cxx

@@ -32,10 +32,10 @@
 
 #include <Scenery/scenery.hxx>
 
-#include "fg_init.hxx"
-#include "fg_props.hxx"
-#include "globals.hxx"
-#include "options.hxx"
+#include <Main/fg_props.hxx>
+#include <Main/globals.hxx>
+#include <Main/options.hxx>
+#include <Main/fg_init.hxx>
 
 class GraphDumpHandler : public  osgGA::GUIEventHandler
 {

src/Viewer/renderer.cxx

@@ -100,13 +100,13 @@
 #include <Environment/precipitation_mgr.hxx>
 #include <Environment/environment_mgr.hxx>
 
+//#include <Main/main.hxx>
+#include "viewer.hxx"
+#include "viewmgr.hxx"
 #include "splash.hxx"
 #include "renderer.hxx"
-#include "main.hxx"
 #include "CameraGroup.hxx"
 #include "FGEventHandler.hxx"
-#include <Main/viewer.hxx>
-#include <Main/viewmgr.hxx>
 
 using namespace osg;
 using namespace simgear;

src/Viewer/splash.cxx

@@ -51,11 +51,11 @@
 #include "GUI/FGFontCache.hxx"
 #include "GUI/FGColor.hxx"
 
-#include "globals.hxx"
-#include "fg_props.hxx"
+#include <Main/globals.hxx>
+#include <Main/fg_props.hxx>
+#include <Main/fg_os.hxx>
 #include "splash.hxx"
 #include "renderer.hxx"
-#include "fg_os.hxx"
 
 class FGSplashUpdateCallback : public osg::Drawable::UpdateCallback {
 public:

src/Viewer/viewer.cxx

@@ -30,13 +30,12 @@
 #include <simgear/compiler.h>
 #include <cassert>
 
-#include "fg_props.hxx"
-
 #include <simgear/debug/logstream.hxx>
 #include <simgear/constants.h>
 #include <simgear/scene/model/placement.hxx>
 #include <simgear/scene/util/OsgMath.hxx>
 
+#include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
 #include <Scenery/scenery.hxx>
 #include <Model/acmodel.hxx>

src/Viewer/viewmgr.cxx

@@ -32,8 +32,8 @@
 #include <simgear/compiler.h>
 #include <simgear/sound/soundmgr_openal.hxx>
 #include <Model/acmodel.hxx>
-#include <Main/viewer.hxx>
 #include <Main/fg_props.hxx>
+#include "viewer.hxx"
 
 // Constructor
 FGViewMgr::FGViewMgr( void ) :