near and far are #defined in MSVC

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

diff --git a/src/Main/renderer.hxx b/src/Main/renderer.hxx
index 7bc54bfe94caa1f984847dc8e46ef19ac9bfc3f7..918408bcd548bf29afbc4362fa279e488dc5ece1 100644 (file)
--- a/src/Main/renderer.hxx
+++ b/src/Main/renderer.hxx
@@ -6,6 +6,7 @@
 #include <simgear/scene/sky/sky.hxx>
 #include <simgear/scene/util/SGPickCallback.hxx>
 
+#include <osg/Camera>
 #include <osgViewer/Viewer>
 
 #include "FGManipulator.hxx"
@@ -39,22 +40,15 @@ 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
+    /** Set all the camera parameters at once. aspectRatio is height / width.
      */
-    static void setNearFar( float n, float f );
-
+    static void setCameraParameters(float vfov, float aspectRatio,
+                                    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 );
+                      std::vector<SGSceneryPick>& pickList,
+                      const osgGA::GUIEventAdapter* ea );
 
     /** Get and set the OSG Viewer object, if any.
      */
@@ -65,13 +59,20 @@ public:
      */
     FGManipulator* getManipulator() { return manipulator.get(); }
     const FGManipulator* getManipulator() const { return manipulator.get(); }
-    void setManipulator(FGManipulator* manipulator)
-       {
-           this->manipulator = manipulator;
-       }
+    void setManipulator(FGManipulator* manipulator) {
+        this->manipulator = 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;
 };
 
+bool fgDumpSceneGraphToFile(const char* filename);
+bool fgDumpTerrainBranchToFile(const char* filename);
+
 #endif