X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=src%2FentityManager.cpp;h=7290373d101dd48ee12105c013c833f67139ef7f;hb=b85b89ba9a2cb0373209e8117046fd308faf0202;hp=cbe9e030db63f0cd5f02ee728e497c41e730c221;hpb=2869e2e8412cd7fd600ad1566f18ffb39aa38ab0;p=physics.git

diff --git a/src/entityManager.cpp b/src/entityManager.cpp
index cbe9e03..7290373 100644
--- a/src/entityManager.cpp
+++ b/src/entityManager.cpp
@@ -16,76 +16,95 @@
  */
 
 #include "entityManager.h"
-#include "debug.h"
+
+#include <pg/debug.h>
+#include <pg/Mutex.h>
+#include <pg/Autolock.h>
+using namespace pg;
 
 #include <set>
+#include <SDL/SDL.h>
 
 #include "Entities/Entity.h"
 #include "Entities/Particle.h"
 #include "Entities/PhysicsEntity.h"
 
-#include "collisionHandler.h"
+#include "collisionManager.h"
 #include "effectManager.h"
 
 /// ***** Private Method Headers *****
 
-void updateParticles(float);
-void updatePhysics(float);
+static void updateParticles(float);
+static void updatePhysics(float);
+static void addOrRemoveParticles();
+static void addOrRemovePhysics();
 
 /// ***** Private Variables *****
 
 typedef std::set<Particle*> setPart;
-setPart particles_To_Add;
-setPart active_Particles;
-setPart particles_To_Remove;
+static setPart particles_To_Add;
+static setPart active_Particles;
+static setPart particles_To_Remove;
 
 typedef std::set<PhysicsEntity*> setPhys;
-setPhys physics_To_Add;
-setPhys active_Physics;
-setPhys physics_To_Remove;
+static setPhys physics_To_Add;
+static setPhys active_Physics;
+static setPhys physics_To_Remove;
+
+static Mutex muSetPart;
+static Mutex muSetPhys;
 
 /// ***** Initializers/Cleaners *****
 
 void manager::init()
 {
+    muSetPart.init();
+    muSetPhys.init();
+
     collision::init();
 }
 void manager::clean()
 {
     collision::clean();
+
+    muSetPhys.clean();
+    muSetPart.clean();
 }
 
 /// ***** Public Methods *****
 
-void manager::add(Entity* e)
+void manager::add(Entity* pe)
 {
+    DASSERT(pe != NULL);
+
     {
-        Particle* p = dynamic_cast<Particle*>(e);
-        if( p != 0 )
+        Particle* pp = dynamic_cast<Particle*>(pe);
+        if( pp != NULL )
         {
-            particles_To_Add.insert(p);
+            particles_To_Add.insert(pp);
             return;
         }
     }
 
     {
-        PhysicsEntity* p = dynamic_cast<PhysicsEntity*>(e);
-        if( p != 0 )
+        PhysicsEntity* ppe = dynamic_cast<PhysicsEntity*>(pe);
+        if( ppe != NULL )
         {
-            physics_To_Add.insert(p);
+            physics_To_Add.insert(ppe);
             return;
         }
     }
 
-#ifdef WARNINGS
-    cerr << "ENTITY TYPE NOT SUPPORTED BY addEntity()!!" << endl;
-#endif
+    DPF(0, "ENTITY TYPE NOT SUPPORTED BY addEntity()!!");
 }
-void manager::remove(Entity* e)
+void manager::remove(Entity* pe)
 {
+    DASSERT(pe != NULL);
+
     {
-        Particle* p = dynamic_cast<Particle*>(e);
-        if( p != 0 )
+        Autolock lock( muSetPart );
+        Particle* p = dynamic_cast<Particle*>(pe);
+        if( p != NULL )
         {
             particles_To_Remove.insert(p);
             return;
@@ -93,17 +112,16 @@ void manager::remove(Entity* e)
     }
 
     {
-        PhysicsEntity* p = dynamic_cast<PhysicsEntity*>(e);
-        if( p != 0 )
+        Autolock lock( muSetPhys );
+        PhysicsEntity* ppe = dynamic_cast<PhysicsEntity*>(pe);
+        if( ppe != NULL )
         {
-            physics_To_Remove.insert(p);
+            physics_To_Remove.insert(ppe);
             return;
         }
     }
 
-#ifdef WARNINGS
-    cerr << "ENTITY TYPE NOT SUPPORTED BY deleteEntity()!!" << endl;
-#endif
+    DPF(0, "ENTITY TYPE NOT SUPPORTED BY deleteEntity()!!");
 }
 
 void manager::handleInput()
@@ -119,27 +137,68 @@ void manager::update(float time_step)
 }
 void manager::draw()
 {
+    {
+        Autolock lock( muSetPart );
+
+        addOrRemoveParticles();
+
+        // draw active Particle*s
+        for( setPart::iterator it = active_Particles.begin();
+             it != active_Particles.end();
+             it++ )
+        {
+            (*it)->draw();
+        }
+    }
+
+    {
+        Autolock lock( muSetPhys );
+
+        addOrRemovePhysics();
+
+        // draw active PhysicsEntity*s
+        for( setPhys::iterator it = active_Physics.begin();
+             it != active_Physics.end();
+             it++ )
+        {
+            (*it)->draw();
+        }
+    }
+}
+
+/// ***** Private Methods *****
+
+void updateParticles(float time_step)
+{
+    addOrRemoveParticles();
+
     // update active Particle*s
     for( setPart::iterator it = active_Particles.begin();
          it != active_Particles.end();
          it++ )
     {
-        (*it)->draw();
+        (*it)->update(time_step);
     }
+}
+void updatePhysics(float time_step)
+{
+    addOrRemovePhysics();
+
+    // apply collision math
+    collision::update(active_Physics);
 
     // update active PhysicsEntity*s
     for( setPhys::iterator it = active_Physics.begin();
          it != active_Physics.end();
          it++ )
     {
-        (*it)->draw();
+        (*it)->update(time_step);
     }
 }
-
-/// ***** Private Methods *****
-
-void updateParticles(float time_step)
+void addOrRemoveParticles()
 {
+    Autolock lock( muSetPart );
+
     // add new Particle*s to Active
     for( setPart::iterator it = particles_To_Add.begin();
          it != particles_To_Add.end();
@@ -157,17 +216,11 @@ void updateParticles(float time_step)
         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)->update(time_step);
-    }
 }
-void updatePhysics(float time_step)
+void addOrRemovePhysics()
 {
+    Autolock lock( muSetPhys );
+
     // add new PhysicsEntity*s to Active
     for( setPhys::iterator it = physics_To_Add.begin();
          it != physics_To_Add.end();
@@ -185,15 +238,4 @@ void updatePhysics(float time_step)
         active_Physics.erase(*it);
     }
     physics_To_Remove.clear();
-
-    // apply collision math
-    collision::update(active_Physics);
-
-    // update active PhysicsEntity*s
-    for( setPhys::iterator it = active_Physics.begin();
-         it != active_Physics.end();
-         it++ )
-    {
-        (*it)->update(time_step);
-    }
 }