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

Added a concrete osg::DeleteHandler implementation which provides support for

Browse Source 
retain objects for several frames before deleting them.  Also added RenderStageCache
into CullVistor.cpp that is used for handling RTT osg::Camera's that are being
used in double buffered SceneView usage.
This commit is contained in:
Robert Osfield
2007-02-02 12:41:13 +00:00
parent 158921574c
commit 6d9641a78b
11 changed files with 309 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/osgUtil/CullVisitor.cpp
View File

@@ -1068,6 +1068,38 @@ void CullVisitor::apply(osg::ClearNode& node)
}
namespace osgUtil
{
class RenderStageCache : public osg::Object
{
public:
RenderStageCache() {}
RenderStageCache(const RenderStageCache&, const osg::CopyOp&) {}
META_Object(osgUtil, RenderStageCache);
void setRenderStage(CullVisitor* cv, RenderStage* rs)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
_renderStageMap[cv] = rs;
}
RenderStage* getRenderStage(osgUtil::CullVisitor* cv)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
return _renderStageMap[cv].get();
}
typedef std::map<CullVisitor*, osg::ref_ptr<RenderStage> > RenderStageMap;
OpenThreads::Mutex _mutex;
RenderStageMap _renderStageMap;
};
}
void CullVisitor::apply(osg::Camera& camera)
{
// push the node's state.
@@ -1136,12 +1168,21 @@ void CullVisitor::apply(osg::Camera& camera)
// use render to texture stage.
// create the render to texture stage.
osg::ref_ptr<osgUtil::RenderStage> rtts = dynamic_cast<osgUtil::RenderStage*>(camera.getRenderingCache(contextID));
osg::ref_ptr<osgUtil::RenderStageCache> rsCache = dynamic_cast<osgUtil::RenderStageCache*>(camera.getRenderingCache(contextID));
if (!rsCache)
{
rsCache = new osgUtil::RenderStageCache;
camera.setRenderingCache(contextID, rsCache.get());
}
osg::ref_ptr<osgUtil::RenderStage> rtts = rsCache->getRenderStage(this);
if (!rtts)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(*(camera.getDataChangeMutex()));
rtts = new osgUtil::RenderStage;
rsCache->setRenderStage(this,rtts.get());
rtts->setCamera(&camera);
if (camera.getDrawBuffer() != GL_NONE)
@@ -1164,7 +1205,6 @@ void CullVisitor::apply(osg::Camera& camera)
rtts->setReadBuffer(previous_stage->getReadBuffer());
}
camera.setRenderingCache(contextID, rtts.get());
}
else
{

4
src/osgUtil/RenderBin.cpp
View File

@@ -481,7 +481,7 @@ bool RenderBin::getStats(Statistics& stats) const
++dw_itr)
{
const RenderLeaf* rl = *dw_itr;
const Drawable* dw= rl->_drawable;
const Drawable* dw= rl->getDrawable();
stats.addDrawable(); // number of geosets
if (rl->_modelview.get())
{
@@ -506,7 +506,7 @@ bool RenderBin::getStats(Statistics& stats) const
++dw_itr)
{
const RenderLeaf* rl = dw_itr->get();
const Drawable* dw= rl->_drawable;
const Drawable* dw= rl->getDrawable();
stats.addDrawable(); // number of geosets
if (rl->_modelview.get()) stats.addMatrix(); // number of matrices
if (dw)