X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=src%2FentityManager.cpp;h=0707dfe03eb8e1015882a5502ad03855c69c39c9;hb=9ae1c0798cff2d1ed816bccb0723bd5a4ca97194;hp=c7fc78b91abbca14de1ba322edcccb98c31427db;hpb=54fe85c5d10e60da6a9c9bbde11f7215723da572;p=physics.git

diff --git a/src/entityManager.cpp b/src/entityManager.cpp
index c7fc78b..0707dfe 100644
--- 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 *****
 
@@ -107,10 +108,12 @@ void manager::remove(Entity* e)
 
 void manager::handleInput()
 {
-    // TODO
+    effect::handleInput();
 }
 void manager::update(float time_step)
 {
+    effect::update(time_step);
+
     updateParticles(time_step);
     updatePhysics(time_step);
 }
@@ -184,7 +187,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();