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

Sdk/PhysicsSystem: Fix GetWorld() not initializing the internal world

This commit is contained in:
Lynix 2016-10-13 08:30:33 +02:00
parent debf87e739
commit 01cd9b220f
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SDK/include/NDK/Systems/PhysicsSystem.hpp
View File

@ -27,12 +27,13 @@ namespace Ndk
static SystemIndex systemIndex;
private:
void CreatePhysWorld() const;
void OnEntityValidation(Entity* entity, bool justAdded) override;
void OnUpdate(float elapsedTime) override;
EntityList m_dynamicObjects;
EntityList m_staticObjects;
std::unique_ptr<Nz::PhysWorld> m_world; ///TODO: std::optional (Should I make a Nz::Optional class?)
mutable std::unique_ptr<Nz::PhysWorld> m_world; ///TODO: std::optional (Should I make a Nz::Optional class?)
};
}

6
SDK/include/NDK/Systems/PhysicsSystem.inl
View File

@ -11,6 +11,9 @@ namespace Ndk
inline Nz::PhysWorld& PhysicsSystem::GetWorld()
{
if (!m_world)
CreatePhysWorld();
return *m_world;
}
@ -21,6 +24,9 @@ namespace Ndk
inline const Nz::PhysWorld& PhysicsSystem::GetWorld() const
{
if (!m_world)
CreatePhysWorld();
return *m_world;
}
}

9
SDK/src/NDK/Systems/PhysicsSystem.cpp
View File

@ -41,6 +41,13 @@ namespace Ndk
{
}
void PhysicsSystem::CreatePhysWorld() const
{
NazaraAssert(!m_world, "Physics world should not be created twice");
m_world = std::make_unique<Nz::PhysWorld>();
}
/*!
* \brief Operation to perform when entity is validated for the system
*
@ -62,7 +69,7 @@ namespace Ndk
entities.Insert(entity);
if (!m_world)
m_world = std::make_unique<Nz::PhysWorld>();
CreatePhysWorld();
}
/*!