added ball to ball collisions

[physics.git] / src / entityManager.cpp

diff --git a/src/entityManager.cpp b/src/entityManager.cpp
index 351808a..c7fc78b 100644 (file)
--- a/src/entityManager.cpp
+++ b/src/entityManager.cpp
@@ -1,102 +1,120 @@
+/*
+ *  Copyright (C) 2008 Patrik Gornicz, Gornicz_P (at) hotmail (dot) com.
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "entityManager.h"
+#include "debug.h"
+
+#include <set>
+
 #include "Entities/Entity.h"
 #include "Entities/Particle.h"
 #include "Entities/PhysicsEntity.h"
 
-#include <set>
-using std::set;
-
-#include <iostream>
+#include "collisionHandler.h"
 
 /// ***** Private Method Headers *****
+
 void updateParticles(float);
 void updatePhysics(float);
 
 /// ***** Private Variables *****
-typedef set<Particle*> setPart;
+
+typedef std::set<Particle*> setPart;
 setPart particles_To_Add;
 setPart active_Particles;
 setPart particles_To_Remove;
-bool clearParticles;
 
-typedef set<PhysicsEntity*> setPhys;
+typedef std::set<PhysicsEntity*> setPhys;
 setPhys physics_To_Add;
 setPhys active_Physics;
 setPhys physics_To_Remove;
-bool clearPhysics;
 
-/// ***** Public Methods *****
+/// ***** Initializers/Cleaners *****
 
-void entityManager::init()
+void manager::init()
 {
+    collision::init();
 }
-void entityManager::clean()
+void manager::clean()
 {
+    collision::clean();
 }
 
-void entityManager::add(Entity* e)
+/// ***** Public Methods *****
+
+void manager::add(Entity* e)
 {
     {
-    Particle* p = dynamic_cast<Particle*>(e);
-    if( p != 0 )
-    {
-        particles_To_Add.insert(p);
-        return;
-    }
+        Particle* p = dynamic_cast<Particle*>(e);
+        if( p != 0 )
+        {
+            particles_To_Add.insert(p);
+            return;
+        }
     }
 
     {
-    PhysicsEntity* p = dynamic_cast<PhysicsEntity*>(e);
-    if( p != 0 )
-    {
-        physics_To_Add.insert(p);
-        return;
-    }
+        PhysicsEntity* p = dynamic_cast<PhysicsEntity*>(e);
+        if( p != 0 )
+        {
+            physics_To_Add.insert(p);
+            return;
+        }
     }
 
-    std::cerr << "ENTITY TYPE NOT SUPPORTED BY addEntity()!!";
-    std::cerr << std::endl;
+#ifdef WARNINGS
+    cerr << "ENTITY TYPE NOT SUPPORTED BY addEntity()!!" << endl;
+#endif
 }
-void entityManager::remove(Entity* e)
+void manager::remove(Entity* e)
 {
     {
-    Particle* p = dynamic_cast<Particle*>(e);
-    if( p != 0 )
-    {
-        particles_To_Remove.insert(p);
-        return;
-    }
+        Particle* p = dynamic_cast<Particle*>(e);
+        if( p != 0 )
+        {
+            particles_To_Remove.insert(p);
+            return;
+        }
     }
 
     {
-    PhysicsEntity* p = dynamic_cast<PhysicsEntity*>(e);
-    if( p != 0 )
-    {
-        physics_To_Remove.insert(p);
-        return;
+        PhysicsEntity* p = dynamic_cast<PhysicsEntity*>(e);
+        if( p != 0 )
+        {
+            physics_To_Remove.insert(p);
+            return;
+        }
     }
-    }
-
-    std::cerr << "ENTITY TYPE NOT SUPPORTED BY deleteEntity()!!";
-    std::cerr << std::endl;
-}
 
-void entityManager::clear()
-{
-    clearParticles = true;
-    clearPhysics = true;
+#ifdef WARNINGS
+    cerr << "ENTITY TYPE NOT SUPPORTED BY deleteEntity()!!" << endl;
+#endif
 }
 
-void entityManager::handleInput()
+void manager::handleInput()
 {
     // TODO
 }
-void entityManager::update(float time_step)
+void manager::update(float time_step)
 {
     updateParticles(time_step);
     updatePhysics(time_step);
 }
-void entityManager::draw()
+void manager::draw()
 {
     // update active Particle*s
     for( setPart::iterator it = active_Particles.begin();
@@ -116,6 +134,7 @@ void entityManager::draw()
 }
 
 /// ***** Private Methods *****
+
 void updateParticles(float time_step)
 {
     // add new Particle*s to Active
@@ -164,6 +183,9 @@ void updatePhysics(float time_step)
     }
     physics_To_Remove.clear();
 
+    // apply collision math
+    collision::update(active_Physics, time_step);
+
     // update active PhysicsEntity*s
     for( setPhys::iterator it = active_Physics.begin();
          it != active_Physics.end();