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

Physics3D: Rename Physiscs3DStepListener to PhysWorld3DStepListener

This commit is contained in:
SirLynix 2024-02-10 14:23:01 +01:00
parent 8c41ac30c9
commit 965a00182c
9 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Physics3D.hpp
View File

@ -36,8 +36,8 @@
#include <Nazara/Physics3D/PhysCharacter3D.hpp>
#include <Nazara/Physics3D/PhysConstraint3D.hpp>
#include <Nazara/Physics3D/Physics3D.hpp>
#include <Nazara/Physics3D/Physiscs3DStepListener.hpp>
#include <Nazara/Physics3D/PhysWorld3D.hpp>
#include <Nazara/Physics3D/PhysWorld3DStepListener.hpp>
#include <Nazara/Physics3D/RigidBody3D.hpp>
#ifdef NAZARA_ENTT

4
include/Nazara/Physics3D/PhysCharacter3D.hpp
View File

@ -12,7 +12,7 @@
#include <Nazara/Math/Vector3.hpp>
#include <Nazara/Physics3D/Config.hpp>
#include <Nazara/Physics3D/PhysBody3D.hpp>
#include <Nazara/Physics3D/Physiscs3DStepListener.hpp>
#include <Nazara/Physics3D/PhysWorld3DStepListener.hpp>
#include <NazaraUtils/MovablePtr.hpp>
#include <memory>
@ -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;

8
include/Nazara/Physics3D/PhysWorld3D.hpp
View File

@ -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<std::atomic_uint64_t[]> m_activeBodies;
std::unique_ptr<std::uint64_t[]> m_registeredBodies;
std::unique_ptr<JoltWorld> m_world;
std::vector<Physiscs3DStepListener*> m_stepListeners;
std::vector<PhysWorld3DStepListener*> m_stepListeners;
Vector3f m_gravity;
Time m_stepSize;
Time m_timestepAccumulator;

4
include/Nazara/Physics3D/PhysWorld3D.inl
View File

@ -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);

33
include/Nazara/Physics3D/PhysWorld3DStepListener.hpp Normal file
View File

@ -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 <NazaraUtils/Prerequisites.hpp>
#include <Nazara/Physics3D/Config.hpp>
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 <Nazara/Physics3D/PhysWorld3DStepListener.inl>
#endif // NAZARA_PHYSICS3D_PHYSWORLD3DSTEPLISTENER_HPP

0
include/Nazara/Physics3D/Physiscs3DStepListener.inl → include/Nazara/Physics3D/PhysWorld3DStepListener.inl
View File

33
include/Nazara/Physics3D/Physiscs3DStepListener.hpp
View File

@ -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 <NazaraUtils/Prerequisites.hpp>
#include <Nazara/Physics3D/Config.hpp>
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 <Nazara/Physics3D/Physiscs3DStepListener.inl>
#endif // NAZARA_PHYSICS3D_PHYSISCS3DSTEPLISTENER_HPP

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

@ -6,8 +6,8 @@
#include <Nazara/Physics3D/Collider3D.hpp>
#include <Nazara/Physics3D/JoltHelper.hpp>
#include <Nazara/Physics3D/PhysCharacter3D.hpp>
#include <Nazara/Physics3D/PhysWorld3DStepListener.hpp>
#include <Nazara/Physics3D/Physics3D.hpp>
#include <Nazara/Physics3D/Physiscs3DStepListener.hpp>
#include <NazaraUtils/MemoryPool.hpp>
#include <NazaraUtils/StackVector.hpp>
#include <Jolt/Jolt.h>
@ -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);
}
}

8
src/Nazara/Physics3D/Physiscs3DStepListener.cpp → src/Nazara/Physics3D/PhysWorld3DStepListener.cpp
View File

@ -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 <Nazara/Physics3D/Physiscs3DStepListener.hpp>
#include <Nazara/Physics3D/PhysWorld3DStepListener.hpp>
#include <Nazara/Physics3D/Debug.hpp>
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*/)
{
}
}