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

Physics3D: Rename PhysWorld to PhysWorld3D

Browse Source
This commit is contained in:
Lynix
2016-10-13 08:13:56 +02:00
parent 3765cba046
commit b52c7c57bf
12 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SDK/include/NDK/Components/PhysicsComponent.hpp
View File

@@ -7,7 +7,7 @@
#ifndef NDK_COMPONENTS_PHYSICSCOMPONENT_HPP
#define NDK_COMPONENTS_PHYSICSCOMPONENT_HPP
#include <Nazara/Physics3D/PhysObject.hpp>
#include <Nazara/Physics3D/RigidBody3D.hpp>
#include <NDK/Component.hpp>
#include <memory>

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

@@ -7,7 +7,7 @@
#ifndef NDK_SYSTEMS_PHYSICSSYSTEM_HPP
#define NDK_SYSTEMS_PHYSICSSYSTEM_HPP
#include <Nazara/Physics3D/PhysWorld.hpp>
#include <Nazara/Physics3D/PhysWorld3D.hpp>
#include <NDK/EntityList.hpp>
#include <NDK/System.hpp>
#include <memory>
@@ -21,8 +21,8 @@ namespace Ndk
PhysicsSystem(const PhysicsSystem& system);
~PhysicsSystem() = default;
Nz::PhysWorld& GetWorld();
const Nz::PhysWorld& GetWorld() const;
Nz::PhysWorld3D& GetWorld();
const Nz::PhysWorld3D& GetWorld() const;
static SystemIndex systemIndex;
@@ -32,7 +32,7 @@ namespace Ndk
EntityList m_dynamicObjects;
EntityList m_staticObjects;
std::unique_ptr<Nz::PhysWorld> m_world; ///TODO: std::optional (Should I make a Nz::Optional class?)
std::unique_ptr<Nz::PhysWorld3D> m_world; ///TODO: std::optional (Should I make a Nz::Optional class?)
};
}

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

@@ -9,7 +9,7 @@ namespace Ndk
* \return A reference to the physical world
*/
inline Nz::PhysWorld& PhysicsSystem::GetWorld()
inline Nz::PhysWorld3D& PhysicsSystem::GetWorld()
{
return *m_world;
}
@@ -19,7 +19,7 @@ namespace Ndk
* \return A constant reference to the physical world
*/
inline const Nz::PhysWorld& PhysicsSystem::GetWorld() const
inline const Nz::PhysWorld3D& PhysicsSystem::GetWorld() const
{
return *m_world;
}