X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=src%2FEntities%2FPhysicsEntity.cpp;h=4ba50dc24921ed739493fc72baa7a05755c1eeea;hb=b85b89ba9a2cb0373209e8117046fd308faf0202;hp=fba6a898dedb3f60fffec4629fe8e8ac9fcb6a18;hpb=f206d19d6b5baa4cb25ba77726f1fd4fcd7492e3;p=physics.git
diff --git a/src/Entities/PhysicsEntity.cpp b/src/Entities/PhysicsEntity.cpp
index fba6a89..4ba50dc 100644
--- a/src/Entities/PhysicsEntity.cpp
+++ b/src/Entities/PhysicsEntity.cpp
@@ -1,18 +1,43 @@
+/*
+ * 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 .
+ */
+
#include "PhysicsEntity.h"
-#include "../debug.h"
-#include "../Vector2.h"
-#include "../effectManager.h"
+#include
+#include
+using namespace pg;
+
+#include "effectManager.h"
+
+
+/// ***** Constructors/Destructors *****
-/// ***** Public Class Methods *****
PhysicsEntity::PhysicsEntity(const Vector2& pos)
- : Entity(pos), force(0,0), mass(1), CoR(1)
+ : Entity(pos), force(0,0), mass(1), CoR(0.8)
{
+
}
PhysicsEntity::~PhysicsEntity()
{
+
}
+/// ***** Public Class Methods *****
+
void PhysicsEntity::update(float time_step)
{
position = positionAt(time_step);
@@ -47,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;
}