added more colors and balls

[physics.git] / src / entityManager.cpp

diff --git a/src/entityManager.cpp b/src/entityManager.cpp
index 351808a..f707061 100644 (file)
--- a/src/entityManager.cpp
+++ b/src/entityManager.cpp
@@ -1,25 +1,26 @@
+#include <set>
+
+#include <iostream>
+
 #include "entityManager.h"
+#include "debug.h"
+
 #include "Entities/Entity.h"
 #include "Entities/Particle.h"
 #include "Entities/PhysicsEntity.h"
 
-#include <set>
-using std::set;
-
-#include <iostream>
-
 /// ***** Private Method Headers *****
 void updateParticles(float);
 void updatePhysics(float);
 
 /// ***** Private Variables *****
-typedef set<Particle*> setPart;
+typedef std::set<Particle*> setPart;
 setPart particles_To_Add;
 setPart active_Particles;
 setPart particles_To_Remove;
 bool clearParticles;
 
-typedef set<PhysicsEntity*> setPhys;
+typedef std::set<PhysicsEntity*> setPhys;
 setPhys physics_To_Add;
 setPhys active_Physics;
 setPhys physics_To_Remove;
@@ -27,76 +28,76 @@ bool clearPhysics;
 
 /// ***** Public Methods *****
 
-void entityManager::init()
+void manager::init()
 {
 }
-void entityManager::clean()
+void manager::clean()
 {
 }
 
-void entityManager::add(Entity* e)
+void manager::add(Entity* e)
 {
     {
-    Particle* p = dynamic_cast<Particle*>(e);
-    if( p != 0 )
-    {
-        particles_To_Add.insert(p);
-        return;
-    }
+        Particle* p = dynamic_cast<Particle*>(e);
+        if( p != 0 )
+        {
+            particles_To_Add.insert(p);
+            return;
+        }
     }
 
     {
-    PhysicsEntity* p = dynamic_cast<PhysicsEntity*>(e);
-    if( p != 0 )
-    {
-        physics_To_Add.insert(p);
-        return;
-    }
+        PhysicsEntity* p = dynamic_cast<PhysicsEntity*>(e);
+        if( p != 0 )
+        {
+            physics_To_Add.insert(p);
+            return;
+        }
     }
 
     std::cerr << "ENTITY TYPE NOT SUPPORTED BY addEntity()!!";
     std::cerr << std::endl;
 }
-void entityManager::remove(Entity* e)
+void manager::remove(Entity* e)
 {
     {
-    Particle* p = dynamic_cast<Particle*>(e);
-    if( p != 0 )
-    {
-        particles_To_Remove.insert(p);
-        return;
-    }
+        Particle* p = dynamic_cast<Particle*>(e);
+        if( p != 0 )
+        {
+            particles_To_Remove.insert(p);
+            return;
+        }
     }
 
     {
-    PhysicsEntity* p = dynamic_cast<PhysicsEntity*>(e);
-    if( p != 0 )
-    {
-        physics_To_Remove.insert(p);
-        return;
-    }
+        PhysicsEntity* p = dynamic_cast<PhysicsEntity*>(e);
+        if( p != 0 )
+        {
+            physics_To_Remove.insert(p);
+            return;
+        }
     }
 
     std::cerr << "ENTITY TYPE NOT SUPPORTED BY deleteEntity()!!";
     std::cerr << std::endl;
 }
 
-void entityManager::clear()
+void manager::clear()
 {
     clearParticles = true;
     clearPhysics = true;
 }
 
-void entityManager::handleInput()
+void manager::handleInput()
 {
     // TODO
 }
-void entityManager::update(float time_step)
+void manager::update(float time_step)
 {
     updateParticles(time_step);
     updatePhysics(time_step);
 }
-void entityManager::draw()
+void manager::draw()
 {
     // update active Particle*s
     for( setPart::iterator it = active_Particles.begin();
@@ -113,6 +114,7 @@ void entityManager::draw()
     {
         (*it)->draw();
     }
+
 }
 
 /// ***** Private Methods *****