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

Clear the Skeleton's bone cache when a node is added/removed (Fixes #3663)

Browse source
This commit is contained in:
scrawl 2016-12-16 20:09:20 +01:00
parent b5e8c98b40
commit f2f0e9f1e7
4 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwrender/creatureanimation.cpp
View file

@ -110,8 +110,6 @@ void CreatureWeaponAnimation::updatePart(PartHolderPtr& scene, int slot)
osg::ref_ptr<osg::Node> node = mResourceSystem->getSceneManager()->getInstance(item.getClass().getModel(item)); osg::ref_ptr<osg::Node> node = mResourceSystem->getSceneManager()->getInstance(item.getClass().getModel(item));
osg::ref_ptr<osg::Node> attached = SceneUtil::attach(node, mObjectRoot, bonename, bonename); osg::ref_ptr<osg::Node> attached = SceneUtil::attach(node, mObjectRoot, bonename, bonename);
mResourceSystem->getSceneManager()->notifyAttached(attached); mResourceSystem->getSceneManager()->notifyAttached(attached);
if (mSkeleton)
mSkeleton->markDirty();
scene.reset(new PartHolder(attached)); scene.reset(new PartHolder(attached));

2
apps/openmw/mwrender/npcanimation.cpp
View file

@ -671,8 +671,6 @@ PartHolderPtr NpcAnimation::insertBoundedPart(const std::string& model, const st
{ {
osg::ref_ptr<osg::Node> instance = mResourceSystem->getSceneManager()->getInstance(model); osg::ref_ptr<osg::Node> instance = mResourceSystem->getSceneManager()->getInstance(model);
osg::ref_ptr<osg::Node> attached = SceneUtil::attach(instance, mObjectRoot, bonefilter, bonename); osg::ref_ptr<osg::Node> attached = SceneUtil::attach(instance, mObjectRoot, bonefilter, bonename);
if (mSkeleton)
mSkeleton->markDirty();
mResourceSystem->getSceneManager()->notifyAttached(attached); mResourceSystem->getSceneManager()->notifyAttached(attached);
if (enchantedGlow) if (enchantedGlow)
addGlow(attached, *glowColor); addGlow(attached, *glowColor);

12
components/sceneutil/skeleton.cpp
View file

@ -148,6 +148,8 @@ void Skeleton::markDirty()
{ {
mTraversedEvenFrame = false; mTraversedEvenFrame = false;
mTraversedOddFrame = false; mTraversedOddFrame = false;
mBoneCache.clear();
mBoneCacheInit = false;
} }
void Skeleton::traverse(osg::NodeVisitor& nv) void Skeleton::traverse(osg::NodeVisitor& nv)
@ -160,6 +162,16 @@ void Skeleton::traverse(osg::NodeVisitor& nv)
osg::Group::traverse(nv); osg::Group::traverse(nv);
} }
void Skeleton::childInserted(unsigned int)
{
markDirty();
}
void Skeleton::childRemoved(unsigned int, unsigned int)
{
markDirty();
}
Bone::Bone() Bone::Bone()
: mNode(NULL) : mNode(NULL)
{ {

6
components/sceneutil/skeleton.hpp
View file

@ -53,10 +53,12 @@ namespace SceneUtil
bool getActive() const; bool getActive() const;
/// If a new RigGeometry is added after the Skeleton has already been rendered, you must call markDirty(). void traverse(osg::NodeVisitor& nv);
void markDirty(); void markDirty();
void traverse(osg::NodeVisitor& nv); virtual void childInserted(unsigned int);
virtual void childRemoved(unsigned int, unsigned int);
private: private:
// The root bone is not a "real" bone, it has no corresponding node in the scene graph. // The root bone is not a "real" bone, it has no corresponding node in the scene graph.