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

JoltPhysics3D: Add JoltPivotConstraint3D

Browse Source
This commit is contained in:
SirLynix
2023-03-30 13:23:36 +02:00
committed by Jérôme Leclercq
parent d697450a60
commit 6447686ad9
5 changed files with 133 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
include/Nazara/JoltPhysics3D/JoltConstraint3D.hpp
View File

@@ -3,63 +3,68 @@
// For conditions of distribution and use, see copyright notice in Config.hpp
#pragma once
#if 0
#ifndef NAZARA_JOLTPHYSICS3D_JOLTCONSTRAINT3D_HPP
#define NAZARA_JOLTPHYSICS3D_JOLTCONSTRAINT3D_HPP
#include <NazaraUtils/Prerequisites.hpp>
#include <Nazara/BulletPhysics3D/BulletPhysWorld3D.hpp>
#include <Nazara/BulletPhysics3D/BulletRigidBody3D.hpp>
#include <Nazara/BulletPhysics3D/Config.hpp>
#include <Nazara/JoltPhysics3D/JoltPhysWorld3D.hpp>
#include <Nazara/JoltPhysics3D/JoltRigidBody3D.hpp>
#include <Nazara/JoltPhysics3D/Config.hpp>
#include <Nazara/Core/HandledObject.hpp>
#include <Nazara/Core/ObjectHandle.hpp>
class btTypedConstraint;
namespace JPH
{
class TwoBodyConstraint;
}
namespace Nz
{
class BulletConstraint3D;
class JoltConstraint3D;
using BulletConstraint3DHandle = ObjectHandle<BulletConstraint3D>;
using JoltConstraint3DHandle = ObjectHandle<JoltConstraint3D>;
class NAZARA_BULLETPHYSICS3D_API BulletConstraint3D : public HandledObject<BulletConstraint3D>
class NAZARA_JOLTPHYSICS3D_API JoltConstraint3D : public HandledObject<JoltConstraint3D>
{
public:
BulletConstraint3D(const BulletConstraint3D&) = delete;
BulletConstraint3D(BulletConstraint3D&& constraint) noexcept;
virtual ~BulletConstraint3D();
JoltConstraint3D(const JoltConstraint3D&) = delete;
JoltConstraint3D(JoltConstraint3D&& constraint) noexcept;
virtual ~JoltConstraint3D();
BulletRigidBody3D& GetBodyA();
const BulletRigidBody3D& GetBodyA() const;
BulletRigidBody3D& GetBodyB();
const BulletRigidBody3D& GetBodyB() const;
BulletPhysWorld3D& GetWorld();
const BulletPhysWorld3D& GetWorld() const;
JoltRigidBody3D& GetBodyA();
const JoltRigidBody3D& GetBodyA() const;
JoltRigidBody3D& GetBodyB();
const JoltRigidBody3D& GetBodyB() const;
JoltPhysWorld3D& GetWorld();
const JoltPhysWorld3D& GetWorld() const;
inline bool IsBodyCollisionEnabled() const;
bool IsSingleBody() const;
BulletConstraint3D& operator=(const BulletConstraint3D&) = delete;
BulletConstraint3D& operator=(BulletConstraint3D&& constraint) noexcept;
JoltConstraint3D& operator=(const JoltConstraint3D&) = delete;
JoltConstraint3D& operator=(JoltConstraint3D&& constraint) noexcept;
protected:
BulletConstraint3D(std::unique_ptr<btTypedConstraint> constraint, bool disableCollisions = false);
JoltConstraint3D();
template<typename T> T* GetConstraint();
template<typename T> const T* GetConstraint() const;
void SetupConstraint(std::unique_ptr<JPH::TwoBodyConstraint> constraint);
private:
std::unique_ptr<btTypedConstraint> m_constraint;
bool m_bodyCollisionEnabled;
void Destroy();
std::unique_ptr<JPH::TwoBodyConstraint> m_constraint;
};
class NAZARA_BULLETPHYSICS3D_API BulletPivotConstraint3D : public BulletConstraint3D
class NAZARA_JOLTPHYSICS3D_API JoltPivotConstraint3D : public JoltConstraint3D
{
public:
BulletPivotConstraint3D(BulletRigidBody3D& first, const Vector3f& pivot);
BulletPivotConstraint3D(BulletRigidBody3D& first, BulletRigidBody3D& second, const Vector3f& pivot, bool disableCollisions = false);
BulletPivotConstraint3D(BulletRigidBody3D& first, BulletRigidBody3D& second, const Vector3f& firstAnchor, const Vector3f& secondAnchor, bool disableCollisions = false);
~BulletPivotConstraint3D() = default;
JoltPivotConstraint3D(JoltRigidBody3D& first, const Vector3f& pivot);
JoltPivotConstraint3D(JoltRigidBody3D& first, JoltRigidBody3D& second, const Vector3f& pivot);
JoltPivotConstraint3D(JoltRigidBody3D& first, JoltRigidBody3D& second, const Vector3f& firstAnchor, const Vector3f& secondAnchor);
~JoltPivotConstraint3D() = default;
Vector3f GetFirstAnchor() const;
Vector3f GetSecondAnchor() const;
@@ -69,7 +74,6 @@ namespace Nz
};
}
#include <Nazara/BulletPhysics3D/BulletConstraint3D.inl>
#include <Nazara/JoltPhysics3D/JoltConstraint3D.inl>
#endif // NAZARA_BULLETPHYSICS3D_BULLETCONSTRAINT3D_HPP
#endif // NAZARA_JOLTPHYSICS3D_JOLTCONSTRAINT3D_HPP

9
include/Nazara/JoltPhysics3D/JoltConstraint3D.inl
View File

@@ -6,19 +6,14 @@
namespace Nz
{
inline bool BulletConstraint3D::IsBodyCollisionEnabled() const
{
return m_bodyCollisionEnabled;
}
template<typename T>
T* BulletConstraint3D::GetConstraint()
T* JoltConstraint3D::GetConstraint()
{
return SafeCast<T*>(m_constraint.get());
}
template<typename T>
const T* BulletConstraint3D::GetConstraint() const
const T* JoltConstraint3D::GetConstraint() const
{
return SafeCast<const T*>(m_constraint.get());
}

2
include/Nazara/JoltPhysics3D/JoltRigidBody3D.hpp
View File

@@ -46,6 +46,8 @@ namespace Nz
Boxf GetAABB() const;
float GetAngularDamping() const;
Vector3f GetAngularVelocity() const;
inline JPH::Body* GetBody();
inline const JPH::Body* GetBody() const;
inline UInt32 GetBodyIndex() const;
inline const std::shared_ptr<JoltCollider3D>& GetGeom() const;
float GetLinearDamping() const;

10
include/Nazara/JoltPhysics3D/JoltRigidBody3D.inl
View File

@@ -11,6 +11,16 @@ namespace Nz
return EnableSleeping(false);
}
inline JPH::Body* JoltRigidBody3D::GetBody()
{
return m_body;
}
inline const JPH::Body* JoltRigidBody3D::GetBody() const
{
return m_body;
}
inline UInt32 JoltRigidBody3D::GetBodyIndex() const
{
return m_bodyIndex;