fly/flightgear
1
0
Fork 0
Code Activity

Modified Files:

Browse source 
src/Main/renderer.cxx: Avoid the ClearNode
This commit is contained in:
frohlich 2007-01-30 20:34:07 +00:00
parent d3fdf74e4f
commit 14c52fb33d
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Main/renderer.cxx
View file

@ -38,7 +38,6 @@
#include <osg/CameraNode> #include <osg/CameraNode>
#include <osg/CameraView> #include <osg/CameraView>
#include <osg/CullFace> #include <osg/CullFace>
#include <osg/ClearNode>
#include <osg/Depth> #include <osg/Depth>
#include <osg/Fog> #include <osg/Fog>
#include <osg/Group> #include <osg/Group>
@ -391,7 +390,6 @@ FGRenderer::init( void ) {
sceneView->setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR); sceneView->setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
sceneView->getCamera()->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(); osg::StateSet* stateSet = mRoot->getOrCreateStateSet();
@ -434,10 +432,11 @@ FGRenderer::init( void ) {
mBackGroundCamera->setCullingMode(osg::CullSettings::NO_CULLING); mBackGroundCamera->setCullingMode(osg::CullSettings::NO_CULLING);
mBackGroundCamera->setRenderOrder(osg::CameraNode::NESTED_RENDER); mBackGroundCamera->setRenderOrder(osg::CameraNode::NESTED_RENDER);
mBackGroundCamera->getOrCreateStateSet()->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF); stateSet = mBackGroundCamera->getOrCreateStateSet();
stateSet->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
mSceneCamera->setClearMask(GL_DEPTH_BUFFER_BIT); mSceneCamera->setClearMask(0);
inheritanceMask = osg::CullSettings::ALL_VARIABLES; inheritanceMask = osg::CullSettings::ALL_VARIABLES;
inheritanceMask &= ~osg::CullSettings::COMPUTE_NEAR_FAR_MODE; inheritanceMask &= ~osg::CullSettings::COMPUTE_NEAR_FAR_MODE;
inheritanceMask &= ~osg::CullSettings::CULLING_MODE; inheritanceMask &= ~osg::CullSettings::CULLING_MODE;
@ -461,12 +460,7 @@ FGRenderer::init( void ) {
mRoot->addChild(lightSource); mRoot->addChild(lightSource);
lightSource->addChild(mBackGroundCamera.get()); lightSource->addChild(mBackGroundCamera.get());
// lightSource->addChild(mSceneCamera.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);
stateSet = globals->get_scenery()->get_scene_graph()->getOrCreateStateSet(); stateSet = globals->get_scenery()->get_scene_graph()->getOrCreateStateSet();