refactored effectManager

[physics.git] / src / effectManager.cpp

diff --git a/src/effectManager.cpp b/src/effectManager.cpp
index b77fc1d..c11ffc3 100644 (file)
--- a/src/effectManager.cpp
+++ b/src/effectManager.cpp
@@ -17,6 +17,8 @@
 
 #include "effectManager.h"
 
+#include <set>
+
 #include "Effects/Effect.h"
 #include "Effects/Gravity.h"
 #include "Effects/GravityWell.h"
@@ -28,32 +30,28 @@
 
 /// ***** Private Variables *****
 
-Effect** effects;
-int numEffects;
+typedef std::set<Effect*> setEffect;
+setEffect active_Effects;
 
-GravityWell* mouseWell;
+GravityWell* pMouseWell;
 
 /// ***** Initializers/Cleaners *****
 
 void effect::init()
 {
-    numEffects = 3;
-    effects = new Effect*[numEffects]();
-
-    mouseWell = new GravityWell(input::mousePosition());
+    pMouseWell = new GravityWell(Vector2(0,0));
 
-    effects[0] = new Screen();
-    effects[1] = new Gravity();
-    effects[2] = mouseWell;
+    active_Effects.insert(new Screen());
+    active_Effects.insert(new Gravity());
 }
 void effect::clean()
 {
-    for(int i=0; i < numEffects; i++)
+    for( setEffect::iterator it = active_Effects.begin();
+         it != active_Effects.end();
+         it++ )
     {
-        delete effects[i];
+        // TODO !!!!!!!!!
     }
-
-    delete[] effects;
 }
 
 /// ***** Public Methods *****
@@ -64,46 +62,50 @@ void effect::update(float)
 }
 void effect::handleInput()
 {
+    if(cfg::mouseWellFollow())
+        pMouseWell->setPosition(input::mousePosition());
+
     if(cfg::mouseWellOn())
-    {
-        numEffects = 3;
-        mouseWell->setPosition(input::mousePosition());
-    }
-    else
-    {
-        numEffects = 2;
-    }
+        active_Effects.insert(pMouseWell);
+    if(cfg::mouseWellOff())
+        active_Effects.erase(pMouseWell);
 }
 
-Vector2 effect::positionDelta(const PhysicsEntity* e, float time_step)
+Vector2 effect::positionDelta(const PhysicsEntity* ppe, float fTimeStep)
 {
     Vector2 acc(0,0);
 
-    for(int i=0; i < numEffects; i++)
+    for( setEffect::iterator it = active_Effects.begin();
+         it != active_Effects.end();
+         it++ )
     {
-        acc += effects[i]->positionDelta(e, time_step);
+        acc += (*it)->positionDelta(ppe, fTimeStep);
     }
 
     return acc;
 }
-Vector2 effect::velocityDelta(const PhysicsEntity* e, float time_step)
+Vector2 effect::velocityDelta(const PhysicsEntity* ppe, float fTimeStep)
 {
     Vector2 acc(0,0);
 
-    for(int i=0; i < numEffects; i++)
+    for( setEffect::iterator it = active_Effects.begin();
+         it != active_Effects.end();
+         it++ )
     {
-        acc += effects[i]->velocityDelta(e, time_step);
+        acc += (*it)->velocityDelta(ppe, fTimeStep);
     }
 
     return acc;
 }
-Vector2 effect::forceDelta(const PhysicsEntity* e, float time_step)
+Vector2 effect::forceDelta(const PhysicsEntity* ppe, float fTimeStep)
 {
     Vector2 acc(0,0);
 
-    for(int i=0; i < numEffects; i++)
+    for( setEffect::iterator it = active_Effects.begin();
+         it != active_Effects.end();
+         it++ )
     {
-        acc += effects[i]->forceDelta(e, time_step);
+        acc += (*it)->forceDelta(ppe, fTimeStep);
     }
 
     return acc;