named members m_* to quite -Wshadow

[physics.git] / src / Entities / PhysicsEntity.h

diff --git a/src/Entities/PhysicsEntity.h b/src/Entities/PhysicsEntity.h
index 47971a5..d229691 100644 (file)
--- a/src/Entities/PhysicsEntity.h
+++ b/src/Entities/PhysicsEntity.h
@@ -18,8 +18,10 @@
 #ifndef PHYSICS_H
 #define PHYSICS_H
 
+#include <bear/Vector2.h>
+using namespace bear;
+
 #include "Entity.h"
-#include "../Vector2.h"
 
 
 /// ***** Header Class *****
@@ -37,16 +39,21 @@ class PhysicsEntity: public Entity
     virtual Vector2 positionAt(float) const;
     virtual Vector2 velocityAt(float) const;
 
-    virtual void applyForce(const Vector2&);
-    virtual void applyImpulse(const Vector2&);
+    virtual void applyForce(const Vector2& force);
+    virtual void applyForce(const Vector2& force, const Vector2& at);
 
-  protected:
-    Vector2 force;
+    virtual void applyImpulse(const Vector2& impulse);
+    virtual void applyImpulse(const Vector2& impulse, const Vector2& at);
+
+    virtual void applyNudge(const Vector2& vecPush);
+
+  //protected:
+    Vector2 m_force;
 
-    float mass;
+    float m_mass;
 
     // Coefficient of Restitution
-    float CoR;
+    float m_CoR;
 };
 
 #endif // PHYSICS_H