X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=src%2FEffects%2FScreen.cpp;h=770a456ec8d94a5dcfcee17494481d989d50336d;hb=9d6dea5f1cfd43cfa136241b352830371acfdc88;hp=61108c42b01341553e2e21d208c38d8b82a6cab9;hpb=46e842c7cc2e977f9bdd9fb4480dac26163fa25b;p=physics.git

diff --git a/src/Effects/Screen.cpp b/src/Effects/Screen.cpp
index 61108c4..770a456 100644
--- 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 *****
@@ -37,7 +37,6 @@ Screen::~Screen()
 Vector2 Screen::positionDelta(const PhysicsEntity* e, float time_step) const
 {
     const Vector2& pos = e->positionRaw();
-    const Vector2& velo = e->velocityRaw();
 
     Vector2 acc(0,0);
 
@@ -47,17 +46,17 @@ Vector2 Screen::positionDelta(const PhysicsEntity* e, float time_step) const
         radius = b->getRadius();
 
 
-    if(pos.y > 600-radius)
-        acc.y += 600-radius - pos.y;
+    if(pos.m_fY > 600-radius)
+        acc.m_fY += 600-radius - pos.m_fY;
 
-    if(pos.y < 0+radius)
-        acc.y += 0+radius - pos.y;
+    if(pos.m_fY < 0+radius)
+        acc.m_fY += 0+radius - pos.m_fY;
 
-    if(pos.x > 800-radius)
-        acc.x += 800-radius - pos.x;
+    if(pos.m_fX > 800-radius)
+        acc.m_fX += 800-radius - pos.m_fX;
 
-    if(pos.x < 0+radius)
-        acc.x += 0+radius - pos.x;
+    if(pos.m_fX < 0+radius)
+        acc.m_fX += 0+radius - pos.m_fX;
 
     return acc;
 }
@@ -76,17 +75,17 @@ Vector2 Screen::velocityDelta(const PhysicsEntity* e, float time_step) const
         radius = b->getRadius();
 
 
-    if(pos.y > 600-radius && velo.y > 0)
-        acc.y += velo.y * -(1 + CoR);
+    if(pos.m_fY > 600-radius && velo.m_fY > 0)
+        acc.m_fY += velo.m_fY * -(1 + CoR);
 
-    if(pos.y < 0+radius && velo.y < 0)
-        acc.y += velo.y * -(1 + CoR);
+    if(pos.m_fY < 0+radius && velo.m_fY < 0)
+        acc.m_fY += velo.m_fY * -(1 + CoR);
 
-    if(pos.x > 800-radius && velo.x > 0)
-        acc.x += velo.x * -(1 + CoR);
+    if(pos.m_fX > 800-radius && velo.m_fX > 0)
+        acc.m_fX += velo.m_fX * -(1 + CoR);
 
-    if(pos.x < 0+radius && velo.x < 0)
-        acc.x += velo.x * -(1 + CoR);
+    if(pos.m_fX < 0+radius && velo.m_fX < 0)
+        acc.m_fX += velo.m_fX * -(1 + CoR);
 
     return acc;
 }