removed all ../ entries and made a basic inc path (dependencies are currently broke)

[physics.git] / src / Effects / Screen.cpp

diff --git a/src/Effects/Screen.cpp b/src/Effects/Screen.cpp
index 44cce18..9c0f283 100644 (file)
--- a/src/Effects/Screen.cpp
+++ b/src/Effects/Screen.cpp
@@ -17,8 +17,8 @@
 
 #include "Screen.h"
 
-#include "../Entities/PhysicsEntity.h"
-#include "../Entities/Ball.h"
+#include "Entities/PhysicsEntity.h"
+#include "Entities/Ball.h"
 
 
 /// ***** Constructors/Destructors *****
@@ -34,6 +34,33 @@ Screen::~Screen()
 
 /// ***** Public Class Methods *****
 
+Vector2 Screen::positionDelta(const PhysicsEntity* e, float time_step) const
+{
+    const Vector2& pos = e->positionRaw();
+
+    Vector2 acc(0,0);
+
+    float radius = 0;
+    const Ball* b = dynamic_cast<const Ball*>(e);
+    if( b != NULL )
+        radius = b->getRadius();
+
+
+    if(pos.y > 600-radius)
+        acc.y += 600-radius - pos.y;
+
+    if(pos.y < 0+radius)
+        acc.y += 0+radius - pos.y;
+
+    if(pos.x > 800-radius)
+        acc.x += 800-radius - pos.x;
+
+    if(pos.x < 0+radius)
+        acc.x += 0+radius - pos.x;
+
+    return acc;
+}
+
 Vector2 Screen::velocityDelta(const PhysicsEntity* e, float time_step) const
 {
     const Vector2& pos = e->positionRaw();
@@ -41,6 +68,7 @@ Vector2 Screen::velocityDelta(const PhysicsEntity* e, float time_step) const
 
     Vector2 acc(0,0);
 
+    float CoR = e->CoR;
     float radius = 0;
     const Ball* b = dynamic_cast<const Ball*>(e);
     if( b != NULL )
@@ -48,16 +76,16 @@ Vector2 Screen::velocityDelta(const PhysicsEntity* e, float time_step) const
 
 
     if(pos.y > 600-radius && velo.y > 0)
-        acc.y += velo.y * -2;
+        acc.y += velo.y * -(1 + CoR);
 
     if(pos.y < 0+radius && velo.y < 0)
-        acc.y += velo.y * -2;
+        acc.y += velo.y * -(1 + CoR);
 
     if(pos.x > 800-radius && velo.x > 0)
-        acc.x += velo.x * -2;
+        acc.x += velo.x * -(1 + CoR);
 
     if(pos.x < 0+radius && velo.x < 0)
-        acc.x += velo.x * -2;
+        acc.x += velo.x * -(1 + CoR);
 
     return acc;
 }