Add the alpha test back in so the instruments won't disappear after changing the...

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

diff --git a/src/Main/ViewPartitionNode.cxx b/src/Main/ViewPartitionNode.cxx
index 506576def114abf93b316e93b2fa79e8a0886162..f3f6f48e9f20fe0f20b67e00839bd172291b1992 100644 (file)
--- a/src/Main/ViewPartitionNode.cxx
+++ b/src/Main/ViewPartitionNode.cxx
@@ -36,7 +36,7 @@ using namespace osg;
 
 const double ViewPartitionNode::nearCameraFar = 100.0;
 ViewPartitionNode::ViewPartitionNode():
-    cameras(3), visibility(40000.0)
+    cameras(2), visibility(40000.0)
 {
     const GLbitfield inheritanceMask = (CullSettings::ALL_VARIABLES
                                         & ~CullSettings::COMPUTE_NEAR_FAR_MODE
@@ -52,30 +52,19 @@ ViewPartitionNode::ViewPartitionNode():
         camera->setComputeNearFarMode(CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
         camera->setCullingMode(CullSettings::VIEW_FRUSTUM_CULLING);
         camera->setRenderOrder(Camera::POST_RENDER, i);
+        // Slave camera "above" us clears the viewport. Perhaps the
+        // far camera doesn't need to clear the depth buffer; it
+        // probably doesn't make much difference.
+        camera->setClearMask(GL_DEPTH_BUFFER_BIT);
         *iter = camera;
     }
-    Camera* backgroundCamera = cameras[BACKGROUND_CAMERA].get();
-    backgroundCamera->setClearMask(GL_DEPTH_BUFFER_BIT);
-    // Turn off depth test for the background
-    Depth* depth = new Depth(Depth::LESS, 0.0, 1.0, false);
-    StateSet* backgroundSS = new StateSet;
-    backgroundSS->setAttribute(depth);
-    backgroundSS->setMode(GL_DEPTH_TEST, StateAttribute::OFF);
-    backgroundCamera->setStateSet(backgroundSS);
-    backgroundCamera->setInheritanceMask(backgroundCamera->getInheritanceMask()
-                                         & ~CullSettings::CULL_MASK);
-    backgroundCamera->setCullMask(simgear::BACKGROUND_BIT);
-    cameras[NEAR_CAMERA]->setClearMask(GL_DEPTH_BUFFER_BIT);
-    // Background camera will have cleared the buffers and doesn't
-    // touch the depth buffer
-    cameras[FAR_CAMERA]->setClearMask(0);
 }
 
 ViewPartitionNode::ViewPartitionNode(const ViewPartitionNode& rhs,
-                                     const CopyOp& copyop):
-cameras(3), visibility(rhs.visibility)
+                                     const CopyOp& copyop) :
+    cameras(2), visibility(rhs.visibility)
 {
-    for (int i = 0; i < 3; i++)
+    for (int i = 0; i < 2; i++)
         cameras[i] = static_cast<Camera*>(copyop(rhs.cameras[i].get()));
 }
 
@@ -88,29 +77,33 @@ void ViewPartitionNode::traverse(NodeVisitor& nv)
     }
     RefMatrix& modelview = *(cv->getModelViewMatrix());
     RefMatrix& projection = *(cv->getProjectionMatrix());
+    // Get the frustum of the enclosing camera. The ViewPartitionNode
+    // will divide up the frustum between that camera's near and far
+    // planes i.e., parentNear and ParentFar.
     double left, right, bottom, top, parentNear, parentFar;
     projection.getFrustum(left, right, bottom, top, parentNear, parentFar);
-    double farCameraFar = visibility + 1000.0;
-    double nearPlanes[3], farPlanes[3];
-    nearPlanes[0] = farCameraFar;  farPlanes[0] = parentFar;
-    nearPlanes[2] = parentNear;
-    // If visibility is low, only use two cameras
-    if (farCameraFar < nearCameraFar) {
-        nearPlanes[1] = farPlanes[1] = 0.0;
-        farPlanes[2] = farCameraFar;
-    } else {
-        nearPlanes[1] = farPlanes[2] = nearCameraFar;
-        farPlanes[1] = farCameraFar;
-        farPlanes[2] = nearCameraFar;
-        
-    }
-    for (int i = 0; i < 3; ++i) {
+    double nearPlanes[2], farPlanes[2];
+    nearPlanes[0] = nearCameraFar;
+    farPlanes[0] = parentFar;
+    nearPlanes[1] = parentNear;
+    farPlanes[1] = nearCameraFar;
+    for (int i = 0; i < 2; ++i) {
         if (farPlanes[i] >0.0) {
             ref_ptr<RefMatrix> newProj = new RefMatrix();
             makeNewProjMat(projection, nearPlanes[i], farPlanes[i],
                            *newProj.get());
             cv->pushProjectionMatrix(newProj.get());
-            cameras[i]->accept(nv);
+            if (i == NEAR_CAMERA) {
+                // The near camera shouldn't draw the background,
+                // which is hard to cull out.
+                unsigned int savedTraversalMask = cv->getTraversalMask();
+                cv->setTraversalMask(savedTraversalMask
+                                     & ~simgear::BACKGROUND_BIT);
+                cameras[i]->accept(nv);
+                cv->setTraversalMask(savedTraversalMask);
+            } else {
+                cameras[i]->accept(nv);
+            }
             cv->popProjectionMatrix();
         }
     }
@@ -198,7 +191,6 @@ void ViewPartitionNode::makeNewProjMat(Matrixd& oldProj, double znear,
                                          0.0, 0.0, ratio, 0.0,
                                          0.0, 0.0, center*ratio, 1.0));
     }
-
 }
 
 namespace