X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=src%2FEntities%2FPhysicsEntity.cpp;h=060ef62abe9eccc215fa674b9466e14b3a2eb0dd;hb=5e0713e5967be038b1b0cc5f0ffbd0180e3f7099;hp=30e689e8a07ab41c6c6ab2b1b6cd037cc37cc6e5;hpb=617dcc71d9a71663f63fb56ffac2505b45bf91b9;p=physics.git

diff --git a/src/Entities/PhysicsEntity.cpp b/src/Entities/PhysicsEntity.cpp
index 30e689e..060ef62 100644
--- a/src/Entities/PhysicsEntity.cpp
+++ b/src/Entities/PhysicsEntity.cpp
@@ -1,14 +1,33 @@
+/*
+ *  Copyright (C) 2008 Patrik Gornicz, Gornicz_P (at) hotmail (dot) com.
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #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)
 {
 
 }
@@ -53,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;
 }