more debug changes

[physics.git] / src / entityManager.cpp

diff --git a/src/entityManager.cpp b/src/entityManager.cpp
index c7fc78b..bae30ae 100644 (file)
--- a/src/entityManager.cpp
+++ b/src/entityManager.cpp
@@ -24,7 +24,8 @@
 #include "Entities/Particle.h"
 #include "Entities/PhysicsEntity.h"
 
-#include "collisionHandler.h"
+#include "collisionManager.h"
+#include "effectManager.h"
 
 /// ***** Private Method Headers *****
 
@@ -76,9 +77,7 @@ void manager::add(Entity* e)
         }
     }
 
-#ifdef WARNINGS
-    cerr << "ENTITY TYPE NOT SUPPORTED BY addEntity()!!" << endl;
-#endif
+    DPF(0, "ENTITY TYPE NOT SUPPORTED BY addEntity()!!");
 }
 void manager::remove(Entity* e)
 {
@@ -100,17 +99,17 @@ void manager::remove(Entity* e)
         }
     }
 
-#ifdef WARNINGS
-    cerr << "ENTITY TYPE NOT SUPPORTED BY deleteEntity()!!" << endl;
-#endif
+    DPF(0, "ENTITY TYPE NOT SUPPORTED BY deleteEntity()!!");
 }
 
 void manager::handleInput()
 {
-    // TODO
+    effect::handleInput();
 }
 void manager::update(float time_step)
 {
+    effect::update(time_step);
+
     updateParticles(time_step);
     updatePhysics(time_step);
 }
@@ -184,7 +183,7 @@ void updatePhysics(float time_step)
     physics_To_Remove.clear();
 
     // apply collision math
-    collision::update(active_Physics, time_step);
+    collision::update(active_Physics);
 
     // update active PhysicsEntity*s
     for( setPhys::iterator it = active_Physics.begin();