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 de33b114a60bd342223d75a720dc2683403684c7..5fd8e9b36f652fdb91735920215e276017602ca3 100644 (file)
--- a/src/Main/renderer.hxx
+++ b/src/Main/renderer.hxx
@@ -2,18 +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>
 
-#define FG_ENABLE_MULTIPASS_CLOUDS 1
+#include <osg/ref_ptr>
 
-class SGSky;
-extern SGSky *thesky;
+namespace osg
+{
+class Camera;
+class Group;
+}
+
+namespace osgGA
+{
+class GUIEventAdapter;
+}
+
+namespace osgShadow
+{
+class ShadowedScene;
+}
 
-extern glPointParameterfProc glPointParameterfPtr;
-extern glPointParameterfvProc glPointParameterfvPtr;
-extern bool glPointParameterIsSupported;
+namespace osgViewer
+{
+class Viewer;
+}
 
+namespace flightgear
+{
+class FGEventHandler;
+}
+
+class SGSky;
+extern SGSky *thesky;
 
 class FGRenderer {
 
@@ -22,9 +42,9 @@ public:
     FGRenderer();
     ~FGRenderer();
 
+    void splashinit();
     void init();
 
-    void build_states();
     static void resize(int width, int height );
 
     // calling update( refresh_camera_settings = false ) will not
@@ -33,23 +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
+    /** Just pick into the scene and return the pick callbacks on the way ...
      */
-    static void setFOV( float w, float h );
-
+    static bool pick( std::vector<SGSceneryPick>& pickList,
+                      const osgGA::GUIEventAdapter* ea );
 
-    /** FlightGear code should use this routine to set the Near/Far
-     *  clip planes rather than calling the ssg routine directly
+    /** Get and set the OSG Viewer object, if any.
      */
-    static void setNearFar( float n, float f );
-
-    /** Get the pick start point and direction in global coordinates.
-     *  The inputs are expected to be the x and y coordinates of the
-     *  screen point relative to the window.
+    osgViewer::Viewer* getViewer() { return viewer.get(); }
+    const osgViewer::Viewer* getViewer() const { return viewer.get(); }
+    void setViewer(osgViewer::Viewer* viewer);
+    /** Get and set the manipulator object, if any.
      */
-    static bool getPickInfo( sgdVec3 p, sgdVec3 d, unsigned x, unsigned y );
+    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<flightgear::FGEventHandler> eventHandler;
 };
 
+bool fgDumpSceneGraphToFile(const char* filename);
+bool fgDumpTerrainBranchToFile(const char* filename);
+
 #endif