X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=src%2FentityManager.cpp;h=0707dfe03eb8e1015882a5502ad03855c69c39c9;hb=823da4ea799e7e0ad8a52c9a2c86ce1278bb432a;hp=351808adce25407b6a6fb315eca5775924c5221f;hpb=27b748208e91c2e802cbc2b8f7ab3620adaf6cb6;p=physics.git
diff --git a/src/entityManager.cpp b/src/entityManager.cpp
index 351808a..0707dfe 100644
--- a/src/entityManager.cpp
+++ b/src/entityManager.cpp
@@ -1,102 +1,123 @@
+/*
+ * 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 .
+ */
+
#include "entityManager.h"
+#include "debug.h"
+
+#include
+
#include "Entities/Entity.h"
#include "Entities/Particle.h"
#include "Entities/PhysicsEntity.h"
-#include
-using std::set;
-
-#include
+#include "collisionManager.h"
+#include "effectManager.h"
/// ***** Private Method Headers *****
+
void updateParticles(float);
void updatePhysics(float);
/// ***** Private Variables *****
-typedef set setPart;
+
+typedef std::set setPart;
setPart particles_To_Add;
setPart active_Particles;
setPart particles_To_Remove;
-bool clearParticles;
-typedef set setPhys;
+typedef std::set 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(e);
- if( p != 0 )
- {
- particles_To_Add.insert(p);
- return;
- }
+ Particle* p = dynamic_cast(e);
+ if( p != 0 )
+ {
+ particles_To_Add.insert(p);
+ return;
+ }
}
{
- PhysicsEntity* p = dynamic_cast(e);
- if( p != 0 )
- {
- physics_To_Add.insert(p);
- return;
- }
+ PhysicsEntity* p = dynamic_cast(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(e);
- if( p != 0 )
- {
- particles_To_Remove.insert(p);
- return;
- }
+ Particle* p = dynamic_cast(e);
+ if( p != 0 )
+ {
+ particles_To_Remove.insert(p);
+ return;
+ }
}
{
- PhysicsEntity* p = dynamic_cast(e);
- if( p != 0 )
- {
- physics_To_Remove.insert(p);
- return;
- }
+ PhysicsEntity* p = dynamic_cast(e);
+ if( p != 0 )
+ {
+ physics_To_Remove.insert(p);
+ return;
+ }
}
- std::cerr << "ENTITY TYPE NOT SUPPORTED BY deleteEntity()!!";
- std::cerr << std::endl;
+#ifdef WARNINGS
+ cerr << "ENTITY TYPE NOT SUPPORTED BY deleteEntity()!!" << endl;
+#endif
}
-void entityManager::clear()
+void manager::handleInput()
{
- clearParticles = true;
- clearPhysics = true;
+ effect::handleInput();
}
-
-void entityManager::handleInput()
-{
- // TODO
-}
-void entityManager::update(float time_step)
+void manager::update(float time_step)
{
+ effect::update(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 +137,7 @@ void entityManager::draw()
}
/// ***** Private Methods *****
+
void updateParticles(float time_step)
{
// add new Particle*s to Active
@@ -164,6 +186,9 @@ void updatePhysics(float time_step)
}
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();