added better thread safty ... still broke

[physics.git] / src / entityManager.cpp

diff --git a/src/entityManager.cpp b/src/entityManager.cpp
index 0707dfe..1664210 100644 (file)
--- a/src/entityManager.cpp
+++ b/src/entityManager.cpp
@@ -19,6 +19,10 @@
 #include "debug.h"
 
 #include <set>
+#include <SDL/SDL.h>
+
+#include "locks/Mutex.h"
+#include "locks/Autolock.h"
 
 #include "Entities/Entity.h"
 #include "Entities/Particle.h"
@@ -44,15 +48,24 @@ setPhys physics_To_Add;
 setPhys active_Physics;
 setPhys physics_To_Remove;
 
+Mutex particleSetLock;
+Mutex physicsEntitySetLock;
+
 /// ***** Initializers/Cleaners *****
 
 void manager::init()
 {
+    particleSetLock.init();
+    physicsEntitySetLock.init();
+
     collision::init();
 }
 void manager::clean()
 {
     collision::clean();
+
+    physicsEntitySetLock.clean();
+    particleSetLock.clean();
 }
 
 /// ***** Public Methods *****
@@ -77,9 +90,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)
 {
@@ -101,9 +112,7 @@ 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()
@@ -119,20 +128,54 @@ void manager::update(float time_step)
 }
 void manager::draw()
 {
-    // update active Particle*s
-    for( setPart::iterator it = active_Particles.begin();
-         it != active_Particles.end();
-         it++ )
     {
-        (*it)->draw();
+        Autolock lock( particleSetLock );
+        DPF(0, "Particle Draw Start");
+
+        // remove dead Particle*s from Active
+        for( setPart::iterator it = particles_To_Remove.begin();
+             it != particles_To_Remove.end();
+             it++ )
+        {
+            DPF(0, "Particle Delete");
+            active_Particles.erase(*it);
+        }
+        particles_To_Remove.clear();
+
+        // update active Particle*s
+        for( setPart::iterator it = active_Particles.begin();
+             it != active_Particles.end();
+             it++ )
+        {
+            (*it)->draw();
+        }
+
+        DPF(0, "Particle Draw End");
     }
 
-    // update active PhysicsEntity*s
-    for( setPhys::iterator it = active_Physics.begin();
-         it != active_Physics.end();
-         it++ )
     {
-        (*it)->draw();
+        Autolock lock( physicsEntitySetLock );
+        DPF(0, "Physics Draw Start");
+
+        // remove dead PhysicsEntity*s from Active
+        for( setPhys::iterator it = physics_To_Remove.begin();
+             it != physics_To_Remove.end();
+             it++ )
+        {
+            DPF(0, "Physics Delete");
+            active_Physics.erase(*it);
+        }
+        physics_To_Remove.clear();
+
+        // update active PhysicsEntity*s
+        for( setPhys::iterator it = active_Physics.begin();
+             it != active_Physics.end();
+             it++ )
+        {
+            (*it)->draw();
+        }
+
+        DPF(0, "Physics Draw End");
     }
 }
 
@@ -140,23 +183,30 @@ void manager::draw()
 
 void updateParticles(float time_step)
 {
-    // add new Particle*s to Active
-    for( setPart::iterator it = particles_To_Add.begin();
-         it != particles_To_Add.end();
-         it++ )
     {
-        active_Particles.insert(*it);
-    }
-    particles_To_Add.clear();
+        Autolock lock( particleSetLock );
 
-    // remove dead Particle*s from Active
-    for( setPart::iterator it = particles_To_Remove.begin();
-         it != particles_To_Remove.end();
-         it++ )
-    {
-        active_Particles.erase(*it);
+        // add new Particle*s to Active
+        for( setPart::iterator it = particles_To_Add.begin();
+             it != particles_To_Add.end();
+             it++ )
+        {
+            DPF(0, "Particle Insert");
+            active_Particles.insert(*it);
+        }
+
+        // remove dead Particle*s from Active
+        for( setPart::iterator it = particles_To_Remove.begin();
+             it != particles_To_Remove.end();
+             it++ )
+        {
+            DPF(0, "Particle Delete");
+            active_Particles.erase(*it);
+        }
+        particles_To_Remove.clear();
     }
-    particles_To_Remove.clear();
+
+    particles_To_Add.clear();
 
     // update active Particle*s
     for( setPart::iterator it = active_Particles.begin();
@@ -168,23 +218,30 @@ void updateParticles(float time_step)
 }
 void updatePhysics(float time_step)
 {
-    // add new PhysicsEntity*s to Active
-    for( setPhys::iterator it = physics_To_Add.begin();
-         it != physics_To_Add.end();
-         it++ )
     {
-        active_Physics.insert(*it);
-    }
-    physics_To_Add.clear();
+        Autolock lock( physicsEntitySetLock );
 
-    // remove dead PhysicsEntity*s from Active
-    for( setPhys::iterator it = physics_To_Remove.begin();
-         it != physics_To_Remove.end();
-         it++ )
-    {
-        active_Physics.erase(*it);
+        // add new PhysicsEntity*s to Active
+        for( setPhys::iterator it = physics_To_Add.begin();
+             it != physics_To_Add.end();
+             it++ )
+        {
+            DPF(0, "Physics Insert");
+            active_Physics.insert(*it);
+        }
+
+        // remove dead PhysicsEntity*s from Active
+        for( setPhys::iterator it = physics_To_Remove.begin();
+             it != physics_To_Remove.end();
+             it++ )
+        {
+            DPF(0, "Physics Delete");
+            active_Physics.erase(*it);
+        }
+        physics_To_Remove.clear();
     }
-    physics_To_Remove.clear();
+
+    physics_To_Add.clear();
 
     // apply collision math
     collision::update(active_Physics);