renamed libpg to libbear

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

diff --git a/src/Entities/PhysicsEntity.cpp b/src/Entities/PhysicsEntity.cpp
index 285236e..060ef62 100644 (file)
--- a/src/Entities/PhysicsEntity.cpp
+++ b/src/Entities/PhysicsEntity.cpp
@@ -16,16 +16,18 @@
  */
 
 #include "PhysicsEntity.h"
-#include "../debug.h"
 
-#include "../effectManager.h"
-#include "../Vector2.h"
+#include <bear/debug.h>
+#include <bear/Vector2.h>
+using namespace bear;
+
+#include "effectManager.h"
 
 
 /// ***** Constructors/Destructors *****
 
 PhysicsEntity::PhysicsEntity(const Vector2& pos)
-    : Entity(pos), force(0,0), mass(1), CoR(1)
+    : Entity(pos), force(0,0), mass(1), CoR(0.8)
 {
 
 }
@@ -70,10 +72,23 @@ Vector2 PhysicsEntity::velocityAt(float time_step) const
 
 void PhysicsEntity::applyForce(const Vector2& force)
 {
+    applyForce(force, position);
+}
+void PhysicsEntity::applyForce(const Vector2& force, const Vector2& at)
+{
     this->force += force;
 }
 
-void PhysicsEntity::applyImpulse(const Vector2& impluse)
+void PhysicsEntity::applyImpulse(const Vector2& impulse)
+{
+    applyImpulse(impulse, position);
+}
+void PhysicsEntity::applyImpulse(const Vector2& impulse, const Vector2& at)
+{
+    velocity += impulse;
+}
+
+void PhysicsEntity::applyNudge(const Vector2& vecPush)
 {
-    velocity += impluse;
+    position += vecPush;
 }