Merge branch 'curt/make' into next

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

diff --git a/src/Main/CameraGroup.hxx b/src/Main/CameraGroup.hxx
index a9e9b6973481126fdb6f98f828a6f42f9dcb8235..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:
@@ -178,6 +182,10 @@ 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;
 };
 
 }