mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2026-02-01 10:18:27 +00:00
Code Issues Releases Wiki Activity

attach.cpp [ci skip]

Browse source
This commit is contained in:
Bo Svensson 2021-09-05 10:24:22 +00:00 committed by GitHub
parent 9ee2cbfb59
commit dfa9f7cb77
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
components/sceneutil/attach.cpp
View file

@ -98,17 +98,17 @@ namespace SceneUtil
}
}
osg::ref_ptr<osg::Node> attach(osg::ref_ptr<osg::Node> toAttach, osg::Node *master, const std::string &filter, osg::Group* attachNode)
osg::ref_ptr<osg::Node> attach(osg::ref_ptr<const osg::Node> toAttach, osg::Node *master, const std::string &filter, osg::Group* attachNode)
{
if (dynamic_cast<SceneUtil::Skeleton*>(toAttach.get()))
if (dynamic_cast<const SceneUtil::Skeleton*>(toAttach.get()))
{
osg::ref_ptr<osg::Group> handle = new osg::Group;
CopyRigVisitor copyVisitor(handle, filter);
toAttach->accept(copyVisitor);
const_cast<osg::Node*>(toAttach.get())->accept(copyVisitor);
copyVisitor.doCopy();
if (handle->getNumChildren() == 1 && handle->getChild(0)->referenceCount() == 1)
if (handle->getNumChildren() == 1)
{
osg::ref_ptr<osg::Node> newHandle = handle->getChild(0);
handle->removeChild(newHandle);
@ -126,9 +126,9 @@ namespace SceneUtil
else
{
CopyOp copyOp;
toAttach = osg::clone(toAttach, copyOp);
osg::ref_ptr<osg::Node> clonedToAttach = osg::clone(toAttach, copyOp);
FindByNameVisitor findBoneOffset("BoneOffset");
toAttach->accept(findBoneOffset);
clonedToAttach->accept(findBoneOffset);
osg::ref_ptr<osg::PositionAttitudeTransform> trans;
@ -171,19 +171,12 @@ namespace SceneUtil
if (trans)
{
attachNode->addChild(trans);
trans->addChild(toAttach);
trans->addChild(clonedToAttach);
return trans;
}
else if (toAttach->referenceCount() > 1)
{
osg::ref_ptr<osg::Group> group = new osg::Group;
group->addChild(toAttach);
attachNode->addChild(group);
return group;
}
else
{
attachNode->addChild(toAttach);
attachNode->addChild(clonedToAttach);
return toAttach;
}
}