mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-29 04:20:29 +00:00
Code Issues Projects Releases Wiki Activity

Store std::weak_ptr into mUpdateAabb. This avoid extending the lifetime

Browse Source 
of collision objects beyond what they should.
This commit is contained in:
fredzio 2022-01-22 17:17:20 +01:00
parent c263bbf0f6
commit 26bdba88a2
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/openmw/mwphysics/mtphysics.cpp
View File

@ -518,7 +518,7 @@ namespace MWPhysics
mCollisionWorld->removeCollisionObject(collisionObject);
}
void PhysicsTaskScheduler::updateSingleAabb(std::shared_ptr<PtrHolder> ptr, bool immediate)
void PhysicsTaskScheduler::updateSingleAabb(const std::shared_ptr<PtrHolder>& ptr, bool immediate)
{
if (immediate || mNumThreads == 0)
{
@ -527,7 +527,7 @@ namespace MWPhysics
else
{
MaybeExclusiveLock lock(mUpdateAabbMutex, mNumThreads);
mUpdateAabb.insert(std::move(ptr));
mUpdateAabb.insert(ptr);
}
}
@ -570,7 +570,12 @@ namespace MWPhysics
{
MaybeExclusiveLock lock(mUpdateAabbMutex, mNumThreads);
std::for_each(mUpdateAabb.begin(), mUpdateAabb.end(),
[this](const std::shared_ptr<PtrHolder>& ptr) { updatePtrAabb(ptr); });
[this](const std::weak_ptr<PtrHolder>& ptr)
{
auto p = ptr.lock();
if (p != nullptr)
updatePtrAabb(p);
});
mUpdateAabb.clear();
}

4
apps/openmw/mwphysics/mtphysics.hpp
View File

@ -54,7 +54,7 @@ namespace MWPhysics
void setCollisionFilterMask(btCollisionObject* collisionObject, int collisionFilterMask);
void addCollisionObject(btCollisionObject* collisionObject, int collisionFilterGroup, int collisionFilterMask);
void removeCollisionObject(btCollisionObject* collisionObject);
void updateSingleAabb(std::shared_ptr<PtrHolder> ptr, bool immediate=false);
void updateSingleAabb(const std::shared_ptr<PtrHolder>& ptr, bool immediate=false);
bool getLineOfSight(const std::shared_ptr<Actor>& actor1, const std::shared_ptr<Actor>& actor2);
void debugDraw();
void* getUserPointer(const btCollisionObject* object) const;
@ -85,7 +85,7 @@ namespace MWPhysics
btCollisionWorld* mCollisionWorld;
MWRender::DebugDrawer* mDebugDrawer;
std::vector<LOSRequest> mLOSCache;
std::set<std::shared_ptr<PtrHolder>> mUpdateAabb;
std::set<std::weak_ptr<PtrHolder>, std::owner_less<std::weak_ptr<PtrHolder>>> mUpdateAabb;
// TODO: use std::experimental::flex_barrier or std::barrier once it becomes a thing
std::unique_ptr<Misc::Barrier> mPreStepBarrier;