[Flightgear-cvslogs] CVS: source/src/Main renderer.cxx,1.72,1.73

[Mathias F. <fro...@fl...>]

Update of /var/cvs/FlightGear-0.9/source/src/Main
In directory baron:/tmp/cvs-serv7550/src/Main

Modified Files:
	renderer.cxx 
Log Message:
Modified Files:
	src/Main/renderer.cxx: Avoid the ClearNode


Index: renderer.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/Main/renderer.cxx,v
retrieving revision 1.72
retrieving revision 1.73
diff -C 2 -r1.72 -r1.73
*** renderer.cxx	28 Jan 2007 20:01:47 -0000	1.72
--- renderer.cxx	30 Jan 2007 20:34:07 -0000	1.73
***************
*** 39,43 ****
  #include <osg/CameraView>
  #include <osg/CullFace>
- #include <osg/ClearNode>
  #include <osg/Depth>
  #include <osg/Fog>
--- 39,42 ----
***************
*** 392,396 ****
      sceneView->setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
      sceneView->getCamera()->setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
-     sceneView->getCamera()->setClearMask(GL_COLOR_BUFFER_BIT);
  
      osg::StateSet* stateSet = mRoot->getOrCreateStateSet();
--- 391,394 ----
***************
*** 435,442 ****
      mBackGroundCamera->setRenderOrder(osg::CameraNode::NESTED_RENDER);
  
!     mBackGroundCamera->getOrCreateStateSet()->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
  
  
!     mSceneCamera->setClearMask(GL_DEPTH_BUFFER_BIT);
      inheritanceMask = osg::CullSettings::ALL_VARIABLES;
      inheritanceMask &= ~osg::CullSettings::COMPUTE_NEAR_FAR_MODE;
--- 433,441 ----
      mBackGroundCamera->setRenderOrder(osg::CameraNode::NESTED_RENDER);
  
!     stateSet = mBackGroundCamera->getOrCreateStateSet();
!     stateSet->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
  
  
!     mSceneCamera->setClearMask(0);
      inheritanceMask = osg::CullSettings::ALL_VARIABLES;
      inheritanceMask &= ~osg::CullSettings::COMPUTE_NEAR_FAR_MODE;
***************
*** 462,471 ****
  
      lightSource->addChild(mBackGroundCamera.get());
! //     lightSource->addChild(mSceneCamera.get());
!     // Hmm, I would think that this should be included in the camera, but ...
!     osg::ClearNode* clearNode = new osg::ClearNode;
!     clearNode->addChild(mSceneCamera.get());
!     clearNode->setClearMask(GL_DEPTH_BUFFER_BIT);
!     lightSource->addChild(clearNode);
  
  
--- 461,465 ----
  
      lightSource->addChild(mBackGroundCamera.get());
!     lightSource->addChild(mSceneCamera.get());