renamed a few more members and changed some switch statements

[physics.git] / src / Effects / GravityWell.cpp

diff --git a/src/Effects/GravityWell.cpp b/src/Effects/GravityWell.cpp
index 68afa27..38711eb 100644 (file)
--- a/src/Effects/GravityWell.cpp
+++ b/src/Effects/GravityWell.cpp
@@ -16,13 +16,14 @@
  */
 
 #include "GravityWell.h"
-#include "../Entities/PhysicsEntity.h"
+#include "Entities/PhysicsEntity.h"
 
+float wellGravity = 0.5;
 
 /// ***** Constructors/Destructors *****
 
 GravityWell::GravityWell(const Vector2& pos)
-    : position(pos)
+    : m_position(pos)
 {
 
 }
@@ -36,20 +37,20 @@ GravityWell::~GravityWell()
 Vector2 GravityWell::forceDelta(const PhysicsEntity* e, float) const
 {
     const Vector2& pos = e->positionRaw();
-    float mass = e->mass;
+    float mass = e->m_mass;
 
-    Vector2 delta = position - pos;
+    Vector2 delta = m_position - pos;
     float sqrDist = delta.sqrLength();
 
     Vector2 acc(0,0);
 
     if( sqrDist > 0.5F )
-        acc += delta / sqrDist * mass;
+        acc += delta / sqrDist * mass * wellGravity;
 
     return acc;
 }
 
 void GravityWell::setPosition(const Vector2& pos)
 {
-    position = pos;
+    m_position = pos;
 }