teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Use DEEP_COPY_PRIMITIVES to work around problem in osg::Geometry copy constructor (Bug #2754)

Browse source
This commit is contained in:
scrawl 2015-08-30 20:00:37 +02:00
parent 8aaba0af6f
commit cda8a88f0d
1 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
components/sceneutil/clone.cpp
View file

@ -52,6 +52,32 @@ namespace SceneUtil
{ {
osg::CopyOp copyop = *this; osg::CopyOp copyop = *this;
copyop.setCopyFlags(copyop.getCopyFlags()|osg::CopyOp::DEEP_COPY_ARRAYS); copyop.setCopyFlags(copyop.getCopyFlags()|osg::CopyOp::DEEP_COPY_ARRAYS);
/*
Deep copy of primitives required to work around the following (bad?) code in osg::Geometry copy constructor:
if ((copyop.getCopyFlags() & osg::CopyOp::DEEP_COPY_ARRAYS))
{
if (_useVertexBufferObjects)
{
// copying of arrays doesn't set up buffer objects so we'll need to force
// Geometry to assign these, we'll do this by switching off VBO's then renabling them.
setUseVertexBufferObjects(false);
setUseVertexBufferObjects(true);
}
}
In case of DEEP_COPY_PRIMITIVES=Off, DEEP_COPY_ARRAYS=On, the above code makes a modification to the original const Geometry& we copied from,
causing problems if we relied on the original Geometry to remain static such as when it was added to an osgUtil::IncrementalCompileOperation.
TODO: report/fix in upstream OSG
*/
copyop.setCopyFlags(copyop.getCopyFlags()|osg::CopyOp::DEEP_COPY_PRIMITIVES);
osg::Drawable* cloned = osg::clone(drawable, copyop); osg::Drawable* cloned = osg::clone(drawable, copyop);
if (cloned->getUpdateCallback()) if (cloned->getUpdateCallback())
cloned->setUpdateCallback(osg::clone(cloned->getUpdateCallback(), *this)); cloned->setUpdateCallback(osg::clone(cloned->getUpdateCallback(), *this));