diff --git a/include/Nazara/Physics3D.hpp b/include/Nazara/Physics3D.hpp index c8eb0c6aa..1a7c67dc4 100644 --- a/include/Nazara/Physics3D.hpp +++ b/include/Nazara/Physics3D.hpp @@ -32,10 +32,10 @@ #include #include #include +#include #include #include #include -#include #include #include #include diff --git a/include/Nazara/Physics3D/PhysBody3D.hpp b/include/Nazara/Physics3D/PhysBody3D.hpp new file mode 100644 index 000000000..18fcea5b8 --- /dev/null +++ b/include/Nazara/Physics3D/PhysBody3D.hpp @@ -0,0 +1,32 @@ +// Copyright (C) 2024 Jérôme "SirLynix" Leclercq (lynix680@gmail.com) +// This file is part of the "Nazara Engine - Physics3D module" +// For conditions of distribution and use, see copyright notice in Config.hpp + +#pragma once + +#ifndef NAZARA_PHYSICS3D_PHYSBODY3D_HPP +#define NAZARA_PHYSICS3D_PHYSBODY3D_HPP + +#include +#include + +namespace Nz +{ + class NAZARA_PHYSICS3D_API PhysBody3D + { + public: + PhysBody3D() = default; + PhysBody3D(const PhysBody3D&) = delete; + PhysBody3D(PhysBody3D&&) = delete; + virtual ~PhysBody3D(); + + virtual UInt32 GetBodyIndex() const = 0; + + PhysBody3D& operator=(const PhysBody3D&) = delete; + PhysBody3D& operator=(PhysBody3D&&) = delete; + }; +} + +#include + +#endif // NAZARA_PHYSICS3D_PHYSBODY3D_HPP diff --git a/include/Nazara/Physics3D/Physics3DBody.inl b/include/Nazara/Physics3D/PhysBody3D.inl similarity index 100% rename from include/Nazara/Physics3D/Physics3DBody.inl rename to include/Nazara/Physics3D/PhysBody3D.inl diff --git a/include/Nazara/Physics3D/PhysCharacter3D.hpp b/include/Nazara/Physics3D/PhysCharacter3D.hpp index 696fac879..0921a671f 100644 --- a/include/Nazara/Physics3D/PhysCharacter3D.hpp +++ b/include/Nazara/Physics3D/PhysCharacter3D.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include @@ -28,7 +28,7 @@ namespace Nz class Collider3D; class PhysWorld3D; - class NAZARA_PHYSICS3D_API PhysCharacter3D : public Physics3DBody, public Physiscs3DStepListener + class NAZARA_PHYSICS3D_API PhysCharacter3D : public PhysBody3D, public Physiscs3DStepListener { friend PhysWorld3D; diff --git a/include/Nazara/Physics3D/PhysWorld3D.hpp b/include/Nazara/Physics3D/PhysWorld3D.hpp index e444d02cb..7d39d09ae 100644 --- a/include/Nazara/Physics3D/PhysWorld3D.hpp +++ b/include/Nazara/Physics3D/PhysWorld3D.hpp @@ -27,7 +27,7 @@ namespace JPH namespace Nz { - class Physics3DBody; + class PhysBody3D; class PhysCharacter3D; class PhysCharacter3DImpl; class Collider3D; @@ -82,20 +82,20 @@ namespace Nz struct PointCollisionInfo { - Physics3DBody* hitBody = nullptr; + PhysBody3D* hitBody = nullptr; }; struct RaycastHit { float fraction; - Physics3DBody* hitBody = nullptr; + PhysBody3D* hitBody = nullptr; Vector3f hitNormal; Vector3f hitPosition; }; struct ShapeCollisionInfo { - Physics3DBody* hitBody = nullptr; + PhysBody3D* hitBody = nullptr; Vector3f collisionPosition1; Vector3f collisionPosition2; Vector3f penetrationAxis; diff --git a/include/Nazara/Physics3D/Physics3DBody.hpp b/include/Nazara/Physics3D/Physics3DBody.hpp deleted file mode 100644 index cba256e85..000000000 --- a/include/Nazara/Physics3D/Physics3DBody.hpp +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (C) 2024 Jérôme "SirLynix" Leclercq (lynix680@gmail.com) -// This file is part of the "Nazara Engine - Physics3D module" -// For conditions of distribution and use, see copyright notice in Config.hpp - -#pragma once - -#ifndef NAZARA_PHYSICS3D_PHYSICS3DBODY_HPP -#define NAZARA_PHYSICS3D_PHYSICS3DBODY_HPP - -#include -#include - -namespace Nz -{ - class NAZARA_PHYSICS3D_API Physics3DBody - { - public: - Physics3DBody() = default; - Physics3DBody(const Physics3DBody&) = delete; - Physics3DBody(Physics3DBody&&) = delete; - virtual ~Physics3DBody(); - - virtual UInt32 GetBodyIndex() const = 0; - - Physics3DBody& operator=(const Physics3DBody&) = delete; - Physics3DBody& operator=(Physics3DBody&&) = delete; - }; -} - -#include - -#endif // NAZARA_PHYSICS3D_PHYSICS3DBODY_HPP diff --git a/include/Nazara/Physics3D/RigidBody3D.hpp b/include/Nazara/Physics3D/RigidBody3D.hpp index 03afad53e..024a2447b 100644 --- a/include/Nazara/Physics3D/RigidBody3D.hpp +++ b/include/Nazara/Physics3D/RigidBody3D.hpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include namespace JPH @@ -27,7 +27,7 @@ namespace Nz { class PhysWorld3D; - class NAZARA_PHYSICS3D_API RigidBody3D : public Physics3DBody + class NAZARA_PHYSICS3D_API RigidBody3D : public PhysBody3D { public: struct DynamicSettings; diff --git a/src/Nazara/Physics3D/Physics3DBody.cpp b/src/Nazara/Physics3D/PhysBody3D.cpp similarity index 75% rename from src/Nazara/Physics3D/Physics3DBody.cpp rename to src/Nazara/Physics3D/PhysBody3D.cpp index 9159c9b3a..5860b8723 100644 --- a/src/Nazara/Physics3D/Physics3DBody.cpp +++ b/src/Nazara/Physics3D/PhysBody3D.cpp @@ -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 +#include #include namespace Nz { - Physics3DBody::~Physics3DBody() = default; + PhysBody3D::~PhysBody3D() = default; } diff --git a/src/Nazara/Physics3D/PhysWorld3D.cpp b/src/Nazara/Physics3D/PhysWorld3D.cpp index 1e3bb7446..f56cb6016 100644 --- a/src/Nazara/Physics3D/PhysWorld3D.cpp +++ b/src/Nazara/Physics3D/PhysWorld3D.cpp @@ -185,7 +185,7 @@ namespace Nz JPH::Body& body = lock.GetBody(); - hitInfo.hitBody = BitCast(static_cast(body.GetUserData())); + hitInfo.hitBody = BitCast(static_cast(body.GetUserData())); if (auto fractionOpt = m_callback(hitInfo)) { @@ -235,7 +235,7 @@ namespace Nz JPH::Body& body = lock.GetBody(); - hitInfo.hitBody = BitCast(static_cast(body.GetUserData())); + hitInfo.hitBody = BitCast(static_cast(body.GetUserData())); if (auto fractionOpt = m_callback(hitInfo)) { @@ -285,7 +285,7 @@ namespace Nz JPH::Body& body = lock.GetBody(); - hitInfo.hitBody = BitCast(static_cast(body.GetUserData())); + hitInfo.hitBody = BitCast(static_cast(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(static_cast(body.GetUserData())); + hitInfo.hitBody = BitCast(static_cast(body.GetUserData())); hitInfo.hitNormal = FromJolt(body.GetWorldSpaceSurfaceNormal(collector.mHit.mSubShapeID2, rayCast.GetPointOnRay(collector.mHit.GetEarlyOutFraction()))); callback(hitInfo); diff --git a/src/Nazara/Physics3D/Systems/Physics3DSystem.cpp b/src/Nazara/Physics3D/Systems/Physics3DSystem.cpp index 93355355b..fc4077561 100644 --- a/src/Nazara/Physics3D/Systems/Physics3DSystem.cpp +++ b/src/Nazara/Physics3D/Systems/Physics3DSystem.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include