If preset-commit occurs during init, skip most re-init logic.

[flightgear.git] / src / Main / renderer.hxx

diff --git a/src/Main/renderer.hxx b/src/Main/renderer.hxx
index 7bc54bfe94caa1f984847dc8e46ef19ac9bfc3f7..5fd8e9b36f652fdb91735920215e276017602ca3 100644 (file)
--- a/src/Main/renderer.hxx
+++ b/src/Main/renderer.hxx
@@ -2,24 +2,38 @@
 #ifndef __FG_RENDERER_HXX
 #define __FG_RENDERER_HXX 1
 
-#include <simgear/screen/extensions.hxx>
-#include <simgear/scene/sky/sky.hxx>
 #include <simgear/scene/util/SGPickCallback.hxx>
 
-#include <osgViewer/Viewer>
+#include <osg/ref_ptr>
 
-#include "FGManipulator.hxx"
+namespace osg
+{
+class Camera;
+class Group;
+}
 
-#define FG_ENABLE_MULTIPASS_CLOUDS 1
+namespace osgGA
+{
+class GUIEventAdapter;
+}
 
-class SGSky;
-extern SGSky *thesky;
+namespace osgShadow
+{
+class ShadowedScene;
+}
 
-extern glPointParameterfProc glPointParameterfPtr;
-extern glPointParameterfvProc glPointParameterfvPtr;
-extern bool glPointParameterIsSupported;
-extern bool glPointSpriteIsSupported;
+namespace osgViewer
+{
+class Viewer;
+}
 
+namespace flightgear
+{
+class FGEventHandler;
+}
+
+class SGSky;
+extern SGSky *thesky;
 
 class FGRenderer {
 
@@ -39,39 +53,32 @@ public:
     static void update( bool refresh_camera_settings );
     inline static void update() { update( true ); }
 
-
-    /** FlightGear code should use this routine to set the FOV rather
-     *  than calling the ssg routine directly
-     */
-    static void setFOV( float w, float h );
-
-
-    /** FlightGear code should use this routine to set the Near/Far
-     *  clip planes rather than calling the ssg routine directly
-     */
-    static void setNearFar( float n, float f );
-
     /** Just pick into the scene and return the pick callbacks on the way ...
      */
-    static bool pick( unsigned x, unsigned y,
-                      std::vector<SGSceneryPick>& pickList );
+    static bool pick( std::vector<SGSceneryPick>& pickList,
+                      const osgGA::GUIEventAdapter* ea );
 
     /** Get and set the OSG Viewer object, if any.
      */
     osgViewer::Viewer* getViewer() { return viewer.get(); }
     const osgViewer::Viewer* getViewer() const { return viewer.get(); }
-    void setViewer(osgViewer::Viewer* viewer) { this->viewer = viewer; }
+    void setViewer(osgViewer::Viewer* viewer);
     /** Get and set the manipulator object, if any.
      */
-    FGManipulator* getManipulator() { return manipulator.get(); }
-    const FGManipulator* getManipulator() const { return manipulator.get(); }
-    void setManipulator(FGManipulator* manipulator)
-       {
-           this->manipulator = manipulator;
-       }
+    flightgear::FGEventHandler* getEventHandler() { return eventHandler.get(); }
+    const flightgear::FGEventHandler* getEventHandler() const { return eventHandler.get(); }
+    void setEventHandler(flightgear::FGEventHandler* manipulator);
+
+    /** Add a top level camera.
+    */
+    void addCamera(osg::Camera* camera, bool useSceneData);
+
 protected:
     osg::ref_ptr<osgViewer::Viewer> viewer;
-    osg::ref_ptr<FGManipulator> manipulator;
+    osg::ref_ptr<flightgear::FGEventHandler> eventHandler;
 };
 
+bool fgDumpSceneGraphToFile(const char* filename);
+bool fgDumpTerrainBranchToFile(const char* filename);
+
 #endif