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

JoltPhysics3D/Physics3DSystem: Cleanup test code

This commit is contained in:
SirLynix 2023-08-10 08:59:20 +02:00
parent 5484967498
commit 494a83e817
2 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Nazara/JoltPhysics3D/JoltPhysics3D.cpp
View File

@ -13,7 +13,6 @@
#include <Jolt/Core/JobSystemThreadPool.h> #include <Jolt/Core/JobSystemThreadPool.h>
#include <Jolt/Physics/PhysicsSettings.h> #include <Jolt/Physics/PhysicsSettings.h>
#include <cstdarg> #include <cstdarg>
#include <iostream>
#include <Nazara/JoltPhysics3D/Debug.hpp> #include <Nazara/JoltPhysics3D/Debug.hpp>
// Callback for traces, connect this to your own trace function if you have one // Callback for traces, connect this to your own trace function if you have one
@ -27,7 +26,7 @@ static void TraceImpl(const char* inFMT, ...)
va_end(list); va_end(list);
// Print to the TTY // Print to the TTY
std::cout << buffer << std::endl; NazaraError(buffer);
} }
namespace Nz namespace Nz

41
src/Nazara/JoltPhysics3D/Systems/JoltPhysics3DSystem.cpp
View File

@ -20,8 +20,6 @@ namespace Nz
m_bodyDestructConnection = registry.on_destroy<JoltRigidBody3DComponent>().connect<&JoltPhysics3DSystem::OnBodyDestruct>(this); m_bodyDestructConnection = registry.on_destroy<JoltRigidBody3DComponent>().connect<&JoltPhysics3DSystem::OnBodyDestruct>(this);
m_stepCount = 0; m_stepCount = 0;
m_physicsTime = Time::Zero();
m_updateTime = Time::Zero();
} }
JoltPhysics3DSystem::~JoltPhysics3DSystem() JoltPhysics3DSystem::~JoltPhysics3DSystem()
@ -39,23 +37,6 @@ namespace Nz
rigidBodyComponent.Destroy(true); rigidBodyComponent.Destroy(true);
} }
void JoltPhysics3DSystem::Dump()
{
if (m_stepCount == 0)
m_stepCount = 1;
/*
NazaraDebug("Physics time: " << (m_physicsTime / Time::Nanoseconds(m_stepCount)));
NazaraDebug("Replication time: " << (m_updateTime / Time::Nanoseconds(m_stepCount)));
NazaraDebug("Active entity count: " << m_physWorld.GetActiveBodyCount()));
NazaraDebug("--");
*/
m_stepCount = 0;
m_physicsTime = Time::Zero();
m_updateTime = Time::Zero();
}
bool JoltPhysics3DSystem::RaycastQuery(const Vector3f& from, const Vector3f& to, const FunctionRef<std::optional<float>(const RaycastHit& hitInfo)>& callback) bool JoltPhysics3DSystem::RaycastQuery(const Vector3f& from, const Vector3f& to, const FunctionRef<std::optional<float>(const RaycastHit& hitInfo)>& callback)
{ {
return m_physWorld.RaycastQuery(from, to, [&](const JoltPhysWorld3D::RaycastHit& hitInfo) return m_physWorld.RaycastQuery(from, to, [&](const JoltPhysWorld3D::RaycastHit& hitInfo)
@ -66,8 +47,8 @@ namespace Nz
if (extendedHitInfo.hitBody) if (extendedHitInfo.hitBody)
{ {
std::size_t bodyIndex = extendedHitInfo.hitBody->GetBodyIndex(); std::size_t bodyIndex = extendedHitInfo.hitBody->GetBodyIndex();
if (bodyIndex < m_physicsEntities.size()) if (bodyIndex < m_bodyIndicesToEntity.size())
extendedHitInfo.hitEntity = entt::handle(m_registry, m_physicsEntities[bodyIndex]); extendedHitInfo.hitEntity = entt::handle(m_registry, m_bodyIndicesToEntity[bodyIndex]);
} }
return callback(extendedHitInfo); return callback(extendedHitInfo);
@ -84,8 +65,8 @@ namespace Nz
if (extendedHitInfo.hitBody) if (extendedHitInfo.hitBody)
{ {
std::size_t bodyIndex = extendedHitInfo.hitBody->GetBodyIndex(); std::size_t bodyIndex = extendedHitInfo.hitBody->GetBodyIndex();
if (bodyIndex < m_physicsEntities.size()) if (bodyIndex < m_bodyIndicesToEntity.size())
extendedHitInfo.hitEntity = entt::handle(m_registry, m_physicsEntities[bodyIndex]); extendedHitInfo.hitEntity = entt::handle(m_registry, m_bodyIndicesToEntity[bodyIndex]);
} }
callback(extendedHitInfo); callback(extendedHitInfo);
@ -164,11 +145,11 @@ namespace Nz
JoltRigidBody3DComponent& rigidBody = registry.get<JoltRigidBody3DComponent>(entity); JoltRigidBody3DComponent& rigidBody = registry.get<JoltRigidBody3DComponent>(entity);
rigidBody.Construct(m_physWorld); rigidBody.Construct(m_physWorld);
std::size_t uniqueIndex = rigidBody.GetBodyIndex(); UInt32 uniqueIndex = rigidBody.GetBodyIndex();
if (uniqueIndex >= m_physicsEntities.size()) if (uniqueIndex >= m_bodyIndicesToEntity.size())
m_physicsEntities.resize(uniqueIndex + 1); m_bodyIndicesToEntity.resize(uniqueIndex + 1);
m_physicsEntities[uniqueIndex] = entity; m_bodyIndicesToEntity[uniqueIndex] = entity;
} }
void JoltPhysics3DSystem::OnCharacterConstruct(entt::registry& registry, entt::entity entity) void JoltPhysics3DSystem::OnCharacterConstruct(entt::registry& registry, entt::entity entity)
@ -181,9 +162,9 @@ namespace Nz
{ {
// Unregister owning entity // Unregister owning entity
JoltRigidBody3DComponent& rigidBody = registry.get<JoltRigidBody3DComponent>(entity); JoltRigidBody3DComponent& rigidBody = registry.get<JoltRigidBody3DComponent>(entity);
std::size_t uniqueIndex = rigidBody.GetBodyIndex(); UInt32 uniqueIndex = rigidBody.GetBodyIndex();
assert(uniqueIndex <= m_physicsEntities.size()); assert(uniqueIndex <= m_bodyIndicesToEntity.size());
m_physicsEntities[uniqueIndex] = entt::null; m_bodyIndicesToEntity[uniqueIndex] = entt::null;
} }
} }