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

JoltPhysics3D: Add some methods to JoltCharacter

This commit is contained in:
SirLynix 2023-03-30 13:24:33 +02:00 committed by Jérôme Leclercq
parent 74bfd8fa4e
commit 8d25495bab
3 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/Nazara/JoltPhysics3D/JoltCharacter.hpp
View File

@ -16,6 +16,7 @@
namespace JPH namespace JPH
{ {
class Character; class Character;
class Body;
} }
namespace Nz namespace Nz
@ -33,13 +34,18 @@ namespace Nz
JoltCharacter(JoltCharacter&&) = delete; JoltCharacter(JoltCharacter&&) = delete;
~JoltCharacter(); ~JoltCharacter();
inline void DisableSleeping();
void EnableSleeping(bool enable);
Vector3f GetLinearVelocity() const; Vector3f GetLinearVelocity() const;
Quaternionf GetRotation() const; Quaternionf GetRotation() const;
Vector3f GetPosition() const; Vector3f GetPosition() const;
std::pair<Vector3f, Quaternionf> GetPositionAndRotation() const; std::pair<Vector3f, Quaternionf> GetPositionAndRotation() const;
Vector3f GetUp() const;
bool IsOnGround() const; bool IsOnGround() const;
void SetFriction(float friction);
void SetLinearVelocity(const Vector3f& linearVel); void SetLinearVelocity(const Vector3f& linearVel);
void SetRotation(const Quaternionf& rotation); void SetRotation(const Quaternionf& rotation);
void SetUp(const Vector3f& up); void SetUp(const Vector3f& up);

5
include/Nazara/JoltPhysics3D/JoltCharacter.inl
View File

@ -2,11 +2,14 @@
// This file is part of the "Nazara Engine - JoltPhysics3D module" // This file is part of the "Nazara Engine - JoltPhysics3D module"
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/JoltPhysics3D/JoltCharacter.hpp>
#include <Nazara/JoltPhysics3D/Debug.hpp> #include <Nazara/JoltPhysics3D/Debug.hpp>
namespace Nz namespace Nz
{ {
inline void JoltCharacter::DisableSleeping()
{
return EnableSleeping(false);
}
} }
#include <Nazara/JoltPhysics3D/DebugOff.hpp> #include <Nazara/JoltPhysics3D/DebugOff.hpp>

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

@ -9,6 +9,7 @@
#include <Jolt/Jolt.h> #include <Jolt/Jolt.h>
#include <Jolt/Physics/Collision/ObjectLayer.h> #include <Jolt/Physics/Collision/ObjectLayer.h>
#include <Jolt/Physics/Character/Character.h> #include <Jolt/Physics/Character/Character.h>
#include <Jolt/Physics/PhysicsSystem.h>
#include <Nazara/JoltPhysics3D/Debug.hpp> #include <Nazara/JoltPhysics3D/Debug.hpp>
namespace Nz namespace Nz
@ -37,6 +38,16 @@ namespace Nz
m_physicsWorld.UnregisterCharacter(this); m_physicsWorld.UnregisterCharacter(this);
} }
void JoltCharacter::EnableSleeping(bool enable)
{
const JPH::BodyLockInterfaceNoLock& bodyInterface = m_physicsWorld.GetPhysicsSystem()->GetBodyLockInterfaceNoLock();
JPH::BodyLockWrite bodyLock(bodyInterface, m_character->GetBodyID());
if (!bodyLock.Succeeded())
return;
bodyLock.GetBody().SetAllowSleeping(enable);
}
Vector3f JoltCharacter::GetLinearVelocity() const Vector3f JoltCharacter::GetLinearVelocity() const
{ {
return FromJolt(m_character->GetLinearVelocity(false)); return FromJolt(m_character->GetLinearVelocity(false));
@ -61,11 +72,22 @@ namespace Nz
return { FromJolt(position), FromJolt(rotation) }; return { FromJolt(position), FromJolt(rotation) };
} }
Vector3f JoltCharacter::GetUp() const
{
return FromJolt(m_character->GetUp());
}
bool JoltCharacter::IsOnGround() const bool JoltCharacter::IsOnGround() const
{ {
return m_character->IsSupported(); return m_character->IsSupported();
} }
void JoltCharacter::SetFriction(float friction)
{
JPH::BodyInterface& bodyInterface = m_physicsWorld.GetPhysicsSystem()->GetBodyInterfaceNoLock();
bodyInterface.SetFriction(m_character->GetBodyID(), friction);
}
void JoltCharacter::SetLinearVelocity(const Vector3f& linearVel) void JoltCharacter::SetLinearVelocity(const Vector3f& linearVel)
{ {
m_character->SetLinearVelocity(ToJolt(linearVel), false); m_character->SetLinearVelocity(ToJolt(linearVel), false);