X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=src%2FeffectManager.cpp;h=526debeaabc0d4b98627644ab52f0e0cf79b5fe4;hb=b85b89ba9a2cb0373209e8117046fd308faf0202;hp=a75e5d83a2ecb45267d3851d45463cf5139ccf44;hpb=c0f596e0269bfd114b4ff98c2d7d2855d88e6ef5;p=physics.git

diff --git a/src/effectManager.cpp b/src/effectManager.cpp
index a75e5d8..526debe 100644
--- a/src/effectManager.cpp
+++ b/src/effectManager.cpp
@@ -17,6 +17,9 @@
 
 #include "effectManager.h"
 
+#include <pg/Vector2.h>
+using namespace pg;
+
 #include <set>
 
 #include "Effects/Effect.h"
@@ -24,7 +27,6 @@
 #include "Effects/GravityWell.h"
 #include "Effects/Screen.h"
 
-#include "Vector2.h"
 #include "input/inputManager.h"
 #include "config/config.h"
 
@@ -33,13 +35,13 @@
 typedef std::set<Effect*> setEffect;
 setEffect active_Effects;
 
-GravityWell* mouseWell;
+GravityWell* pMouseWell;
 
 /// ***** Initializers/Cleaners *****
 
 void effect::init()
 {
-    mouseWell = new GravityWell(Vector2(0,0));
+    pMouseWell = new GravityWell(Vector2(0,0));
 
     active_Effects.insert(new Screen());
     active_Effects.insert(new Gravity());
@@ -63,15 +65,15 @@ void effect::update(float)
 void effect::handleInput()
 {
     if(cfg::mouseWellFollow())
-        mouseWell->setPosition(input::mousePosition());
+        pMouseWell->setPosition(input::mousePosition());
 
     if(cfg::mouseWellOn())
-        active_Effects.insert(mouseWell);
+        active_Effects.insert(pMouseWell);
     if(cfg::mouseWellOff())
-        active_Effects.erase(mouseWell);
+        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);
 
@@ -79,12 +81,12 @@ Vector2 effect::positionDelta(const PhysicsEntity* e, float time_step)
          it != active_Effects.end();
          it++ )
     {
-        acc += (*it)->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);
 
@@ -92,12 +94,12 @@ Vector2 effect::velocityDelta(const PhysicsEntity* e, float time_step)
          it != active_Effects.end();
          it++ )
     {
-        acc += (*it)->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);
 
@@ -105,7 +107,7 @@ Vector2 effect::forceDelta(const PhysicsEntity* e, float time_step)
          it != active_Effects.end();
          it++ )
     {
-        acc += (*it)->forceDelta(e, time_step);
+        acc += (*it)->forceDelta(ppe, fTimeStep);
     }
 
     return acc;