Merge branch 'master' into physics3d-material

SDK/src/NDK/Application.cpp

@@ -107,8 +107,7 @@ namespace Ndk
 		if (m_shouldQuit)
 			return false;
 
-		m_updateTime = m_updateClock.GetSeconds();
-		m_updateClock.Restart();
+		m_updateTime = m_updateClock.Restart() / 1'000'000.f;
 
 		for (World& world : m_worlds)
 			world.Update(m_updateTime);

SDK/src/NDK/Lua/LuaBinding_SDK.cpp

@@ -179,6 +179,12 @@ namespace Ndk
 			world.BindMethod("CreateEntity", &World::CreateEntity);
 			world.BindMethod("CreateEntities", &World::CreateEntities);
 			world.BindMethod("Clear", &World::Clear);
+			world.BindMethod("DisableProfiler", &World::DisableProfiler);
+			world.BindMethod("EnableProfiler", &World::EnableProfiler);
+			world.BindMethod("IsProfilerEnabled", &World::IsProfilerEnabled);
+			world.BindMethod("Refresh", &World::Refresh);
+			world.BindMethod("ResetProfiler", &World::ResetProfiler);
+			world.BindMethod("Update", &World::Update);
 
 			world.BindMethod("IsValidHandle", &WorldHandle::IsValid);
 		}

SDK/src/NDK/World.cpp

@@ -3,6 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Prerequisites.hpp
 
 #include <NDK/World.hpp>
+#include <Nazara/Core/Clock.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <NDK/BaseComponent.hpp>
 #include <NDK/Systems/PhysicsSystem2D.hpp>
@@ -61,11 +62,14 @@ namespace Ndk
 	{
 		EntityId id;
 		EntityBlock* entBlock;
-		if (!m_freeIdList.empty())
+
+		std::size_t freeEntityId = m_freeEntityIds.FindFirst();
+		if (freeEntityId != m_freeEntityIds.npos)
 		{
 			// We get an identifier
-			id = m_freeIdList.back();
-			m_freeIdList.pop_back();
+			m_freeEntityIds.Reset(freeEntityId); //< Remove id from free entity id
+
+			id = static_cast<EntityId>(freeEntityId);
 
 			entBlock = &m_entities[id];
 			entBlock->handle.Reset(&entBlock->entity); //< Reset handle (as it was reset when entity got destroyed)
@@ -81,7 +85,7 @@ namespace Ndk
 			{
 				NazaraAssert(m_waitingEntities.empty(), "There should be no waiting entities if space is available in main container");
 
-				m_entities.push_back(Entity(this, id)); //< We can't use emplace_back due to the scope
+				m_entities.emplace_back(Entity(this, id)); //< We can't make our vector create the entity due to the scope
 				entBlock = &m_entities.back();
 			}
 			else
@@ -124,11 +128,11 @@ namespace Ndk
 		m_entityBlocks.clear();
 
 		m_entities.clear();
-		m_freeIdList.clear();
 		m_waitingEntities.clear();
 
 		m_aliveEntities.Clear();
 		m_dirtyEntities.Clear();
+		m_freeEntityIds.Clear();
 		m_killedEntities.Clear();
 	}
 
@@ -166,12 +170,21 @@ namespace Ndk
 	}
 
 	/*!
-	* \brief Updates the world
+	* \brief Refreshes the world
 	*
-	* \remark Produces a NazaraAssert if an entity is invalid
+	* This function will perform all pending operations in the following order:
+	* - Reorder systems according to their update order if needed
+	* - Moving newly created entities (whose which allocate never-used id) data and handles to normal entity list, this will invalidate references to world EntityHandle
+	* - Destroying dead entities and allowing their ids to be used by newly created entities
+	* - Update dirty entities, destroying their removed components and filtering them along systems
+	*
+	* \remark This is called automatically by Update and you most likely won't need to call it yourself
+	* \remark Calling this outside of Update will not increase the profiler values
+	*
+	* \see GetProfilerData
+	* \see Update
 	*/
-
-	void World::Update()
+	void World::Refresh()
 	{
 		if (!m_orderedSystemsUpdated)
 			ReorderSystems();
@@ -203,7 +216,7 @@ namespace Ndk
 			entity->Destroy();
 
 			// Send back the identifier of the entity to the free queue
-			m_freeIdList.push_back(entity->GetId());
+			m_freeEntityIds.UnboundedSet(entity->GetId());
 		}
 		m_killedEntities.Reset();
 
@@ -248,6 +261,43 @@ namespace Ndk
 		m_dirtyEntities.Reset();
 	}
 
+	/*!
+	* \brief Updates the world
+	* \param elapsedTime Delta time used for the update
+	*
+	* This function Refreshes the world and calls the Update function of every active system part of it with the elapsedTime value.
+	* It also increase the profiler data with the elapsed time passed in Refresh and every system update.
+	*/
+	void World::Update(float elapsedTime)
+	{
+		if (m_isProfilerEnabled)
+		{
+			Nz::UInt64 t1 = Nz::GetElapsedMicroseconds();
+			Refresh();
+			Nz::UInt64 t2 = Nz::GetElapsedMicroseconds();
+
+			m_profilerData.refreshTime += t2 - t1;
+
+			for (auto& systemPtr : m_orderedSystems)
+			{
+				systemPtr->Update(elapsedTime);
+
+				Nz::UInt64 t3 = Nz::GetElapsedMicroseconds();
+				m_profilerData.updateTime[systemPtr->GetIndex()] += t3 - t2;
+				t2 = t3;
+			}
+
+			m_profilerData.updateCount++;
+		}
+		else
+		{
+			Refresh();
+
+			for (auto& systemPtr : m_orderedSystems)
+				systemPtr->Update(elapsedTime);
+		}
+	}
+
 	void World::ReorderSystems()
 	{
 		m_orderedSystems.clear();