projects
/
physics.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added more colors and balls
[physics.git]
/
src
/
entityManager.cpp
diff --git
a/src/entityManager.cpp
b/src/entityManager.cpp
index
000fd4b
..
f707061
100644
(file)
--- a/
src/entityManager.cpp
+++ b/
src/entityManager.cpp
@@
-1,5
+1,4
@@
#include <set>
#include <set>
-using std::set;
#include <iostream>
#include <iostream>
@@
-15,13
+14,13
@@
void updateParticles(float);
void updatePhysics(float);
/// ***** Private Variables *****
void updatePhysics(float);
/// ***** Private Variables *****
-typedef set<Particle*> setPart;
+typedef s
td::s
et<Particle*> setPart;
setPart particles_To_Add;
setPart active_Particles;
setPart particles_To_Remove;
bool clearParticles;
setPart particles_To_Add;
setPart active_Particles;
setPart particles_To_Remove;
bool clearParticles;
-typedef set<PhysicsEntity*> setPhys;
+typedef s
td::s
et<PhysicsEntity*> setPhys;
setPhys physics_To_Add;
setPhys active_Physics;
setPhys physics_To_Remove;
setPhys physics_To_Add;
setPhys active_Physics;
setPhys physics_To_Remove;