Merge branch 'ehofman/mingw'

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

diff --git a/src/Main/CameraGroup.hxx b/src/Main/CameraGroup.hxx
index 19b8a9920655571c3341b0b2903d7fda9ac35a67..79d0d33d4a0d7ddf84433769d44b842eea3e87f3 100644 (file)
--- a/src/Main/CameraGroup.hxx
+++ b/src/Main/CameraGroup.hxx
@@ -76,6 +76,10 @@ struct CameraInfo : public osg::Referenced
     double height;
 };
 
+/** Update the OSG cameras from the camera info.
+ */
+void updateCameras(const CameraInfo* info);
+
 class CameraGroup : public osg::Referenced
 {
 public:
@@ -171,11 +175,17 @@ public:
     /** Set the cull mask on all non-GUI cameras
      */
     void setCameraCullMasks(osg::Node::NodeMask nm);
-
+    /** Update camera properties after a resize event.
+     */
+    void resized();
 protected:
     CameraList _cameras;
     osg::ref_ptr<osgViewer::Viewer> _viewer;
     static osg::ref_ptr<CameraGroup> _defaultGroup;
+    // Near, far for the master camera if used.
+    float _zNear;
+    float _zFar;
+    float _nearField;
 };
 
 }