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

Merge remote-tracking branch 'origin/NDK' into NDK-ShadowMapping

Browse Source 
Conflicts:
	SDK/include/NDK/Systems/RenderSystem.hpp
	SDK/src/NDK/Systems/RenderSystem.cpp

Former-commit-id: 0a72e838de272bff91f0b8c8a3637db94fdd7820
This commit is contained in:
Lynix
2015-06-22 13:31:23 +02:00
parent eef7395623 109af2a581
commit ea3fdaba26
18 changed files with 341 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SDK/include/NDK/Systems/ListenerSystem.hpp
View File

@@ -17,9 +17,10 @@ namespace Ndk
ListenerSystem();
~ListenerSystem() = default;
void Update(float elapsedTime);
static SystemIndex systemIndex;
private:
void OnUpdate(float elapsedTime) override;
};
}

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

@@ -23,12 +23,11 @@ namespace Ndk
NzPhysWorld& GetWorld();
const NzPhysWorld& GetWorld() const;
void Update(float elapsedTime);
static SystemIndex systemIndex;
private:
void OnEntityValidation(Entity* entity, bool justAdded) override;
void OnUpdate(float elapsedTime) override;
EntityList m_dynamicObjects;
EntityList m_staticObjects;

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

@@ -26,13 +26,12 @@ namespace Ndk
inline RenderSystem(const RenderSystem& renderSystem);
~RenderSystem() = default;
void Update(float elapsedTime);
static SystemIndex systemIndex;
private:
void OnEntityRemoved(Entity* entity) override;
void OnEntityValidation(Entity* entity, bool justAdded) override;
void OnUpdate(float elapsedTime) override;
void UpdateShadowMaps();
EntityList m_cameras;

5
SDK/include/NDK/Systems/VelocitySystem.hpp
View File

@@ -17,9 +17,10 @@ namespace Ndk
VelocitySystem();
~VelocitySystem() = default;
void Update(float elapsedTime);
static SystemIndex systemIndex;
private:
void OnUpdate(float elapsedTime) override;
};
}