From 965a00182c5fa8c96531704d81350004a9569640 Mon Sep 17 00:00:00 2001 From: SirLynix Date: Sat, 10 Feb 2024 14:23:01 +0100 Subject: [PATCH] Physics3D: Rename Physiscs3DStepListener to PhysWorld3DStepListener --- include/Nazara/Physics3D.hpp | 2 +- include/Nazara/Physics3D/PhysCharacter3D.hpp | 4 +-- include/Nazara/Physics3D/PhysWorld3D.hpp | 8 ++--- include/Nazara/Physics3D/PhysWorld3D.inl | 4 +-- .../Physics3D/PhysWorld3DStepListener.hpp | 33 +++++++++++++++++++ ...stener.inl => PhysWorld3DStepListener.inl} | 0 .../Physics3D/Physiscs3DStepListener.hpp | 33 ------------------- src/Nazara/Physics3D/PhysWorld3D.cpp | 6 ++-- ...stener.cpp => PhysWorld3DStepListener.cpp} | 8 ++--- 9 files changed, 49 insertions(+), 49 deletions(-) create mode 100644 include/Nazara/Physics3D/PhysWorld3DStepListener.hpp rename include/Nazara/Physics3D/{Physiscs3DStepListener.inl => PhysWorld3DStepListener.inl} (100%) delete mode 100644 include/Nazara/Physics3D/Physiscs3DStepListener.hpp rename src/Nazara/Physics3D/{Physiscs3DStepListener.cpp => PhysWorld3DStepListener.cpp} (53%) diff --git a/include/Nazara/Physics3D.hpp b/include/Nazara/Physics3D.hpp index 1a7c67dc4..d32f398d1 100644 --- a/include/Nazara/Physics3D.hpp +++ b/include/Nazara/Physics3D.hpp @@ -36,8 +36,8 @@ #include #include #include -#include #include +#include #include #ifdef NAZARA_ENTT diff --git a/include/Nazara/Physics3D/PhysCharacter3D.hpp b/include/Nazara/Physics3D/PhysCharacter3D.hpp index 0921a671f..6478f80e6 100644 --- a/include/Nazara/Physics3D/PhysCharacter3D.hpp +++ b/include/Nazara/Physics3D/PhysCharacter3D.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include @@ -28,7 +28,7 @@ namespace Nz class Collider3D; class PhysWorld3D; - class NAZARA_PHYSICS3D_API PhysCharacter3D : public PhysBody3D, public Physiscs3DStepListener + class NAZARA_PHYSICS3D_API PhysCharacter3D : public PhysBody3D, public PhysWorld3DStepListener { friend PhysWorld3D; diff --git a/include/Nazara/Physics3D/PhysWorld3D.hpp b/include/Nazara/Physics3D/PhysWorld3D.hpp index 7d39d09ae..6275abf4f 100644 --- a/include/Nazara/Physics3D/PhysWorld3D.hpp +++ b/include/Nazara/Physics3D/PhysWorld3D.hpp @@ -31,7 +31,7 @@ namespace Nz class PhysCharacter3D; class PhysCharacter3DImpl; class Collider3D; - class Physiscs3DStepListener; + class PhysWorld3DStepListener; class RigidBody3D; class NAZARA_PHYSICS3D_API PhysWorld3D @@ -67,7 +67,7 @@ namespace Nz void RefreshBodies(); - inline void RegisterStepListener(Physiscs3DStepListener* stepListener); + inline void RegisterStepListener(PhysWorld3DStepListener* stepListener); void SetGravity(const Vector3f& gravity); void SetMaxStepCount(std::size_t maxStepCount); @@ -75,7 +75,7 @@ namespace Nz bool Step(Time timestep); - inline void UnregisterStepListener(Physiscs3DStepListener* stepListener); + inline void UnregisterStepListener(PhysWorld3DStepListener* stepListener); PhysWorld3D& operator=(const PhysWorld3D&) = delete; PhysWorld3D& operator=(PhysWorld3D&&) = delete; @@ -125,7 +125,7 @@ namespace Nz std::unique_ptr m_activeBodies; std::unique_ptr m_registeredBodies; std::unique_ptr m_world; - std::vector m_stepListeners; + std::vector m_stepListeners; Vector3f m_gravity; Time m_stepSize; Time m_timestepAccumulator; diff --git a/include/Nazara/Physics3D/PhysWorld3D.inl b/include/Nazara/Physics3D/PhysWorld3D.inl index 4a36dbd11..3f22bd5b4 100644 --- a/include/Nazara/Physics3D/PhysWorld3D.inl +++ b/include/Nazara/Physics3D/PhysWorld3D.inl @@ -22,13 +22,13 @@ namespace Nz return m_registeredBodies[blockIndex] & (UInt64(1u) << localIndex); } - inline void PhysWorld3D::RegisterStepListener(Physiscs3DStepListener* stepListener) + inline void PhysWorld3D::RegisterStepListener(PhysWorld3DStepListener* stepListener) { auto it = std::lower_bound(m_stepListeners.begin(), m_stepListeners.end(), stepListener); m_stepListeners.insert(it, stepListener); } - inline void PhysWorld3D::UnregisterStepListener(Physiscs3DStepListener* stepListener) + inline void PhysWorld3D::UnregisterStepListener(PhysWorld3DStepListener* stepListener) { auto it = std::lower_bound(m_stepListeners.begin(), m_stepListeners.end(), stepListener); assert(*it == stepListener); diff --git a/include/Nazara/Physics3D/PhysWorld3DStepListener.hpp b/include/Nazara/Physics3D/PhysWorld3DStepListener.hpp new file mode 100644 index 000000000..55e00e342 --- /dev/null +++ b/include/Nazara/Physics3D/PhysWorld3DStepListener.hpp @@ -0,0 +1,33 @@ +// 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_PHYSWORLD3DSTEPLISTENER_HPP +#define NAZARA_PHYSICS3D_PHYSWORLD3DSTEPLISTENER_HPP + +#include +#include + +namespace Nz +{ + class NAZARA_PHYSICS3D_API PhysWorld3DStepListener + { + public: + PhysWorld3DStepListener() = default; + PhysWorld3DStepListener(const PhysWorld3DStepListener&) = delete; + PhysWorld3DStepListener(PhysWorld3DStepListener&&) = delete; + virtual ~PhysWorld3DStepListener(); + + virtual void PostSimulate(float elapsedTime); + virtual void PreSimulate(float elapsedTime); + + PhysWorld3DStepListener& operator=(const PhysWorld3DStepListener&) = delete; + PhysWorld3DStepListener& operator=(PhysWorld3DStepListener&&) = delete; + }; +} + +#include + +#endif // NAZARA_PHYSICS3D_PHYSWORLD3DSTEPLISTENER_HPP diff --git a/include/Nazara/Physics3D/Physiscs3DStepListener.inl b/include/Nazara/Physics3D/PhysWorld3DStepListener.inl similarity index 100% rename from include/Nazara/Physics3D/Physiscs3DStepListener.inl rename to include/Nazara/Physics3D/PhysWorld3DStepListener.inl diff --git a/include/Nazara/Physics3D/Physiscs3DStepListener.hpp b/include/Nazara/Physics3D/Physiscs3DStepListener.hpp deleted file mode 100644 index b2091eae6..000000000 --- a/include/Nazara/Physics3D/Physiscs3DStepListener.hpp +++ /dev/null @@ -1,33 +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_PHYSISCS3DSTEPLISTENER_HPP -#define NAZARA_PHYSICS3D_PHYSISCS3DSTEPLISTENER_HPP - -#include -#include - -namespace Nz -{ - class NAZARA_PHYSICS3D_API Physiscs3DStepListener - { - public: - Physiscs3DStepListener() = default; - Physiscs3DStepListener(const Physiscs3DStepListener&) = delete; - Physiscs3DStepListener(Physiscs3DStepListener&&) = delete; - virtual ~Physiscs3DStepListener(); - - virtual void PostSimulate(float elapsedTime); - virtual void PreSimulate(float elapsedTime); - - Physiscs3DStepListener& operator=(const Physiscs3DStepListener&) = delete; - Physiscs3DStepListener& operator=(Physiscs3DStepListener&&) = delete; - }; -} - -#include - -#endif // NAZARA_PHYSICS3D_PHYSISCS3DSTEPLISTENER_HPP diff --git a/src/Nazara/Physics3D/PhysWorld3D.cpp b/src/Nazara/Physics3D/PhysWorld3D.cpp index f56cb6016..1387aaeb2 100644 --- a/src/Nazara/Physics3D/PhysWorld3D.cpp +++ b/src/Nazara/Physics3D/PhysWorld3D.cpp @@ -6,8 +6,8 @@ #include #include #include +#include #include -#include #include #include #include @@ -600,7 +600,7 @@ namespace Nz { m_world->physicsSystem.Update(stepSize, 1, &m_world->tempAllocator, &jobSystem); - for (Physiscs3DStepListener* stepListener : m_stepListeners) + for (PhysWorld3DStepListener* stepListener : m_stepListeners) stepListener->PostSimulate(stepSize); m_timestepAccumulator -= m_stepSize; @@ -677,7 +677,7 @@ namespace Nz void PhysWorld3D::OnPreStep(float deltatime) { - for (Physiscs3DStepListener* stepListener : m_stepListeners) + for (PhysWorld3DStepListener* stepListener : m_stepListeners) stepListener->PreSimulate(deltatime); } } diff --git a/src/Nazara/Physics3D/Physiscs3DStepListener.cpp b/src/Nazara/Physics3D/PhysWorld3DStepListener.cpp similarity index 53% rename from src/Nazara/Physics3D/Physiscs3DStepListener.cpp rename to src/Nazara/Physics3D/PhysWorld3DStepListener.cpp index bb4d0321c..85bbf5ade 100644 --- a/src/Nazara/Physics3D/Physiscs3DStepListener.cpp +++ b/src/Nazara/Physics3D/PhysWorld3DStepListener.cpp @@ -2,18 +2,18 @@ // 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 { - Physiscs3DStepListener::~Physiscs3DStepListener() = default; + PhysWorld3DStepListener::~PhysWorld3DStepListener() = default; - void Physiscs3DStepListener::PostSimulate(float /*elapsedTime*/) + void PhysWorld3DStepListener::PostSimulate(float /*elapsedTime*/) { } - void Physiscs3DStepListener::PreSimulate(float /*elapsedTime*/) + void PhysWorld3DStepListener::PreSimulate(float /*elapsedTime*/) { } }