projects
/
physics.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactored Vector2
[physics.git]
/
src
/
Effects
/
Screen.cpp
diff --git
a/src/Effects/Screen.cpp
b/src/Effects/Screen.cpp
index
9c0f283
..
770a456
100644
(file)
--- a/
src/Effects/Screen.cpp
+++ b/
src/Effects/Screen.cpp
@@
-46,17
+46,17
@@
Vector2 Screen::positionDelta(const PhysicsEntity* e, float time_step) const
radius = b->getRadius();
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;
}
return acc;
}
@@
-75,17
+75,17
@@
Vector2 Screen::velocityDelta(const PhysicsEntity* e, float time_step) const
radius = b->getRadius();
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;
}
return acc;
}