[Csp-commits] svn:csp r2188 - in branches/osg_2_0/csp/cspsim: . wf

[<sv...@ww...>]

Author: nsmoooose
Date: 2007-10-26 07:33:59 -0700 (Fri, 26 Oct 2007)
New Revision: 2188

Modified:
   branches/osg_2_0/csp/cspsim/VirtualScene.cpp
   branches/osg_2_0/csp/cspsim/wf/WindowManager.cpp
Log:
The scene views rendered was overwriting each other. This was fixed by calling:
  sceneView->getCamera()->setClearMask(GL_DEPTH_BUFFER_BIT);
instead of:
  sceneView->getRenderStage()->setClearMask(GL_DEPTH_BUFFER_BIT);

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2188

Modified: branches/osg_2_0/csp/cspsim/VirtualScene.cpp
===================================================================
--- branches/osg_2_0/csp/cspsim/VirtualScene.cpp	2007-10-25 19:05:48 UTC (rev 2187)
+++ branches/osg_2_0/csp/cspsim/VirtualScene.cpp	2007-10-26 14:33:59 UTC (rev 2188)
@@ -478,7 +478,7 @@
 void VirtualScene::createFarView() {
 	m_FarView = makeSceneView(SceneMasks::FAR);
 	// clear the depth buffer (but not the color buffer)
-	m_FarView->getRenderStage()->setClearMask(GL_DEPTH_BUFFER_BIT);
+	m_FarView->getCamera()->setClearMask(GL_DEPTH_BUFFER_BIT);
 	m_FarGroup = new osg::Group;
 	m_FarGroup->setName("far_group");
 	m_FarView->setSceneData(m_FarGroup.get());
@@ -487,7 +487,7 @@
 void VirtualScene::createNearView() {
 	m_NearView = makeSceneView(SceneMasks::NEAR);
 	// clear the depth buffer (but not the color buffer)
-	m_NearView->getRenderStage()->setClearMask(GL_DEPTH_BUFFER_BIT);
+	m_NearView->getCamera()->setClearMask(GL_DEPTH_BUFFER_BIT);
 	m_NearView->getCullVisitor()->setImpostorsActive(false);
 	m_NearGroup = new osg::Group;
 	m_NearGroup->setName("near_group");
@@ -498,7 +498,7 @@
 	m_InfoView = makeSceneView(0);
 
 	// clear the depth buffer (but not the color buffer)
-	m_InfoView->getRenderStage()->setClearMask(GL_DEPTH_BUFFER_BIT);
+	m_InfoView->getCamera()->setClearMask(GL_DEPTH_BUFFER_BIT);
 
 	m_InfoGroup = new osg::Group;
 	m_InfoGroup->setName("info_group");
@@ -511,8 +511,6 @@
 
 void VirtualScene::createWindowView() {
 	m_WindowManager = new wf::WindowManager(m_GlobalState.get());
-	osg::ref_ptr<osgUtil::SceneView> windowView = m_WindowManager->getSceneView();
-	windowView->getRenderStage()->setClearMask(GL_DEPTH_BUFFER_BIT);	
 }
 
 void VirtualScene::buildScene() {

Modified: branches/osg_2_0/csp/cspsim/wf/WindowManager.cpp
===================================================================
--- branches/osg_2_0/csp/cspsim/wf/WindowManager.cpp	2007-10-25 19:05:48 UTC (rev 2187)
+++ branches/osg_2_0/csp/cspsim/wf/WindowManager.cpp	2007-10-26 14:33:59 UTC (rev 2188)
@@ -102,7 +102,7 @@
 	sv->getCullVisitor()->setCullingMode(osgUtil::CullVisitor::ENABLE_ALL_CULLING);
 	sv->setCullMask(SceneMasks::CULL_ONLY | SceneMasks::NORMAL);
 	sv->getUpdateVisitor()->setTraversalMask(SceneMasks::UPDATE_ONLY | SceneMasks::NORMAL);
-	sv->getRenderStage()->setClearMask(GL_DEPTH_BUFFER_BIT);
+	sv->getCamera()->setClearMask(GL_DEPTH_BUFFER_BIT);
 
 	m_View = sv;