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

Added post draw callback to osg::CameraNode/osgUtil::RenderToTextureStage.

Browse Source 
Added support for Texture1D, 2D, 3D and TextureRectangle into osgUtil::RenderToTextureStage.
This commit is contained in:
Robert Osfield
2005-07-24 20:31:21 +00:00
parent 42e4488454
commit ee8f7bb756
8 changed files with 100 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
VisualStudio/osgWrappers/osg/wrapper_osg.dsp
View File

@@ -423,6 +423,10 @@ SOURCE=..\..\..\src\osgWrappers\osg\RefNodePath.cpp
SOURCE=..\..\..\src\osgWrappers\osg\Referenced.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\src\osgWrappers\osg\Scissor.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\src\osgWrappers\osg\Sequence.cpp
# End Source File

4
VisualStudio/osgWrappers/osgProducer/wrapper_osgProducer.dsp
View File

@@ -99,6 +99,10 @@ LINK32=link.exe
SOURCE=..\..\..\src\osgWrappers\osgProducer\EventAdapter.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\src\osgWrappers\osgProducer\GraphicsContextImplementation.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\src\osgWrappers\osgProducer\KeyboardMouseCallback.cpp
# End Source File

26
include/osg/CameraNode
View File

@@ -279,8 +279,30 @@ class OSG_EXPORT CameraNode : public Transform, public CullSettings
/** Get the const Rendering object that is used to implement rendering of the subgraph.*/
const osg::Object* getRenderingCache() const { return _renderingCache.get(); }
public:
/** Draw callback for custom operations.*/
struct DrawCallback : public Object
{
DrawCallback() {}
DrawCallback(const DrawCallback&,const CopyOp&) {}
META_Object(osg,DrawCallback)
virtual void operator () (const osg::CameraNode& camera) const {}
};
/** Set the post draw callback for custom operations to do done after the drawing of the camera's subgraph has been completed.*/
void setPostDrawCallback(DrawCallback* cb) { _postDrawCallback = cb; }
/** Get the post draw callback.*/
DrawCallback* getPostDrawCallback() { return _postDrawCallback.get(); }
/** Get the const post draw callback.*/
const DrawCallback* getPostDrawCallback() const { return _postDrawCallback.get(); }
public:
/** Transform method that must be defined to provide generic interface for scene graph traversals.*/
virtual bool computeLocalToWorldMatrix(Matrix& matrix,NodeVisitor*) const;
@@ -311,6 +333,8 @@ class OSG_EXPORT CameraNode : public Transform, public CullSettings
ref_ptr<GraphicsContext> _graphicsContext;
ref_ptr<Object> _renderingCache;
ref_ptr<DrawCallback> _postDrawCallback;
};
}

19
include/osgUtil/RenderToTextureStage
View File

@@ -14,9 +14,9 @@
#ifndef OSGUTIL_RENDERTOTEXTURESTAGE
#define OSGUTIL_RENDERTOTEXTURESTAGE 1
#include <osg/Texture2D>
#include <osg/Texture>
#include <osg/FrameBufferObject>
#include <osg/GraphicsContext>
#include <osg/CameraNode>
#include <osgUtil/RenderStage>
@@ -41,9 +41,12 @@ class OSGUTIL_EXPORT RenderToTextureStage : public RenderStage
virtual const char* className() const { return "RenderToTextureStage"; }
virtual void reset();
void setCameraNode(const osg::CameraNode* camera) { _camera = camera; }
const osg::CameraNode* getCameraNode() const { return _camera; }
void setTexture(osg::Texture2D* texture) { _texture = texture; }
osg::Texture2D* getTexture() { return _texture.get(); }
void setTexture(osg::Texture* texture, unsigned int level = 0, unsigned int face=0) { _texture = texture; _level = level; _face = face; }
osg::Texture* getTexture() { return _texture.get(); }
void setImage(osg::Image* image) { _image = image; }
osg::Image* getImage() { return _image.get(); }
@@ -53,6 +56,7 @@ class OSGUTIL_EXPORT RenderToTextureStage : public RenderStage
void setImageReadPixelDataType(GLenum type) { _imageReadPixelDataType = type; }
GLenum getImageReadPixelDataType() const { return _imageReadPixelDataType; }
void setFrameBufferObject(osg::FrameBufferObject* fbo) { _fbo = fbo; }
osg::FrameBufferObject* getFrameBufferObject() { return _fbo.get(); }
@@ -70,8 +74,13 @@ class OSGUTIL_EXPORT RenderToTextureStage : public RenderStage
protected:
virtual ~RenderToTextureStage();
const osg::CameraNode* _camera;
osg::ref_ptr<osg::Texture2D> _texture;
osg::ref_ptr<osg::Texture> _texture;
unsigned int _level;
unsigned int _face;
osg::ref_ptr<osg::Image> _image;
GLenum _imageReadPixelFormat;
GLenum _imageReadPixelDataType;

3
src/osg/CameraNode.cpp
View File

@@ -38,7 +38,8 @@ CameraNode::CameraNode(const CameraNode& camera,const CopyOp& copyop):
_viewMatrix(camera._viewMatrix),
_renderOrder(camera._renderOrder),
_renderTargetImplementation(camera._renderTargetImplementation),
_bufferAttachmentMap(camera._bufferAttachmentMap)
_bufferAttachmentMap(camera._bufferAttachmentMap),
_postDrawCallback(camera._postDrawCallback)
{
}

5
src/osgProducer/GraphicsContextImplementation.cpp
View File

@@ -41,6 +41,8 @@ namespace osgProducer
GraphicsContextImplementation::GraphicsContextImplementation(Traits* traits)
{
_traits = traits;
_rs = new Producer::RenderSurface;
_rs->setWindowName(traits->_windowName);
_rs->setWindowRectangle(traits->_x, traits->_y, traits->_width, traits->_height);
@@ -50,7 +52,7 @@ GraphicsContextImplementation::GraphicsContextImplementation(Traits* traits)
{
_rs->setDrawableType( Producer::RenderSurface::DrawableType_PBuffer );
if (_traits->_alpha>0)
if (traits->_alpha>0)
{
_rs->setRenderToTextureMode(Producer::RenderSurface::RenderToRGBATexture);
}
@@ -65,7 +67,6 @@ GraphicsContextImplementation::GraphicsContextImplementation(Traits* traits)
_rs->realize();
_traits = traits;
}
GraphicsContextImplementation::GraphicsContextImplementation(Producer::RenderSurface* rs)

13
src/osgUtil/CullVisitor.cpp
View File

@@ -1142,22 +1142,13 @@ void CullVisitor::apply(osg::CameraNode& camera)
break;
}
osg::Texture2D* tex = 0;
osg::CameraNode::BufferAttachmentMap& bufferAttachements = camera.getBufferAttachmentMap();
for(osg::CameraNode::BufferAttachmentMap::iterator itr = bufferAttachements.begin();
itr != bufferAttachements.end();
++itr)
{
// if one exist attach texture to the RenderToTextureStage.
osg::Texture2D* texture2D = dynamic_cast<osg::Texture2D*>(itr->second._texture.get());
if (texture2D)
{
tex = texture2D;
rtts->setTexture(texture2D);
}
// assign the texture... pro
if (itr->second._texture.valid()) rtts->setTexture(itr->second._texture.get());
// if one exist attach image to the RenderToTextureStage.
if (itr->second._image.valid()) rtts->setImage(itr->second._image.get());

47
src/osgUtil/RenderToTextureStage.cpp
View File

@@ -11,6 +11,11 @@
* OpenSceneGraph Public License for more details.
*/
#include <osgUtil/RenderToTextureStage>
#include <osg/Texture1D>
#include <osg/Texture2D>
#include <osg/Texture3D>
#include <osg/TextureRectangle>
#include <osg/TextureCubeMap>
using namespace osg;
using namespace osgUtil;
@@ -20,6 +25,11 @@ using namespace osgUtil;
RenderToTextureStage::RenderToTextureStage()
{
_camera = 0;
_level = 0;
_face = 0;
_imageReadPixelFormat = GL_RGBA;
_imageReadPixelDataType = GL_UNSIGNED_BYTE;
}
@@ -78,7 +88,35 @@ void RenderToTextureStage::draw(osg::State& state,RenderLeaf*& previous)
}
// need to implement texture cube map etc...
_texture->copyTexImage2D(state,_viewport->x(),_viewport->y(),_viewport->width(),_viewport->height());
osg::Texture1D* texture1D = 0;
osg::Texture2D* texture2D = 0;
osg::Texture3D* texture3D = 0;
osg::TextureRectangle* textureRec = 0;
osg::TextureCubeMap* textureCubeMap = 0;
if ((texture2D = dynamic_cast<osg::Texture2D*>(_texture.get())) != 0)
{
texture2D->copyTexImage2D(state,_viewport->x(),_viewport->y(),_viewport->width(),_viewport->height());
}
else if ((textureRec = dynamic_cast<osg::TextureRectangle*>(_texture.get())) != 0)
{
textureRec->copyTexImage2D(state,_viewport->x(),_viewport->y(),_viewport->width(),_viewport->height());
}
else if ((texture1D = dynamic_cast<osg::Texture1D*>(_texture.get())) != 0)
{
// need to implement
texture1D->copyTexImage1D(state,_viewport->x(),_viewport->y(),_viewport->width());
}
else if ((texture3D = dynamic_cast<osg::Texture3D*>(_texture.get())) != 0)
{
// need to implement
texture3D->copyTexSubImage3D(state, 0, 0, _face, _viewport->x(), _viewport->y(), _viewport->width(), _viewport->height());
}
else if ((textureCubeMap = dynamic_cast<osg::TextureCubeMap*>(_texture.get())) != 0)
{
// need to implement
// textureCubeMap->copyTexImageCubeMap(state,_viewport->x(),_viewport->y(),_viewport->width(),_viewport->height());
}
}
if (_image.valid())
@@ -86,6 +124,12 @@ void RenderToTextureStage::draw(osg::State& state,RenderLeaf*& previous)
_image->readPixels(_viewport->x(),_viewport->y(),_viewport->width(),_viewport->height(),_imageReadPixelFormat,_imageReadPixelDataType);
}
if (_camera && _camera->getPostDrawCallback())
{
// if we have a camera with a post draw callback invoke it.
(*(_camera->getPostDrawCallback()))(*_camera);
}
if (fbo_supported)
{
// switch of the frame buffer object
@@ -99,5 +143,6 @@ void RenderToTextureStage::draw(osg::State& state,RenderLeaf*& previous)
glReadBuffer(GL_BACK);
}
}