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

From Mauricio Hofmam, added support for reading images from all osg::CameraNode attachments in RenderStage.

Browse Source
This commit is contained in:
Robert Osfield
2006-11-27 11:25:40 +00:00
parent 60a975d05d
commit b82e521444
2 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/osgUtil/RenderStage
View File

@@ -200,7 +200,17 @@ class OSGUTIL_EXPORT RenderStage : public RenderBin
/** Extract stats for current draw list. */
bool getStats(Statistics& stats) const;
struct Attachment
{
osg::ref_ptr<osg::Image> _image;
GLenum _imageReadPixelFormat;
GLenum _imageReadPixelDataType;
};
void attach(osg::CameraNode::BufferComponent buffer, osg::Image* image);
protected:
@@ -236,6 +246,8 @@ class OSGUTIL_EXPORT RenderStage : public RenderBin
GLenum _imageReadPixelFormat;
GLenum _imageReadPixelDataType;
std::map< osg::CameraNode::BufferComponent, Attachment> _bufferAttachmentMap;
osg::ref_ptr<osg::FrameBufferObject> _fbo;
osg::ref_ptr<osg::GraphicsContext> _graphicsContext;

53
src/osgUtil/RenderStage.cpp
View File

@@ -260,15 +260,11 @@ void RenderStage::runCameraSetUp(osg::RenderInfo& renderInfo)
if (dataType==0) dataType = _imageReadPixelDataType;
if (dataType==0) dataType = GL_UNSIGNED_BYTE;
image->allocateImage(width, height, 1, pixelFormat, dataType);
}
_imageReadPixelFormat = pixelFormat;
_imageReadPixelDataType = dataType;
setImage(itr->second._image.get());
_bufferAttachmentMap[itr->first]._imageReadPixelFormat = pixelFormat;
_bufferAttachmentMap[itr->first]._imageReadPixelDataType = dataType;
_bufferAttachmentMap[itr->first]._image = image;
}
if (itr->second._texture.valid())
@@ -738,28 +734,30 @@ void RenderStage::drawInner(osg::RenderInfo& renderInfo,RenderLeaf*& previous, b
{
copyTexture(renderInfo);
}
if (_image.valid())
{
std::map< osg::CameraNode::BufferComponent, Attachment>::const_iterator itr;
for(itr = _bufferAttachmentMap.begin(); itr != _bufferAttachmentMap.end(); ++itr){
if (itr->second._image.valid())
{
if (_readBuffer != GL_NONE)
{
glReadBuffer(_readBuffer);
}
if (_readBuffer != GL_NONE)
{
glReadBuffer(_readBuffer);
}
GLenum pixelFormat = _image->getPixelFormat();
if (pixelFormat==0) pixelFormat = _imageReadPixelFormat;
if (pixelFormat==0) pixelFormat = GL_RGB;
GLenum pixelFormat = itr->second._image->getPixelFormat();
if (pixelFormat==0) pixelFormat = _imageReadPixelFormat;
if (pixelFormat==0) pixelFormat = GL_RGB;
GLenum dataType = _image->getDataType();
if (dataType==0) dataType = _imageReadPixelDataType;
if (dataType==0) dataType = GL_UNSIGNED_BYTE;
_image->readPixels(_viewport->x(), _viewport->y(),
_viewport->width(), _viewport->height(),
pixelFormat, dataType);
GLenum dataType = itr->second._image->getDataType();
if (dataType==0) dataType = _imageReadPixelDataType;
if (dataType==0) dataType = GL_UNSIGNED_BYTE;
}
itr->second._image->readPixels(_viewport->x(), _viewport->y(),
_viewport->width(), _viewport->height(),
pixelFormat, dataType);
}
}
if (fbo_supported)
@@ -1015,3 +1013,8 @@ bool RenderStage::getStats(Statistics& stats) const
}
return statsCollected;
}
void RenderStage::attach(osg::CameraNode::BufferComponent buffer, osg::Image* image)
{
_bufferAttachmentMap[buffer]._image = image;
}