projects
/
physics.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update ignore
[physics.git]
/
src
/
entityManager.cpp
diff --git
a/src/entityManager.cpp
b/src/entityManager.cpp
index
c78a7ce
..
0707dfe
100644
(file)
--- a/
src/entityManager.cpp
+++ b/
src/entityManager.cpp
@@
-24,7
+24,7
@@
#include "Entities/Particle.h"
#include "Entities/PhysicsEntity.h"
#include "Entities/Particle.h"
#include "Entities/PhysicsEntity.h"
-#include "collision
Handl
er.h"
+#include "collision
Manag
er.h"
#include "effectManager.h"
/// ***** Private Method Headers *****
#include "effectManager.h"
/// ***** Private Method Headers *****
@@
-187,7
+187,7
@@
void updatePhysics(float time_step)
physics_To_Remove.clear();
// apply collision math
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();
// update active PhysicsEntity*s
for( setPhys::iterator it = active_Physics.begin();