mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-19 16:21:08 +00:00
Code Issues Projects Releases Wiki Activity

Remove animation objects from scene outside destructor

Browse Source
This commit is contained in:
elsid 2022-07-23 18:30:28 +02:00
parent 34fd8abf5f
commit 1e7989c5e5
No known key found for this signature in database
GPG Key ID: 4DE04C198CBA7625
5 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/openmw/mwrender/actoranimation.cpp
View File

@ -58,13 +58,7 @@ ActorAnimation::ActorAnimation(const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group>
removeEffects();
}
ActorAnimation::~ActorAnimation()
{
for (ItemLightMap::iterator iter = mItemLights.begin(); iter != mItemLights.end(); ++iter)
{
mInsert->removeChild(iter->second);
}
}
ActorAnimation::~ActorAnimation() = default;
PartHolderPtr ActorAnimation::attachMesh(const std::string& model, const std::string& bonename, bool enchantedGlow, osg::Vec4f* glowColor)
{
@ -594,4 +588,11 @@ void ActorAnimation::removeHiddenItemLight(const MWWorld::ConstPtr& item)
mItemLights.erase(iter);
}
void ActorAnimation::removeFromScene()
{
for (const auto& [k, v] : mItemLights)
mInsert->removeChild(v);
Animation::removeFromScene();
}
}

2
apps/openmw/mwrender/actoranimation.hpp
View File

@ -40,6 +40,8 @@ class ActorAnimation : public Animation, public MWWorld::ContainerStoreListener
bool useShieldAnimations() const override;
bool updateCarriedLeftVisible(const int weaptype) const override;
void removeFromScene() override;
protected:
osg::Group* getBoneByName(const std::string& boneName) const;
virtual void updateHolsteredWeapon(bool showHolsteredWeapons);

17
apps/openmw/mwrender/animation.cpp
View File

@ -527,13 +527,7 @@ namespace MWRender
mLightListCallback = new SceneUtil::LightListCallback;
}
Animation::~Animation()
{
Animation::setLightEffect(0.f);
if (mObjectRoot)
mInsert->removeChild(mObjectRoot);
}
Animation::~Animation() = default;
void Animation::setActive(int active)
{
@ -1769,6 +1763,15 @@ namespace MWRender
return mHeadYawRadians;
}
void Animation::removeFromScene()
{
if (mGlowLight != nullptr)
mInsert->removeChild(mGlowLight);
if (mObjectRoot != nullptr)
mInsert->removeChild(mObjectRoot);
}
// ------------------------------------------------------
float Animation::AnimationTime::getValue(osg::NodeVisitor*)

2
apps/openmw/mwrender/animation.hpp
View File

@ -497,6 +497,8 @@ public:
virtual void setAccurateAiming(bool enabled) {}
virtual bool canBeHarvested() const { return false; }
virtual void removeFromScene();
private:
Animation(const Animation&);
void operator=(Animation&);

4
apps/openmw/mwrender/objects.cpp
View File

@ -115,6 +115,7 @@ bool Objects::removeObject (const MWWorld::Ptr& ptr)
const auto iter = mObjects.find(ptr.mRef);
if(iter != mObjects.end())
{
iter->second->removeFromScene();
mObjects.erase(iter);
if (ptr.getClass().isActor())
@ -148,7 +149,8 @@ void Objects::removeCell(const MWWorld::CellStore* store)
ptr.getClass().getContainerStore(ptr).setContListener(nullptr);
}
mObjects.erase(iter++);
iter->second->removeFromScene();
iter = mObjects.erase(iter);
}
else
++iter;