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

Physics[2|3]D/PhysWorld[2|3]D: Add max step count

Browse Source
This commit is contained in:
Jérôme Leclercq
2018-02-09 17:29:20 +01:00
parent bb7c97ed9a
commit 45af15d802
5 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/Nazara/Physics2D/PhysWorld2D.hpp
View File

@@ -55,6 +55,7 @@ namespace Nz
Vector2f GetGravity() const;
cpSpace* GetHandle() const;
std::size_t GetIterationCount() const;
std::size_t GetMaxStepCount() const;
float GetStepSize() const;
bool NearestBodyQuery(const Vector2f& from, float maxDistance, Nz::UInt32 collisionGroup, Nz::UInt32 categoryMask, Nz::UInt32 collisionMask, RigidBody2D** nearestBody = nullptr);
@@ -71,6 +72,7 @@ namespace Nz
void SetDamping(float dampingValue);
void SetGravity(const Vector2f& gravity);
void SetIterationCount(std::size_t iterationCount);
void SetMaxStepCount(std::size_t maxStepCount);
void SetStepSize(float stepSize);
void Step(float timestep);
@@ -144,6 +146,7 @@ namespace Nz
static_assert(std::is_nothrow_move_constructible<PostStepContainer>::value, "PostStepContainer should be noexcept MoveConstructible");
std::size_t m_maxStepCount;
std::unordered_map<cpCollisionHandler*, std::unique_ptr<Callback>> m_callbacks;
std::unordered_map<RigidBody2D*, PostStepContainer> m_rigidPostSteps;
cpSpace* m_handle;

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

@@ -25,9 +25,11 @@ namespace Nz
Vector3f GetGravity() const;
NewtonWorld* GetHandle() const;
std::size_t GetMaxStepCount() const;
float GetStepSize() const;
void SetGravity(const Vector3f& gravity);
void SetMaxStepCount(std::size_t maxStepCount);
void SetSolverModel(unsigned int model);
void SetStepSize(float stepSize);
@@ -37,6 +39,7 @@ namespace Nz
PhysWorld3D& operator=(PhysWorld3D&&) = delete; ///TODO
private:
std::size_t m_maxStepCount;
Vector3f m_gravity;
NewtonWorld* m_world;
float m_stepSize;