From 179f30861dc62700f7d1abf8ee4a1018c1862386 Mon Sep 17 00:00:00 2001 From: Lynix Date: Mon, 22 Jun 2015 14:27:42 +0200 Subject: [PATCH 1/3] Core/Bitset: Fix Bitset::FindNext Former-commit-id: 20d18be6e8039fc386ef7c402878b3d29577b46d --- include/Nazara/Core/Bitset.inl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/Nazara/Core/Bitset.inl b/include/Nazara/Core/Bitset.inl index c8467c27e..e439dfc80 100644 --- a/include/Nazara/Core/Bitset.inl +++ b/include/Nazara/Core/Bitset.inl @@ -104,7 +104,8 @@ unsigned int NzBitset::FindNext(unsigned int bit) const { NazaraAssert(bit < m_bitCount, "Bit index out of range"); - bit++; + if (++bit >= m_bitCount) + return npos; // Le bloc du bit, l'indice du bit unsigned int blockIndex = GetBlockIndex(bit); From d225f50759d81164671bc9cdafbafa1dd0b6c326 Mon Sep 17 00:00:00 2001 From: Lynix Date: Tue, 23 Jun 2015 00:07:33 +0200 Subject: [PATCH 2/3] Sdk/BaseSystem: Fix update rate of 0 Former-commit-id: d589ff48e8e300bc1214ed3865101c812dd5aaf6 --- SDK/include/NDK/BaseSystem.inl | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/SDK/include/NDK/BaseSystem.inl b/SDK/include/NDK/BaseSystem.inl index ceacd1e78..da1f04d15 100644 --- a/SDK/include/NDK/BaseSystem.inl +++ b/SDK/include/NDK/BaseSystem.inl @@ -34,7 +34,7 @@ namespace Ndk inline float BaseSystem::GetUpdateRate() const { - return 1.f / m_updateRate; + return (m_updateRate > 0.f) ? 1.f / m_updateRate : 0.f; } inline World& BaseSystem::GetWorld() const @@ -58,12 +58,16 @@ namespace Ndk inline void BaseSystem::Update(float elapsedTime) { - m_updateCounter -= elapsedTime; - if (m_updateCounter < 0.f) + if (m_updateRate > 0.f) { + m_updateCounter -= elapsedTime; + if (m_updateCounter >= 0.f) + return; + m_updateCounter += m_updateRate; - OnUpdate(elapsedTime); } + + OnUpdate(elapsedTime); } template From 53c671bc6ada1b83f99e399d6ccb2ac54ac0e780 Mon Sep 17 00:00:00 2001 From: Lynix Date: Tue, 23 Jun 2015 00:08:01 +0200 Subject: [PATCH 3/3] Sdk/RenderSystem: Disable update limit Former-commit-id: 5ccc441fc7c4e0e6050c1df75d4a51a8720b11a6 --- SDK/src/NDK/Systems/RenderSystem.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/SDK/src/NDK/Systems/RenderSystem.cpp b/SDK/src/NDK/Systems/RenderSystem.cpp index 41efa7462..ad39f29d8 100644 --- a/SDK/src/NDK/Systems/RenderSystem.cpp +++ b/SDK/src/NDK/Systems/RenderSystem.cpp @@ -13,6 +13,7 @@ namespace Ndk { RenderSystem::RenderSystem() { + SetUpdateRate(0.f); } void RenderSystem::OnEntityRemoved(Entity* entity)