cleaned make file, removed allegro stuff, fixed entity name space issues

[physics.git] / src / entityManager.cpp

diff --git a/src/entityManager.cpp b/src/entityManager.cpp
index f189c7d..351808a 100644 (file)
--- a/src/entityManager.cpp
+++ b/src/entityManager.cpp
@@ -27,14 +27,14 @@ bool clearPhysics;
 
 /// ***** Public Methods *****
 
-void entityMInit()
+void entityManager::init()
 {
 }
-void entityMClean()
+void entityManager::clean()
 {
 }
 
-void addEntity(Entity* e)
+void entityManager::add(Entity* e)
 {
     {
     Particle* p = dynamic_cast<Particle*>(e);
@@ -57,7 +57,7 @@ void addEntity(Entity* e)
     std::cerr << "ENTITY TYPE NOT SUPPORTED BY addEntity()!!";
     std::cerr << std::endl;
 }
-void deleteEntity(Entity* e)
+void entityManager::remove(Entity* e)
 {
     {
     Particle* p = dynamic_cast<Particle*>(e);
@@ -81,22 +81,22 @@ void deleteEntity(Entity* e)
     std::cerr << std::endl;
 }
 
-void clear()
+void entityManager::clear()
 {
     clearParticles = true;
     clearPhysics = true;
 }
 
-void handleInput()
+void entityManager::handleInput()
 {
     // TODO
 }
-void updateEntities(float time_step)
+void entityManager::update(float time_step)
 {
     updateParticles(time_step);
     updatePhysics(time_step);
 }
-void drawEntities()
+void entityManager::draw()
 {
     // update active Particle*s
     for( setPart::iterator it = active_Particles.begin();