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

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

Former-commit-id: 0a72e838de272bff91f0b8c8a3637db94fdd7820

SDK/include/NDK/BaseSystem.hpp

@@ -33,10 +33,15 @@ namespace Ndk
 
 			inline const std::vector<EntityHandle>& GetEntities() const;
 			inline SystemIndex GetIndex() const;
+			inline float GetUpdateRate() const;
 			inline World& GetWorld() const;
 
 			inline bool HasEntity(const Entity* entity) const;
 
+			inline void SetUpdateRate(float updatePerSecond);
+
+			inline void Update(float elapsedTime);
+
 			BaseSystem& operator=(const BaseSystem&) = delete;
 			BaseSystem& operator=(BaseSystem&&) noexcept = default;
 
@@ -55,6 +60,8 @@ namespace Ndk
 			template<typename ComponentType1, typename ComponentType2, typename... Rest> void RequiresAny();
 			inline void RequiresAnyComponent(ComponentIndex index);
 
+			virtual void OnUpdate(float elapsedTime) = 0;
+
 		private:
 			inline void AddEntity(Entity* entity);
 
@@ -79,6 +86,8 @@ namespace Ndk
 			NzBitset<> m_requiredComponents;
 			SystemIndex m_systemIndex;
 			World* m_world;
+			float m_updateCounter;
+			float m_updateRate;
 
 			static SystemIndex s_nextIndex;
 	};

SDK/include/NDK/BaseSystem.inl

@@ -10,12 +10,15 @@ namespace Ndk
 	inline BaseSystem::BaseSystem(SystemIndex systemId) :
 	m_systemIndex(systemId)
 	{
+		SetUpdateRate(30);
 	}
 
 	inline BaseSystem::BaseSystem(const BaseSystem& system) :
 	m_excludedComponents(system.m_excludedComponents),
 	m_requiredComponents(system.m_requiredComponents),
-	m_systemIndex(system.m_systemIndex)
+	m_systemIndex(system.m_systemIndex),
+	m_updateCounter(0.f),
+	m_updateRate(system.m_updateRate)
 	{
 	}
 
@@ -29,6 +32,11 @@ namespace Ndk
 		return m_systemIndex;
 	}
 
+	inline float BaseSystem::GetUpdateRate() const
+	{
+		return 1.f / m_updateRate;
+	}
+
 	inline World& BaseSystem::GetWorld() const
 	{
 		return *m_world;
@@ -42,6 +50,22 @@ namespace Ndk
 		return m_entityBits.UnboundedTest(entity->GetId());
 	}
 
+	inline void BaseSystem::SetUpdateRate(float updatePerSecond)
+	{
+		m_updateCounter = 0.f;
+		m_updateRate = (updatePerSecond > 0.f) ? 1.f / updatePerSecond : 0.f; // 0.f means no limit
+	}
+
+	inline void BaseSystem::Update(float elapsedTime)
+	{
+		m_updateCounter -= elapsedTime;
+		if (m_updateCounter < 0.f)
+		{
+			m_updateCounter += m_updateRate;
+			OnUpdate(elapsedTime);
+		}
+	}
+
 	template<typename ComponentType>
 	void BaseSystem::Excludes()
 	{

SDK/include/NDK/Systems/ListenerSystem.hpp

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

SDK/include/NDK/Systems/PhysicsSystem.hpp

@@ -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;

SDK/include/NDK/Systems/RenderSystem.hpp

@@ -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;

SDK/include/NDK/Systems/VelocitySystem.hpp

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

SDK/include/NDK/World.hpp

@@ -58,6 +58,7 @@ namespace Ndk
 			template<typename SystemType> void RemoveSystem();
 
 			void Update();
+			inline void Update(float elapsedTime);
 
 		private:
 			inline void Invalidate();

SDK/include/NDK/World.inl

@@ -130,6 +130,15 @@ namespace Ndk
 		RemoveSystem(index);
 	}
 
+	inline void World::Update(float elapsedTime)
+	{
+		Update(); //< Update entities
+
+		// And then update systems
+		for (auto& systemPtr : m_systems)
+			systemPtr->Update(elapsedTime);
+	}
+
 	inline void World::Invalidate()
 	{
 		m_dirtyEntities.Resize(m_entities.size(), false);