effectManager created

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

diff --git a/src/Entities/PhysicsEntity.cpp b/src/Entities/PhysicsEntity.cpp
index 727b89f..fba6a89 100644 (file)
--- a/src/Entities/PhysicsEntity.cpp
+++ b/src/Entities/PhysicsEntity.cpp
@@ -2,18 +2,15 @@
 #include "../debug.h"
 
 #include "../Vector2.h"
-#include "../Effects/Effect.h"
-#include "../Effects/Gravity.h"
+#include "../effectManager.h"
 
 /// ***** Public Class Methods *****
 PhysicsEntity::PhysicsEntity(const Vector2& pos)
     : Entity(pos), force(0,0), mass(1), CoR(1)
 {
-    g = new Gravity();
 }
 PhysicsEntity::~PhysicsEntity()
 {
-    delete g;
 }
 
 void PhysicsEntity::update(float time_step)
@@ -30,9 +27,9 @@ Vector2 PhysicsEntity::positionAt(float time_step) const
     Vector2 newVelocity = velocity;
     Vector2 newForce = force;
 
-    newPosition += g->positionDelta(this, time_step);
-    newVelocity += g->velocityDelta(this, time_step);
-    newForce += g->forceDelta(this, time_step);
+    newPosition += effect::positionDelta(this, time_step);
+    newVelocity += effect::velocityDelta(this, time_step);
+    newForce += effect::forceDelta(this, time_step);
 
     return newForce/mass / 2 * time_step * time_step + newVelocity * time_step + newPosition;
 }
@@ -42,8 +39,8 @@ Vector2 PhysicsEntity::velocityAt(float time_step) const
     Vector2 newForce = force;
     Vector2 newVelocity = velocity;
 
-    newForce += g->forceDelta(this, time_step);
-    newVelocity += g->velocityDelta(this, time_step);
+    newForce += effect::forceDelta(this, time_step);
+    newVelocity += effect::velocityDelta(this, time_step);
 
     return newForce/mass / 2 * time_step + newVelocity;
 }