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

Fix merge fail

This commit is contained in:
Lynix 2016-10-13 08:33:15 +02:00
parent 1fdda6b07c
commit 634b67be56
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SDK/include/NDK/Systems/PhysicsSystem3D.hpp
View File

@ -33,7 +33,7 @@ namespace Ndk
EntityList m_dynamicObjects;
EntityList m_staticObjects;
std::unique_ptr<Nz::PhysWorld3D> m_world; ///TODO: std::optional (Should I make a Nz::Optional class?)
mutable std::unique_ptr<Nz::PhysWorld3D> m_world; ///TODO: std::optional (Should I make a Nz::Optional class?)
};
}

4
SDK/src/NDK/Systems/PhysicsSystem3D.cpp
View File

@ -41,11 +41,11 @@ namespace Ndk
{
}
void PhysicsSystem::CreatePhysWorld() const
void PhysicsSystem3D::CreatePhysWorld() const
{
NazaraAssert(!m_world, "Physics world should not be created twice");
m_world = std::make_unique<Nz::PhysWorld>();
m_world = std::make_unique<Nz::PhysWorld3D>();
}
/*!