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

BulletPhysics3D: Fix movement

This commit is contained in:
SirLynix 2023-03-30 13:23:58 +02:00 committed by Jérôme Leclercq
parent 6447686ad9
commit efc81ff508
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/BulletPhysics3D/BulletConstraint3D.hpp
View File

@ -49,6 +49,8 @@ namespace Nz
template<typename T> const T* GetConstraint() const; template<typename T> const T* GetConstraint() const;
private: private:
void Destroy();
std::unique_ptr<btTypedConstraint> m_constraint; std::unique_ptr<btTypedConstraint> m_constraint;
bool m_bodyCollisionEnabled; bool m_bodyCollisionEnabled;
}; };

21
src/Nazara/BulletPhysics3D/BulletConstraint3D.cpp
View File

@ -14,6 +14,8 @@ namespace Nz
m_constraint(std::move(constraint)), m_constraint(std::move(constraint)),
m_bodyCollisionEnabled(!disableCollisions) m_bodyCollisionEnabled(!disableCollisions)
{ {
m_constraint->setUserConstraintPtr(this);
btDynamicsWorld* world = GetWorld().GetDynamicsWorld(); btDynamicsWorld* world = GetWorld().GetDynamicsWorld();
world->addConstraint(m_constraint.get(), disableCollisions); world->addConstraint(m_constraint.get(), disableCollisions);
} }
@ -28,11 +30,7 @@ namespace Nz
BulletConstraint3D::~BulletConstraint3D() BulletConstraint3D::~BulletConstraint3D()
{ {
if (m_constraint) Destroy();
{
btDynamicsWorld* world = GetWorld().GetDynamicsWorld();
world->removeConstraint(m_constraint.get());
}
} }
BulletRigidBody3D& BulletConstraint3D::GetBodyA() BulletRigidBody3D& BulletConstraint3D::GetBodyA()
@ -74,7 +72,7 @@ namespace Nz
BulletConstraint3D& BulletConstraint3D::operator=(BulletConstraint3D&& constraint) noexcept BulletConstraint3D& BulletConstraint3D::operator=(BulletConstraint3D&& constraint) noexcept
{ {
m_constraint.reset(); Destroy();
m_constraint = std::move(constraint.m_constraint); m_constraint = std::move(constraint.m_constraint);
m_bodyCollisionEnabled = constraint.m_bodyCollisionEnabled; m_bodyCollisionEnabled = constraint.m_bodyCollisionEnabled;
@ -85,6 +83,17 @@ namespace Nz
return *this; return *this;
} }
void BulletConstraint3D::Destroy()
{
if (m_constraint)
{
btDynamicsWorld* world = GetWorld().GetDynamicsWorld();
world->removeConstraint(m_constraint.get());
m_constraint.reset();
}
}
BulletPivotConstraint3D::BulletPivotConstraint3D(BulletRigidBody3D& first, const Vector3f& pivot) : BulletPivotConstraint3D::BulletPivotConstraint3D(BulletRigidBody3D& first, const Vector3f& pivot) :
BulletConstraint3D(std::make_unique<btPoint2PointConstraint>(*first.GetRigidBody(), ToBullet(first.ToLocal(pivot)))) BulletConstraint3D(std::make_unique<btPoint2PointConstraint>(*first.GetRigidBody(), ToBullet(first.ToLocal(pivot))))