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

Added support for clampping the near and far values in othrographic projection.

Browse Source 
Fixed the handling of anaglyphic/stereo state in SceneView::draw().
This commit is contained in:
Robert Osfield
2003-08-08 00:36:51 +00:00
parent a11395feec
commit 8a737dd2ca
2 changed files with 119 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/osgUtil/CullVisitor.cpp
View File

@@ -179,16 +179,36 @@ void CullVisitor::popProjectionMatrix()
if (projection(0,3)==0.0f && projection(1,3)==0.0f && projection(2,3)==0.0f)
{
//cout << "Orthographic projection "<<projection<<endl;
//std::cout << "Orthographic projection "<<projection<<std::endl;
double span = (_computed_zfar-_computed_zfar);
double desired_znear = _computed_znear + span*0.02f;
double desired_zfar = _computed_zfar - span*0.02f;
// near plane clamping.
//double min_near_plane = _computed_zfar*_nearFarRatio;
//if (desired_znear<min_near_plane) desired_znear=min_near_plane;
// assign the clamped values back to the computed values.
_computed_znear = desired_znear;
_computed_zfar = desired_zfar;
projection(2,2)=-2.0f/(desired_zfar-desired_znear);
projection(3,2)=-(desired_zfar+desired_znear)/(desired_zfar-desired_znear);
//projection(2,2)=-2.0f/(-desired_zfar+desired_znear);
//projection(3,2)=(desired_zfar+desired_znear)/(desired_zfar-desired_znear);
}
else
{
//cout << "Perspective projection "<<projection<<endl;
//std::cout << "Perspective projection "<<projection<<std::endl;
double desired_znear = _computed_znear *0.98f;
double desired_zfar = _computed_zfar *1.02f;
// near plane clamping.
double min_near_plane = _computed_zfar*_nearFarRatio;
if (desired_znear<min_near_plane) desired_znear=min_near_plane;

105
src/osgUtil/SceneView.cpp
View File

@@ -566,6 +566,20 @@ void SceneView::draw()
_localStateSet->setAttribute(_viewport.get());
// ensure that all color planes are active.
osg::ColorMask* cmask = static_cast<osg::ColorMask*>(_localStateSet->getAttribute(osg::StateAttribute::COLORMASK));
if (cmask)
{
cmask->setMask(true,true,true,true);
}
else
{
cmask = new osg::ColorMask(true,true,true,true);
_localStateSet->setAttribute(cmask);
}
_renderStageLeft->setColorMask(cmask);
_renderStageRight->setColorMask(cmask);
_renderStageLeft->drawPreRenderStages(*_state,previous);
_renderStageRight->drawPreRenderStages(*_state,previous);
@@ -585,13 +599,36 @@ void SceneView::draw()
_renderStageLeft->drawPreRenderStages(*_state,previous);
_renderStageRight->drawPreRenderStages(*_state,previous);
// draw left eye.
osg::ref_ptr<osg::ColorMask> red = new osg::ColorMask;
red->setMask(true,false,false,true);
_localStateSet->setAttribute(red.get());
_renderStageLeft->setColorMask(red.get());
// ensure that all color planes are active.
osg::ColorMask* red = _renderStageLeft->getColorMask();
if (red)
{
red->setMask(true,false,false,true);
}
else
{
red = new osg::ColorMask(true,false,false,true);
}
_localStateSet->setAttribute(red);
_renderStageLeft->setColorMask(red);
// draw left eye.
_renderStageLeft->draw(*_state,previous);
// ensure that all color planes are active.
osg::ColorMask* cyan = _renderStageLeft->getColorMask();
if (cyan)
{
cyan->setMask(false,true,true,true);
}
else
{
cyan = new osg::ColorMask(false,true,true,true);
}
_localStateSet->setAttribute(cyan);
_renderStageRight->setColorMask(cyan);
// draw right eye.
osg::ref_ptr<osg::ColorMask> green = new osg::ColorMask;
green->setMask(false,true,true,true);
@@ -603,6 +640,20 @@ void SceneView::draw()
break;
case(osg::DisplaySettings::HORIZONTAL_SPLIT):
{
// ensure that all color planes are active.
osg::ColorMask* cmask = static_cast<osg::ColorMask*>(_localStateSet->getAttribute(osg::StateAttribute::COLORMASK));
if (cmask)
{
cmask->setMask(true,true,true,true);
}
else
{
cmask = new osg::ColorMask(true,true,true,true);
_localStateSet->setAttribute(cmask);
}
_renderStageLeft->setColorMask(cmask);
_renderStageRight->setColorMask(cmask);
_renderStageLeft->drawPreRenderStages(*_state,previous);
_renderStageRight->drawPreRenderStages(*_state,previous);
@@ -646,7 +697,20 @@ void SceneView::draw()
break;
case(osg::DisplaySettings::VERTICAL_SPLIT):
{
// ensure that all color planes are active.
osg::ColorMask* cmask = static_cast<osg::ColorMask*>(_localStateSet->getAttribute(osg::StateAttribute::COLORMASK));
if (cmask)
{
cmask->setMask(true,true,true,true);
}
else
{
cmask = new osg::ColorMask(true,true,true,true);
_localStateSet->setAttribute(cmask);
}
_renderStageLeft->setColorMask(cmask);
_renderStageRight->setColorMask(cmask);
_renderStageLeft->drawPreRenderStages(*_state,previous);
_renderStageRight->drawPreRenderStages(*_state,previous);
@@ -689,6 +753,20 @@ void SceneView::draw()
case(osg::DisplaySettings::RIGHT_EYE):
case(osg::DisplaySettings::LEFT_EYE):
{
// ensure that all color planes are active.
osg::ColorMask* cmask = static_cast<osg::ColorMask*>(_localStateSet->getAttribute(osg::StateAttribute::COLORMASK));
if (cmask)
{
cmask->setMask(true,true,true,true);
}
else
{
cmask = new osg::ColorMask(true,true,true,true);
_localStateSet->setAttribute(cmask);
}
_renderStage->setColorMask(cmask);
_renderStage->setColorMask(cmask);
_localStateSet->setAttribute(_viewport.get());
_renderStage->drawPreRenderStages(*_state,previous);
_renderStage->draw(*_state,previous);
@@ -708,9 +786,20 @@ void SceneView::draw()
glDrawBuffer(GL_BACK);
_localStateSet->setAttribute(_viewport.get());
osg::ref_ptr<osg::ColorMask> cmask = new osg::ColorMask;
cmask->setMask(true,true,true,true);
_localStateSet->setAttribute(cmask.get());
// ensure that all color planes are active.
osg::ColorMask* cmask = static_cast<osg::ColorMask*>(_localStateSet->getAttribute(osg::StateAttribute::COLORMASK));
if (cmask)
{
cmask->setMask(true,true,true,true);
}
else
{
cmask = new osg::ColorMask(true,true,true,true);
_localStateSet->setAttribute(cmask);
}
_renderStage->setColorMask(cmask);
// bog standard draw.
_renderStage->drawPreRenderStages(*_state,previous);