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

Physics3D: Rename Physics3DBody to PhysBody3D

Browse Source
This commit is contained in:
SirLynix
2024-02-10 14:20:47 +01:00
parent 9e3ca2472b
commit 8c41ac30c9
10 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Nazara/Physics3D/Physics3DBody.cpp → src/Nazara/Physics3D/PhysBody3D.cpp
View File

@@ -2,10 +2,10 @@
// This file is part of the "Nazara Engine - Physics3D module"
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Physics3D/Physics3DBody.hpp>
#include <Nazara/Physics3D/PhysBody3D.hpp>
#include <Nazara/Physics3D/Debug.hpp>
namespace Nz
{
Physics3DBody::~Physics3DBody() = default;
PhysBody3D::~PhysBody3D() = default;
}

8
src/Nazara/Physics3D/PhysWorld3D.cpp
View File

@@ -185,7 +185,7 @@ namespace Nz
JPH::Body& body = lock.GetBody();
hitInfo.hitBody = BitCast<Physics3DBody*>(static_cast<std::uintptr_t>(body.GetUserData()));
hitInfo.hitBody = BitCast<PhysBody3D*>(static_cast<std::uintptr_t>(body.GetUserData()));
if (auto fractionOpt = m_callback(hitInfo))
{
@@ -235,7 +235,7 @@ namespace Nz
JPH::Body& body = lock.GetBody();
hitInfo.hitBody = BitCast<Physics3DBody*>(static_cast<std::uintptr_t>(body.GetUserData()));
hitInfo.hitBody = BitCast<PhysBody3D*>(static_cast<std::uintptr_t>(body.GetUserData()));
if (auto fractionOpt = m_callback(hitInfo))
{
@@ -285,7 +285,7 @@ namespace Nz
JPH::Body& body = lock.GetBody();
hitInfo.hitBody = BitCast<Physics3DBody*>(static_cast<std::uintptr_t>(body.GetUserData()));
hitInfo.hitBody = BitCast<PhysBody3D*>(static_cast<std::uintptr_t>(body.GetUserData()));
hitInfo.hitNormal = FromJolt(body.GetWorldSpaceSurfaceNormal(result.mSubShapeID2, ToJolt(hitInfo.hitPosition)));
if (auto fractionOpt = m_callback(hitInfo))
@@ -515,7 +515,7 @@ namespace Nz
RaycastHit hitInfo;
hitInfo.fraction = collector.mHit.GetEarlyOutFraction();
hitInfo.hitPosition = Lerp(from, to, hitInfo.fraction);
hitInfo.hitBody = BitCast<Physics3DBody*>(static_cast<std::uintptr_t>(body.GetUserData()));
hitInfo.hitBody = BitCast<PhysBody3D*>(static_cast<std::uintptr_t>(body.GetUserData()));
hitInfo.hitNormal = FromJolt(body.GetWorldSpaceSurfaceNormal(collector.mHit.mSubShapeID2, rayCast.GetPointOnRay(collector.mHit.GetEarlyOutFraction())));
callback(hitInfo);

2
src/Nazara/Physics3D/Systems/Physics3DSystem.cpp
View File

@@ -4,7 +4,7 @@
#include <Nazara/Physics3D/Systems/Physics3DSystem.hpp>
#include <Nazara/Core/Components/DisabledComponent.hpp>
#include <Nazara/Physics3D/Physics3DBody.hpp>
#include <Nazara/Physics3D/PhysBody3D.hpp>
#include <Nazara/Utility/Components/NodeComponent.hpp>
#include <Nazara/Physics3D/Debug.hpp>