From c431193764c04834ee12586c9b22fde0ab61207e Mon Sep 17 00:00:00 2001
From: tleety <dahltobbe@hotmail.com>
Date: Tue, 13 Oct 2015 15:09:00 +0200
Subject: [PATCH] Some debug code

---
 include/GUI/Button.h               |  4 +-
 include/Physics/PhysicsSystem.h    |  4 +-
 src/game/Physics/PhysicsSystem.cpp | 68 ++++++++++++++++++++++++++++--
 3 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/include/GUI/Button.h b/include/GUI/Button.h
index d46d929..dcfdae6 100644
--- a/include/GUI/Button.h
+++ b/include/GUI/Button.h
@@ -93,7 +93,7 @@ protected:
 	virtual bool OnMousePress(const Events::MousePress& event)
 	{
 		if (Hidden()) {
-			LOG_DEBUG("Pressed hidden button");
+			//LOG_DEBUG("Pressed hidden button");
 			return false;
 		}
 
@@ -117,7 +117,7 @@ protected:
 	virtual bool OnMouseRelease(const Events::MouseRelease& event)
 	{
 		if (Hidden()) {
-			LOG_DEBUG("Released hidden button");
+			//LOG_DEBUG("Released hidden button");
 			return false;
 		}
 
diff --git a/include/Physics/PhysicsSystem.h b/include/Physics/PhysicsSystem.h
index 510fb42..664853c 100755
--- a/include/Physics/PhysicsSystem.h
+++ b/include/Physics/PhysicsSystem.h
@@ -99,6 +99,8 @@ namespace dd
             std::unordered_map<b2Body*, EntityID> m_BodiesToEntities;
 
 
+			int t_counter = 0;
+
 
             void CreateBody(EntityID entity);
             void SyncEntitiesWithBodies();
@@ -128,7 +130,7 @@ namespace dd
             std::vector<EntityID> ParticleEmitter;
             std::vector<EntityID> ParticleTemplate;
         };
-            EmitterHandler m_ParticleEmitters;
+        EmitterHandler m_ParticleEmitters;
 
             std::list<Impulse> m_Impulses;
             
diff --git a/src/game/Physics/PhysicsSystem.cpp b/src/game/Physics/PhysicsSystem.cpp
index 44923da..7d2c0a0 100755
--- a/src/game/Physics/PhysicsSystem.cpp
+++ b/src/game/Physics/PhysicsSystem.cpp
@@ -246,7 +246,7 @@ void dd::Systems::PhysicsSystem::Update(double dt)
             }
         }
 
-        m_Accumulator -= dt;
+        m_Accumulator -= m_TimeStep;
     }
 }
 
@@ -558,9 +558,8 @@ void dd::Systems::PhysicsSystem::UpdateParticleEmitters(double dt)
 // 	for (int i = 0; i < m_EntitiesToParticleHandle.size(); i++)
 // 		entHandles += m_EntitiesToParticleHandle[i].size();
 // 	LOG_INFO("Entities and handles: %i", entHandles);
-
-
-    for (int i = 0; i < emittersToDelete.size(); i++)
+	
+	for (int i = 0; i < emittersToDelete.size(); i++)
     {
         EntityID ent = emittersToDelete[i];
         int key;
@@ -571,6 +570,36 @@ void dd::Systems::PhysicsSystem::UpdateParticleEmitters(double dt)
         }
 
         if (m_ParticleEmitters.ParticleSystem[key]->GetParticleCount() == 0 && key <= m_ParticleEmitters.ParticleSystem.size()) {
+			// DEBUG vvvvvv
+// 			int t_Entities = m_World->GetEntities()->size();
+// 			int t_Systems = m_ParticleEmitters.ParticleSystem.size();
+// 			int t_Emitters = m_ParticleEmitters.ParticleEmitter.size();
+// 			int t_Templates = m_ParticleEmitters.ParticleTemplate.size();
+// 			int t_LFunParticles = 0;
+// 			int t_EntParticles = 0;
+// 			auto t_WorldEntities = m_World->GetEntities();
+// 
+// 			for (auto &te : *t_WorldEntities)
+// 			{
+// 				if (m_World->GetComponent<Components::Particle>(te.first))
+// 				{
+// 					t_EntParticles++;
+// 				}
+// 			}
+// 
+// 			for (int i = 0; i < t_Systems; i++)
+// 			{
+// 				t_LFunParticles = m_ParticleEmitters.ParticleSystem[i]->GetParticleCount();
+// 			}
+// 
+// 			LOG_INFO("----------------------------");
+// 			LOG_INFO("Deleting emitter and other");
+// 			LOG_INFO("Total before:");
+// 			LOG_INFO("Entities: %i, Systems: %i, Emitters: %i, Templates: %i, LfunParticles: %i, EntParticles: %i, EtH: %i, HtE: %i",
+// 				t_Entities, t_Systems, t_Emitters, t_Templates, t_LFunParticles, t_EntParticles, m_EntitiesToParticleHandle.size(), m_ParticleHandleToEntities.size());
+// 			
+			// DEBUG ^^^^^
+
             m_World->RemoveEntity(ent);
             m_PhysicsWorld->DestroyParticleSystem(m_ParticleEmitters.ParticleSystem[key]);
             m_ParticleEmitters.ParticleSystem.erase(m_ParticleEmitters.ParticleSystem.begin() + key);
@@ -578,7 +607,38 @@ void dd::Systems::PhysicsSystem::UpdateParticleEmitters(double dt)
             m_ParticleEmitters.ParticleTemplate.erase(m_ParticleEmitters.ParticleTemplate.begin() + key);
             m_EntitiesToParticleHandle.erase(m_EntitiesToParticleHandle.begin() + key);
             m_ParticleHandleToEntities.erase(m_ParticleHandleToEntities.begin() + key);
+
+			// DEBUG vvvvv
+// 			t_Entities = m_World->GetEntities()->size();
+// 			t_Systems = m_ParticleEmitters.ParticleSystem.size();
+// 			t_Emitters = m_ParticleEmitters.ParticleEmitter.size();
+// 			t_Templates = m_ParticleEmitters.ParticleTemplate.size();
+// 			t_LFunParticles = 0;
+// 			t_EntParticles = 0;
+// 			t_WorldEntities = m_World->GetEntities();
+// 
+// 			for (auto &te : *t_WorldEntities)
+// 			{
+// 				if (m_World->GetComponent<Components::Particle>(te.first))
+// 				{
+// 					t_EntParticles++;
+// 				}
+// 			}
+// 
+// 			for (int i = 0; i < t_Systems; i++)
+// 			{
+// 				t_LFunParticles = m_ParticleEmitters.ParticleSystem[i]->GetParticleCount();
+// 			}
+// 
+// 			LOG_INFO("Total after:");
+// 			LOG_INFO("Entities: %i, Systems: %i, Emitters: %i, Templates: %i, LfunParticles: %i, EntParticles: %i, EtH: %i, HtE: %i",
+// 				t_Entities, t_Systems, t_Emitters, t_Templates, t_LFunParticles, t_EntParticles, m_EntitiesToParticleHandle.size(), m_ParticleHandleToEntities.size());
+// 			LOG_INFO("-----------------------------");
+// 			t_counter = 0;
+			
+			// DEBUG ^^^^^
         }
+		
     }