added ball to ball collisions

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

diff --git a/src/Entities/PhysicsEntity.cpp b/src/Entities/PhysicsEntity.cpp
index fba6a89..3354fe2 100644 (file)
--- a/src/Entities/PhysicsEntity.cpp
+++ b/src/Entities/PhysicsEntity.cpp
@@ -1,18 +1,41 @@
+/*
+ *  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 "../Vector2.h"
 #include "../effectManager.h"
+#include "../Vector2.h"
+
+
+/// ***** Constructors/Destructors *****
 
-/// ***** Public Class Methods *****
 PhysicsEntity::PhysicsEntity(const Vector2& pos)
     : Entity(pos), force(0,0), mass(1), CoR(1)
 {
+
 }
 PhysicsEntity::~PhysicsEntity()
 {
+
 }
 
+/// ***** Public Class Methods *****
+
 void PhysicsEntity::update(float time_step)
 {
     position = positionAt(time_step);
@@ -47,10 +70,18 @@ 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 += impluse;
+    velocity += impulse;
 }