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

Added support for Texture1D, 2D, 3D and TextureRectangle into osgUtil::RenderToTextureStage.

src/osg/CameraNode.cpp

@@ -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)
 {
 }
 

src/osgProducer/GraphicsContextImplementation.cpp

@@ -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)

src/osgUtil/CullVisitor.cpp

@@ -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());

src/osgUtil/RenderToTextureStage.cpp

@@ -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);
     }
+    
 }