X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=src%2FeffectManager.cpp;h=bcd597ecb1f0807a2dec33af417c711664ff1136;hb=f32a9b7c8eab3536ad354f85ee65c41d5b5da006;hp=b661f51a29f6d044074e2247d9161575a9e774fd;hpb=33b8c69b7b2e8d3f31124130a503ec2179c4969c;p=physics.git

diff --git a/src/effectManager.cpp b/src/effectManager.cpp
index b661f51..bcd597e 100644
--- a/src/effectManager.cpp
+++ b/src/effectManager.cpp
@@ -1,60 +1,112 @@
+/*
+ *  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 "effectManager.h"
 
+#include <pg/Vector2.h>
+
+#include <set>
+
 #include "Effects/Effect.h"
 #include "Effects/Gravity.h"
+#include "Effects/GravityWell.h"
+#include "Effects/Screen.h"
+
+#include "input/inputManager.h"
+#include "config/config.h"
 
 /// ***** Private Variables *****
-Effect** effects;
-int numEffects;
 
-/// ***** Public Methods *****
+typedef std::set<Effect*> setEffect;
+setEffect active_Effects;
+
+GravityWell* pMouseWell;
+
+/// ***** Initializers/Cleaners *****
 
 void effect::init()
 {
-    numEffects = 1;
-    effects = new Effect*[numEffects]();
+    pMouseWell = new GravityWell(Vector2(0,0));
 
-    effects[0] = new Gravity();
+    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 !!!!!!!!!
     }
+}
+
+/// ***** Public Methods *****
+
+void effect::update(float)
+{
+
+}
+void effect::handleInput()
+{
+    if(cfg::mouseWellFollow())
+        pMouseWell->setPosition(input::mousePosition());
 
-    delete effects;
+    if(cfg::mouseWellOn())
+        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;