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

Added support for sample and sampleBuffers to osg::GraphicsContext::Traits and

Browse Source 
cleaned up the Traits naming
This commit is contained in:
Robert Osfield
2006-12-22 21:53:44 +00:00
parent 401f3bcd43
commit 76461b3ab2
8 changed files with 193 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/osgUtil/RenderStage.cpp
View File

@@ -437,14 +437,14 @@ void RenderStage::runCameraSetUp(osg::RenderInfo& renderInfo)
// set up the traits of the graphics context that we want
osg::ref_ptr<osg::GraphicsContext::Traits> traits = new osg::GraphicsContext::Traits;
traits->_width = width;
traits->_height = height;
traits->width = width;
traits->height = height;
// osg::notify(osg::NOTICE)<<"traits = "<<traits->_width<<" "<<traits->_height<<std::endl;
// osg::notify(osg::NOTICE)<<"traits = "<<traits->width<<" "<<traits->height<<std::endl;
traits->_pbuffer = (renderTargetImplemntation==osg::Camera::PIXEL_BUFFER || renderTargetImplemntation==osg::Camera::PIXEL_BUFFER_RTT);
traits->_windowDecoration = (renderTargetImplemntation==osg::Camera::SEPERATE_WINDOW);
traits->_doubleBuffer = (renderTargetImplemntation==osg::Camera::SEPERATE_WINDOW);
traits->pbuffer = (renderTargetImplemntation==osg::Camera::PIXEL_BUFFER || renderTargetImplemntation==osg::Camera::PIXEL_BUFFER_RTT);
traits->windowDecoration = (renderTargetImplemntation==osg::Camera::SEPERATE_WINDOW);
traits->doubleBuffer = (renderTargetImplemntation==osg::Camera::SEPERATE_WINDOW);
osg::Texture* pBufferTexture = 0;
GLenum bufferFormat = GL_NONE;
@@ -465,13 +465,13 @@ void RenderStage::runCameraSetUp(osg::RenderInfo& renderInfo)
{
case(osg::Camera::DEPTH_BUFFER):
{
traits->_depth = 24;
traits->depth = 24;
depthAttached = true;
break;
}
case(osg::Camera::STENCIL_BUFFER):
{
traits->_stencil = 8;
traits->stencil = 8;
stencilAttached = true;
break;
}
@@ -503,10 +503,10 @@ void RenderStage::runCameraSetUp(osg::RenderInfo& renderInfo)
if (renderTargetImplemntation==osg::Camera::PIXEL_BUFFER_RTT)
{
traits->_target = bufferFormat;
traits->_level = level;
traits->_face = face;
traits->_mipMapGeneration = attachment._mipMapGeneration;
traits->target = bufferFormat;
traits->level = level;
traits->face = face;
traits->mipMapGeneration = attachment._mipMapGeneration;
}
break;
}
@@ -526,29 +526,30 @@ void RenderStage::runCameraSetUp(osg::RenderInfo& renderInfo)
if (!depthAttached)
{
traits->_depth = 24;
traits->depth = 24;
}
if (!colorAttached)
{
if (bufferFormat == GL_NONE) bufferFormat = GL_RGB;
traits->_red = 8;
traits->_green = 8;
traits->_blue = 8;
traits->_alpha = (bufferFormat==GL_RGBA) ? 8 : 0;
traits->red = 8;
traits->green = 8;
traits->blue = 8;
traits->alpha = (bufferFormat==GL_RGBA) ? 8 : 0;
}
// share OpenGL objects if possible...
if (state.getGraphicsContext())
{
traits->_sharedContext = state.getGraphicsContext();
traits->sharedContext = state.getGraphicsContext();
const osg::GraphicsContext::Traits* sharedTraits = traits->_sharedContext->getTraits();
const osg::GraphicsContext::Traits* sharedTraits = traits->sharedContext->getTraits();
if (sharedTraits)
{
traits->_displayNum = sharedTraits->_displayNum;
traits->_screenNum = sharedTraits->_screenNum;
traits->hostName = sharedTraits->hostName;
traits->displayNum = sharedTraits->displayNum;
traits->screenNum = sharedTraits->screenNum;
}
}

4
src/osgUtil/SceneView.cpp
View File

@@ -117,7 +117,9 @@ SceneView::SceneView(DisplaySettings* ds)
_interlacedStereoStencilHeight = 0;
}
SceneView::SceneView(const SceneView& rhs, const osg::CopyOp&)
SceneView::SceneView(const SceneView& rhs, const osg::CopyOp& copyop):
osg::Object(rhs,copyop),
osg::CullSettings(rhs)
{
_displaySettings = rhs._displaySettings;