Merge branch 'jt/runway' into next

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

diff --git a/src/Main/ViewPartitionNode.hxx b/src/Main/ViewPartitionNode.hxx
index 9e3d5249235000aa2e2e33e28d633af4525ac962..2c3ec35778bfcecc5be8584c9e0f1dff14aa9f0d 100644 (file)
--- a/src/Main/ViewPartitionNode.hxx
+++ b/src/Main/ViewPartitionNode.hxx
@@ -44,15 +44,15 @@ public:
     virtual void traverse(osg::NodeVisitor &nv);
     void setVisibility(double vis) { visibility = vis; }
     double getVisibility() const { return visibility; }
+    static void makeNewProjMat(osg::Matrixd& oldProj, double znear, double zfar,
+                               osg::Matrixd& projection);
 protected:
-    void makeNewProjMat(osg::Matrixd& oldProj, double znear, double zfar,
-                        osg::Matrixd& projection);
+
     typedef std::vector< osg::ref_ptr<osg::Camera> > CameraList;
     CameraList cameras;
     enum CameraNum {
-        BACKGROUND_CAMERA = 0,
-        FAR_CAMERA = 1,
-        NEAR_CAMERA = 2
+        FAR_CAMERA = 0,
+        NEAR_CAMERA = 1
     };
     double visibility;
     static const double nearCameraFar;