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

JoltPhysics3D: Allow to construct components without using the system

Browse Source
This commit is contained in:
SirLynix
2023-07-23 13:05:33 +02:00
parent 20f000c8dc
commit c081811760
14 changed files with 167 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,25 +14,11 @@
namespace Nz
{
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_world(&physWorld)
JoltCharacter::JoltCharacter() = default;
JoltCharacter::JoltCharacter(JoltPhysWorld3D& physWorld, const Settings& settings)
{
auto shapeResult = m_collider->GetShapeSettings()->Create();
if (!shapeResult.IsValid())
throw std::runtime_error("invalid shape");
JPH::CharacterSettings settings;
settings.mShape = shapeResult.Get();
settings.mLayer = 1;
m_character = std::make_unique<JPH::Character>(&settings, ToJolt(position), ToJolt(rotation), 0, m_world->GetPhysicsSystem());
m_character->AddToPhysicsSystem();
m_bodyIndex = m_character->GetBodyID().GetIndex();
m_world->RegisterStepListener(this);
Create(physWorld, settings);
}
JoltCharacter::JoltCharacter(JoltCharacter&& character) noexcept :
@@ -152,6 +138,28 @@ namespace Nz
return *this;
}
void JoltCharacter::Create(JoltPhysWorld3D& physWorld, const Settings& settings)
{
m_collider = settings.collider;
m_impl = physWorld.GetDefaultCharacterImpl();
m_world = &physWorld;
auto shapeResult = m_collider->GetShapeSettings()->Create();
if (!shapeResult.IsValid())
throw std::runtime_error("invalid shape");
JPH::CharacterSettings characterSettings;
characterSettings.mShape = shapeResult.Get();
characterSettings.mLayer = 1;
m_character = std::make_unique<JPH::Character>(&characterSettings, ToJolt(settings.position), ToJolt(settings.rotation), 0, m_world->GetPhysicsSystem());
m_character->AddToPhysicsSystem();
m_bodyIndex = m_character->GetBodyID().GetIndex();
m_world->RegisterStepListener(this);
}
void JoltCharacter::Destroy()
{
if (m_character)