FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made the calls to the drawing of the pre rendering stages exclit, using

Browse Source 
a seperate method in RenderStage and associated calls in sceneView.cpp.
This fixes problems when doing stereo and prerender at the same time.
This commit is contained in:
Robert Osfield
2002-09-19 09:52:50 +00:00
parent f6cb09c601
commit 68384e984b
4 changed files with 48 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osgUtil/RenderStage
View File

@@ -108,6 +108,8 @@ class OSGUTIL_EXPORT RenderStage : public RenderBin
getRenderStageLighting()->addPositionedAttribute(matrix,attr);
}
virtual void drawPreRenderStages(osg::State& state,RenderLeaf*& previous);
virtual void draw(osg::State& state,RenderLeaf*& previous);
void addToDependencyList(RenderStage* rs);

1
include/osgUtil/SceneView
View File

@@ -281,7 +281,6 @@ class OSGUTIL_EXPORT SceneView : public osg::Referenced
/** Do cull traversal of attached scene graph using Cull NodeVisitor.*/
virtual void cullStage(osg::Matrix* projection,osg::Matrix* modelview,osgUtil::CullVisitor* cullVisitor, osgUtil::RenderGraph* rendergraph, osgUtil::RenderStage* renderStage);
virtual void drawStage(osgUtil::RenderStage* renderStage);
const osg::Matrix computeMVPW() const;

17
src/osgUtil/RenderStage.cpp
View File

@@ -65,6 +65,16 @@ void RenderStage::addToDependencyList(RenderStage* rs)
if (rs) _dependencyList.push_back(rs);
}
void RenderStage::drawPreRenderStages(osg::State& state,RenderLeaf*& previous)
{
for(DependencyList::iterator itr=_dependencyList.begin();
itr!=_dependencyList.end();
++itr)
{
(*itr)->draw(state,previous);
}
}
void RenderStage::draw(osg::State& state,RenderLeaf*& previous)
{
if (_stageDrawnThisFrame) return;
@@ -76,13 +86,6 @@ void RenderStage::draw(osg::State& state,RenderLeaf*& previous)
}
_stageDrawnThisFrame = true;
for(DependencyList::iterator itr=_dependencyList.begin();
itr!=_dependencyList.end();
++itr)
{
(*itr)->draw(state,previous);
}
// set up the back buffer.
state.applyAttribute(_viewport.get());

81
src/osgUtil/SceneView.cpp
View File

@@ -471,6 +471,14 @@ void SceneView::cullStage(osg::Matrix* projection,osg::Matrix* modelview,osgUtil
void SceneView::draw()
{
// note, to support multi-pipe systems the deletion of OpenGL display list
// and texture objects is deferred until the OpenGL context is the correct
// context for when the object were originally created. Here we know what
// context we are in so can flush the appropriate caches.
osg::Drawable::flushDeletedDisplayLists(_state->getContextID());
osg::Texture::flushDeletedTextureObjects(_state->getContextID());
RenderLeaf* previous = NULL;
if (_displaySettings.valid() && _displaySettings->getStereo())
{
@@ -481,12 +489,14 @@ void SceneView::draw()
_globalState->setAttribute(_viewport.get());
glDrawBuffer(GL_BACK_LEFT);
drawStage(_renderStageLeft.get());
_renderStageLeft->drawPreRenderStages(*_state,previous);
_renderStageRight->drawPreRenderStages(*_state,previous);
glDrawBuffer(GL_BACK_LEFT);
_renderStageLeft->draw(*_state,previous);
glDrawBuffer(GL_BACK_RIGHT);
drawStage(_renderStageRight.get());
_renderStageRight->draw(*_state,previous);
}
break;
@@ -495,24 +505,30 @@ void SceneView::draw()
_globalState->setAttribute(_viewport.get());
_renderStageLeft->drawPreRenderStages(*_state,previous);
_renderStageRight->drawPreRenderStages(*_state,previous);
// draw left eye.
osg::ref_ptr<osg::ColorMask> red = osgNew osg::ColorMask;
red->setMask(true,false,false,true);
_globalState->setAttribute(red.get());
_renderStageLeft->setColorMask(red.get());
drawStage(_renderStageLeft.get());
_renderStageLeft->draw(*_state,previous);
// draw right eye.
osg::ref_ptr<osg::ColorMask> green = osgNew osg::ColorMask;
green->setMask(false,true,true,true);
_globalState->setAttribute(green.get());
_renderStageRight->setColorMask(green.get());
drawStage(_renderStageRight.get());
_renderStageRight->draw(*_state,previous);
}
break;
case(osg::DisplaySettings::HORIZONTAL_SPLIT):
{
_renderStageLeft->drawPreRenderStages(*_state,previous);
_renderStageRight->drawPreRenderStages(*_state,previous);
int separation = _displaySettings->getSplitStereoHorizontalSeparation();
int left_half_width = (_viewport->width()-separation)/2;
@@ -532,21 +548,21 @@ void SceneView::draw()
{
_globalState->setAttribute(viewportLeft.get());
_renderStageLeft->setViewport(viewportLeft.get());
drawStage(_renderStageLeft.get());
_renderStageLeft->draw(*_state,previous);
_globalState->setAttribute(viewportRight.get());
_renderStageRight->setViewport(viewportRight.get());
drawStage(_renderStageRight.get());
_renderStageRight->draw(*_state,previous);
}
else
{
_globalState->setAttribute(viewportRight.get());
_renderStageLeft->setViewport(viewportRight.get());
drawStage(_renderStageLeft.get());
_renderStageLeft->draw(*_state,previous);
_globalState->setAttribute(viewportLeft.get());
_renderStageRight->setViewport(viewportLeft.get());
drawStage(_renderStageRight.get());
_renderStageRight->draw(*_state,previous);
}
}
@@ -554,6 +570,9 @@ void SceneView::draw()
case(osg::DisplaySettings::VERTICAL_SPLIT):
{
_renderStageLeft->drawPreRenderStages(*_state,previous);
_renderStageRight->drawPreRenderStages(*_state,previous);
int separation = _displaySettings->getSplitStereoVerticalSeparation();
int bottom_half_height = (_viewport->height()-separation)/2;
@@ -572,21 +591,21 @@ void SceneView::draw()
{
_globalState->setAttribute(viewportTop.get());
_renderStageLeft->setViewport(viewportTop.get());
drawStage(_renderStageLeft.get());
_renderStageLeft->draw(*_state,previous);
_globalState->setAttribute(viewportBottom.get());
_renderStageRight->setViewport(viewportBottom.get());
drawStage(_renderStageRight.get());
_renderStageRight->draw(*_state,previous);
}
else
{
_globalState->setAttribute(viewportBottom.get());
_renderStageLeft->setViewport(viewportBottom.get());
drawStage(_renderStageLeft.get());
_renderStageLeft->draw(*_state,previous);
_globalState->setAttribute(viewportTop.get());
_renderStageRight->setViewport(viewportTop.get());
drawStage(_renderStageRight.get());
_renderStageRight->draw(*_state,previous);
}
}
break;
@@ -594,7 +613,8 @@ void SceneView::draw()
{
osg::notify(osg::NOTICE)<<"Warning: stereo camera mode not implemented yet."<< std::endl;
_globalState->setAttribute(_viewport.get());
drawStage(_renderStageLeft.get());
_renderStageLeft->drawPreRenderStages(*_state,previous);
_renderStageLeft->draw(*_state,previous);
}
break;
}
@@ -607,46 +627,17 @@ void SceneView::draw()
_globalState->setAttribute(cmask.get());
// bog standard draw.
drawStage(_renderStage.get());
_renderStage->drawPreRenderStages(*_state,previous);
_renderStage->draw(*_state,previous);
}
// const osg::Polytope& polytope = _state->getViewFrustum();
// const osg::Polytope::PlaneList& pl = polytope.getPlaneList();
// std::cout <<"draw frustum"<<std::endl;
// for(osg::Polytope::PlaneList::const_iterator pl_itr=pl.begin();
// pl_itr!=pl.end();
// ++pl_itr)
// {
// std::cout << " plane "<<*pl_itr<<std::endl;
// }
}
void SceneView::drawStage(osgUtil::RenderStage* renderStage)
{
if (!_sceneData || !_viewport->valid()) return;
// note, to support multi-pipe systems the deletion of OpenGL display list
// and texture objects is deferred until the OpenGL context is the correct
// context for when the object were originally created. Here we know what
// context we are in so can flush the appropriate caches.
osg::Drawable::flushDeletedDisplayLists(_state->getContextID());
osg::Texture::flushDeletedTextureObjects(_state->getContextID());
RenderLeaf* previous = NULL;
renderStage->draw(*_state,previous);
GLenum errorNo = glGetError();
if (errorNo!=GL_NO_ERROR)
{
osg::notify(WARN)<<"Warning: detected OpenGL error '"<<gluErrorString(errorNo)<<"'"<< std::endl;
}
}
/** Calculate, via glUnProject, the object coordinates of a window point.
Note, current implementation requires that SceneView::draw() has been previously called
for projectWindowIntoObject to produce valid values. As per OpenGL