sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

JoltPhysics3D/JoltCharacter: Fix crash after move

This commit is contained in:
SirLynix 2023-05-21 14:58:55 +02:00
parent 580b3c8804
commit d914f41404
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Nazara/JoltPhysics3D/JoltCharacter.cpp
View File

@ -15,6 +15,7 @@
namespace Nz namespace Nz
{ {
JoltCharacter::JoltCharacter(JoltPhysWorld3D& physWorld, std::shared_ptr<JoltCollider3D> collider, const Vector3f& position, const Quaternionf& rotation) : JoltCharacter::JoltCharacter(JoltPhysWorld3D& physWorld, std::shared_ptr<JoltCollider3D> collider, const Vector3f& position, const Quaternionf& rotation) :
m_impl(physWorld.GetDefaultCharacterImpl()),
m_collider(std::move(collider)), m_collider(std::move(collider)),
m_world(&physWorld) m_world(&physWorld)
{ {
@ -44,7 +45,10 @@ namespace Nz
character.m_bodyIndex = std::numeric_limits<UInt32>::max(); character.m_bodyIndex = std::numeric_limits<UInt32>::max();
if (m_world) if (m_world)
{
m_world->UnregisterStepListener(&character);
m_world->RegisterStepListener(this); m_world->RegisterStepListener(this);
}
} }
JoltCharacter::~JoltCharacter() JoltCharacter::~JoltCharacter()
@ -129,8 +133,7 @@ namespace Nz
JoltCharacter& JoltCharacter::operator=(JoltCharacter&& character) noexcept JoltCharacter& JoltCharacter::operator=(JoltCharacter&& character) noexcept
{ {
if (m_world) Destroy();
m_world->UnregisterStepListener(this);
m_impl = std::move(character.m_impl); m_impl = std::move(character.m_impl);
m_collider = std::move(character.m_collider); m_collider = std::move(character.m_collider);
@ -139,7 +142,10 @@ namespace Nz
m_world = std::move(character.m_world); m_world = std::move(character.m_world);
if (m_world) if (m_world)
{
m_world->UnregisterStepListener(&character);
m_world->RegisterStepListener(this); m_world->RegisterStepListener(this);
}
character.m_bodyIndex = std::numeric_limits<UInt32>::max(); character.m_bodyIndex = std::numeric_limits<UInt32>::max();