X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=src%2FentityManager.cpp;h=62bcb2ef639a48483e62e2e46906fff12d865487;hb=f32a9b7c8eab3536ad354f85ee65c41d5b5da006;hp=65b82730954e99989a061174c6eafb11b0a53aa2;hpb=3bccd1d78b605dc5b2898877601ad1a6374e0e44;p=physics.git

diff --git a/src/entityManager.cpp b/src/entityManager.cpp
index 65b8273..62bcb2e 100644
--- a/src/entityManager.cpp
+++ b/src/entityManager.cpp
@@ -16,14 +16,14 @@
  */
 
 #include "entityManager.h"
-#include "debug.h"
+
+#include <pg/debug.h>
+#include <pg/Mutex.h>
+#include <pg/Autolock.h>
 
 #include <set>
 #include <SDL/SDL.h>
 
-#include "locks/Mutex.h"
-#include "locks/Autolock.h"
-
 #include "Entities/Entity.h"
 #include "Entities/Particle.h"
 #include "Entities/PhysicsEntity.h"
@@ -33,30 +33,32 @@
 
 /// ***** 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;
 
-Mutex particleSetLock;
-Mutex physicsEntitySetLock;
+static Mutex muSetPart;
+static Mutex muSetPhys;
 
 /// ***** Initializers/Cleaners *****
 
 void manager::init()
 {
-    particleSetLock.init();
-    physicsEntitySetLock.init();
+    muSetPart.init();
+    muSetPhys.init();
 
     collision::init();
 }
@@ -64,39 +66,44 @@ void manager::clean()
 {
     collision::clean();
 
-    physicsEntitySetLock.clean();
-    particleSetLock.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;
         }
     }
 
     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;
@@ -104,10 +111,11 @@ 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;
         }
     }
@@ -129,33 +137,31 @@ void manager::update(float time_step)
 void manager::draw()
 {
     {
-        Autolock lock( particleSetLock );
-        DPF(0, "Particle Draw Start");
+        Autolock lock( muSetPart );
 
-        // update active Particle*s
+        addOrRemoveParticles();
+
+        // draw active Particle*s
         for( setPart::iterator it = active_Particles.begin();
              it != active_Particles.end();
              it++ )
         {
             (*it)->draw();
         }
-
-        DPF(0, "Particle Draw End");
     }
 
     {
-        Autolock lock( physicsEntitySetLock );
-        DPF(0, "Physics Draw Start");
+        Autolock lock( muSetPhys );
 
-        // update active PhysicsEntity*s
+        addOrRemovePhysics();
+
+        // draw active PhysicsEntity*s
         for( setPhys::iterator it = active_Physics.begin();
              it != active_Physics.end();
              it++ )
         {
             (*it)->draw();
         }
-
-        DPF(0, "Physics Draw End");
     }
 }
 
@@ -163,30 +169,7 @@ void manager::draw()
 
 void updateParticles(float time_step)
 {
-    {
-        Autolock lock( particleSetLock );
-
-        // 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_Add.clear();
-    particles_To_Remove.clear();
+    addOrRemoveParticles();
 
     // update active Particle*s
     for( setPart::iterator it = active_Particles.begin();
@@ -198,30 +181,7 @@ void updateParticles(float time_step)
 }
 void updatePhysics(float time_step)
 {
-    {
-        Autolock lock( physicsEntitySetLock );
-
-        // 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_Add.clear();
+    addOrRemovePhysics();
 
     // apply collision math
     collision::update(active_Physics);
@@ -234,3 +194,47 @@ void updatePhysics(float time_step)
         (*it)->update(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();
+         it++ )
+    {
+        active_Particles.insert(*it);
+    }
+    particles_To_Add.clear();
+
+    // remove dead Particle*s from Active
+    for( setPart::iterator it = particles_To_Remove.begin();
+         it != particles_To_Remove.end();
+         it++ )
+    {
+        active_Particles.erase(*it);
+    }
+    particles_To_Remove.clear();
+}
+void addOrRemovePhysics()
+{
+    Autolock lock( muSetPhys );
+
+    // 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();
+
+    // remove dead PhysicsEntity*s from Active
+    for( setPhys::iterator it = physics_To_Remove.begin();
+         it != physics_To_Remove.end();
+         it++ )
+    {
+        active_Physics.erase(*it);
+    }
+    physics_To_Remove.clear();
+}