mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 17:49:41 +00:00
Code Issues Releases Wiki Activity

Properly detach nodes in CopyRigVisitor (Fixes #3234)

Browse source
This commit is contained in:
scrawl 2016-03-06 11:33:07 +01:00
parent 82b792f808
commit 0df975a4d7
2 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwrender/animation.cpp
View file

@ -1458,7 +1458,11 @@ namespace MWRender
PartHolder::~PartHolder() PartHolder::~PartHolder()
{ {
if (mNode.get() && mNode->getNumParents()) if (mNode.get() && mNode->getNumParents())
{
if (mNode->getNumParents() > 1)
std::cerr << "Warning: part has multiple parents " << mNode->getNumParents() << " " << mNode.get() << std::endl;
mNode->getParent(0)->removeChild(mNode); mNode->getParent(0)->removeChild(mNode);
}
} }
void PartHolder::unlink() void PartHolder::unlink()

24
components/sceneutil/attach.cpp
View file

@ -1,6 +1,7 @@
#include "attach.hpp" #include "attach.hpp"
#include <stdexcept> #include <stdexcept>
#include <iostream>
#include <osg/NodeVisitor> #include <osg/NodeVisitor>
#include <osg/Group> #include <osg/Group>
@ -34,14 +35,30 @@ namespace SceneUtil
std::string lowerName = Misc::StringUtils::lowerCase(node.getName()); std::string lowerName = Misc::StringUtils::lowerCase(node.getName());
if ((lowerName.size() >= mFilter.size() && lowerName.compare(0, mFilter.size(), mFilter) == 0) if ((lowerName.size() >= mFilter.size() && lowerName.compare(0, mFilter.size(), mFilter) == 0)
|| (lowerName.size() >= mFilter2.size() && lowerName.compare(0, mFilter2.size(), mFilter2) == 0)) || (lowerName.size() >= mFilter2.size() && lowerName.compare(0, mFilter2.size(), mFilter2) == 0))
{ mToCopy.push_back(&node);
mParent->addChild(&node);
}
else else
traverse(node); traverse(node);
} }
void doCopy()
{
for (std::vector<osg::ref_ptr<osg::Node> >::iterator it = mToCopy.begin(); it != mToCopy.end(); ++it)
{
osg::ref_ptr<osg::Node> node = *it;
if (node->getNumParents() > 1)
std::cerr << "CopyRigVisitor warning: node has multiple parents" << std::endl;
while (node->getNumParents())
node->getParent(0)->removeChild(node);
mParent->addChild(node);
}
mToCopy.clear();
}
private: private:
typedef std::vector<osg::ref_ptr<osg::Node> > NodeVector;
NodeVector mToCopy;
osg::ref_ptr<osg::Group> mParent; osg::ref_ptr<osg::Group> mParent;
std::string mFilter; std::string mFilter;
std::string mFilter2; std::string mFilter2;
@ -55,6 +72,7 @@ namespace SceneUtil
CopyRigVisitor copyVisitor(handle, filter); CopyRigVisitor copyVisitor(handle, filter);
toAttach->accept(copyVisitor); toAttach->accept(copyVisitor);
copyVisitor.doCopy();
if (handle->getNumChildren() == 1) if (handle->getNumChildren() == 1)
{ {