X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=src%2FEntities%2FPhysicsEntity.h;h=d229691d4911e6b679acbb1c0de420805ad88a58;hb=389bf8fdd7e1b8f4fe21e5a9fdb477d40d03d829;hp=4df29b386a5bbd55da4ec0817d7ee382500fcdd4;hpb=6aad402ae2635bb96bd5a67e6054c8e65ea8df68;p=physics.git

diff --git a/src/Entities/PhysicsEntity.h b/src/Entities/PhysicsEntity.h
index 4df29b3..d229691 100644
--- a/src/Entities/PhysicsEntity.h
+++ b/src/Entities/PhysicsEntity.h
@@ -1,11 +1,31 @@
+/*
+ *  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/>.
+ */
+
 #ifndef PHYSICS_H
 #define PHYSICS_H
 
+#include <bear/Vector2.h>
+using namespace bear;
+
 #include "Entity.h"
-#include "../Effects/Effect.h"
-#include "../Vector2.h"
+
 
 /// ***** Header Class *****
+
 class PhysicsEntity: public Entity
 {
   protected:
@@ -19,18 +39,21 @@ class PhysicsEntity: public Entity
     virtual Vector2 positionAt(float) const;
     virtual Vector2 velocityAt(float) const;
 
-    virtual void applyForce(const Vector2&);
-    virtual void applyImpulse(const Vector2&);
+    virtual void applyForce(const Vector2& force);
+    virtual void applyForce(const Vector2& force, const Vector2& at);
 
-  protected:
-    Vector2 force;
+    virtual void applyImpulse(const Vector2& impulse);
+    virtual void applyImpulse(const Vector2& impulse, const Vector2& at);
 
-    float mass;
+    virtual void applyNudge(const Vector2& vecPush);
 
-    // Coefficient of Restitution
-    float CoR;
+  //protected:
+    Vector2 m_force;
 
-    Effect* g;
+    float m_mass;
+
+    // Coefficient of Restitution
+    float m_CoR;
 };
 
 #endif // PHYSICS_H