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

Ndk/Physics: Merged StaticCollisionSystem with PhysicsSystem

Browse Source 
Former-commit-id: de2127eb967fb29f285e9ebae7c743c07ea39f8a
This commit is contained in:
Lynix
2015-05-03 19:55:16 +02:00
parent 8b5deffe35
commit da36f95b7c
7 changed files with 71 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,10 @@ namespace Ndk
static SystemIndex systemIndex;
private:
void OnEntityValidation(Entity* entity, bool justAdded) override;
std::vector<EntityHandle> m_dynamicObjects;
std::vector<EntityHandle> m_staticObjects;
NzPhysWorld m_world;
};
}

29
SDK/include/NDK/Systems/StaticCollisionSystem.hpp
View File

@@ -1,29 +0,0 @@
// Copyright (C) 2015 Jérôme Leclercq
// This file is part of the "Nazara Development Kit"
// For conditions of distribution and use, see copyright notice in Prerequesites.hpp
#pragma once
#ifndef NDK_SYSTEMS_STATICCOLLISIONSYSTEM_HPP
#define NDK_SYSTEMS_STATICCOLLISIONSYSTEM_HPP
#include <NDK/System.hpp>
namespace Ndk
{
class NDK_API StaticCollisionSystem : public System<StaticCollisionSystem>
{
public:
StaticCollisionSystem();
StaticCollisionSystem(const StaticCollisionSystem& system) = default;
~StaticCollisionSystem() = default;
void Update(float elapsedTime);
static SystemIndex systemIndex;
};
}
#include <NDK/Systems/StaticCollisionSystem.inl>
#endif // NDK_SYSTEMS_STATICCOLLISIONSYSTEM_HPP

7
SDK/include/NDK/Systems/StaticCollisionSystem.inl
View File

@@ -1,7 +0,0 @@
// Copyright (C) 2015 Jérôme Leclercq
// This file is part of the "Nazara Development Kit"
// For conditions of distribution and use, see copyright notice in Prerequesites.hpp
namespace Ndk
{
}