named members m_* to quite -Wshadow

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

diff --git a/src/Entities/PhysicsEntity.cpp b/src/Entities/PhysicsEntity.cpp
index 9daff3a..b43874b 100644 (file)
--- a/src/Entities/PhysicsEntity.cpp
+++ b/src/Entities/PhysicsEntity.cpp
@@ -16,16 +16,18 @@
  */
 
 #include "PhysicsEntity.h"
-#include "debug.h"
+
+#include <bear/debug.h>
+#include <bear/Vector2.h>
+using namespace bear;
 
 #include "effectManager.h"
-#include "Vector2.h"
 
 
 /// ***** Constructors/Destructors *****
 
 PhysicsEntity::PhysicsEntity(const Vector2& pos)
-    : Entity(pos), force(0,0), mass(1), CoR(0.8)
+    : Entity(pos), m_force(0,0), m_mass(1), m_CoR(0.8)
 {
 
 }
@@ -41,47 +43,52 @@ void PhysicsEntity::update(float time_step)
     position = positionAt(time_step);
     velocity = velocityAt(time_step);
 
-    force *= 0;
+    m_force *= 0;
 }
 
 Vector2 PhysicsEntity::positionAt(float time_step) const
 {
     Vector2 newPosition = position;
     Vector2 newVelocity = velocity;
-    Vector2 newForce = force;
+    Vector2 newForce = m_force;
 
     newPosition += effect::positionDelta(this, time_step);
     newVelocity += effect::velocityDelta(this, time_step);
     newForce += effect::forceDelta(this, time_step);
 
-    return newForce/mass / 2 * time_step * time_step + newVelocity * time_step + newPosition;
+    return newForce/m_mass / 2 * time_step * time_step + newVelocity * time_step + newPosition;
 }
 
 Vector2 PhysicsEntity::velocityAt(float time_step) const
 {
-    Vector2 newForce = force;
+    Vector2 newForce = m_force;
     Vector2 newVelocity = velocity;
 
     newForce += effect::forceDelta(this, time_step);
     newVelocity += effect::velocityDelta(this, time_step);
 
-    return newForce/mass / 2 * time_step + newVelocity;
+    return newForce/m_mass / 2 * time_step + newVelocity;
 }
 
 void PhysicsEntity::applyForce(const Vector2& force)
 {
     applyForce(force, position);
 }
-void PhysicsEntity::applyForce(const Vector2& force, const Vector2& at)
+void PhysicsEntity::applyForce(const Vector2& force, const Vector2& /*at*/)
 {
-    this->force += force;
+    this->m_force += force;
 }
 
 void PhysicsEntity::applyImpulse(const Vector2& impulse)
 {
     applyImpulse(impulse, position);
 }
-void PhysicsEntity::applyImpulse(const Vector2& impulse, const Vector2& at)
+void PhysicsEntity::applyImpulse(const Vector2& impulse, const Vector2& /*at*/)
 {
     velocity += impulse;
 }
+
+void PhysicsEntity::applyNudge(const Vector2& vecPush)
+{
+    position += vecPush;
+}