X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Frenderer.hxx;h=0a8096cd4bf41f19049b2858c90f590e7a4cc5be;hb=18d1593c42c2df60d7fb44ace722ca3e8a7fd82c;hp=f651be821b4c951a8ae715f775b5a35218d363ea;hpb=b47157041eea9cafc4021431b3d5ecf861fb224e;p=flightgear.git

diff --git a/src/Main/renderer.hxx b/src/Main/renderer.hxx
index f651be821..0a8096cd4 100644
--- a/src/Main/renderer.hxx
+++ b/src/Main/renderer.hxx
@@ -3,13 +3,35 @@
 #define __FG_RENDERER_HXX 1
 
 #include <simgear/screen/extensions.hxx>
-#include <simgear/scene/sky/sky.hxx>
 #include <simgear/scene/util/SGPickCallback.hxx>
 
-#include <osg/Camera>
-#include <osgViewer/Viewer>
+#include <osg/ref_ptr>
 
-#include "FGManipulator.hxx"
+namespace osg
+{
+class Camera;
+class Group;
+}
+
+namespace osgGA
+{
+class GUIEventAdapter;
+}
+
+namespace osgShadow
+{
+class ShadowedScene;
+}
+
+namespace osgViewer
+{
+class Viewer;
+}
+
+namespace flightgear
+{
+class FGEventHandler;
+}
 
 #define FG_ENABLE_MULTIPASS_CLOUDS 1
 
@@ -43,25 +65,22 @@ public:
     /** Set all the camera parameters at once. aspectRatio is height / width.
      */
     static void setCameraParameters(float vfov, float aspectRatio,
-                                    float near, float far);
+                                    float zNear, float zFar);
     /** 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.
     */
@@ -69,7 +88,7 @@ public:
 
 protected:
     osg::ref_ptr<osgViewer::Viewer> viewer;
-    osg::ref_ptr<FGManipulator> manipulator;
+    osg::ref_ptr<flightgear::FGEventHandler> eventHandler;
 };
 
 bool fgDumpSceneGraphToFile(const char* filename);