*/
#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"
/// ***** 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();
}
{
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;
}
{
- 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;
}
}
void manager::draw()
{
{
- Autolock lock( particleSetLock );
- DPF(0, "Particle Draw Start");
+ Autolock lock( muSetPart );
- // 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();
+ addOrRemoveParticles();
- // update active Particle*s
+ // 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 );
- // 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();
+ addOrRemovePhysics();
- // update active PhysicsEntity*s
+ // draw active PhysicsEntity*s
for( setPhys::iterator it = active_Physics.begin();
it != active_Physics.end();
it++ )
{
(*it)->draw();
}
-
- DPF(0, "Physics Draw End");
}
}
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_Remove.clear();
- }
-
- particles_To_Add.clear();
+ addOrRemoveParticles();
// update active Particle*s
for( setPart::iterator it = active_Particles.begin();
}
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);
(*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();
+}
projects / physics.git / blobdiff