diff options
author | Yann Herklotz <ymherklotz@gmail.com> | 2017-08-24 00:25:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-24 00:25:31 +0100 |
commit | a326354ea6fccf76665a4212bf14daeba0f52ec8 (patch) | |
tree | 18cd2deb0c30b38d8ca7c5305735d2323259e020 /src/rectanglecollider.cpp | |
parent | 0a49874288f92c120d7e165550eb6dbbe1ef7307 (diff) | |
parent | 5403490b941f7c031bf1aafdb91b1098f69edbf2 (diff) | |
download | YAGE-0.1.0.tar.gz YAGE-0.1.0.zip |
Merge pull request #3 from ymherklotz/developv0.1.0
Merge develop to master
Diffstat (limited to 'src/rectanglecollider.cpp')
-rw-r--r-- | src/rectanglecollider.cpp | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/src/rectanglecollider.cpp b/src/rectanglecollider.cpp index e9f695d7..936ac06a 100644 --- a/src/rectanglecollider.cpp +++ b/src/rectanglecollider.cpp @@ -8,22 +8,29 @@ #include "Physics/rectanglecollider.hpp" -namespace yage { +namespace yage +{ -RectangleCollider::RectangleCollider(const glm::vec2& position, - const glm::vec2& size) - : Collider(position, size) {} +RectangleCollider::RectangleCollider(const glm::vec2 &position, + const glm::vec2 &size) + : Collider(position, size) +{ +} -bool RectangleCollider::collides(const Collider& collider) const { - for (int i = position_.x; i < position_.x + size_.x; ++i) - for (int j = position_.y; j < position_.y + size_.y; ++j) +bool RectangleCollider::collides(const Collider &collider) const +{ + for (int i = position_.x; i < position_.x + size_.x; ++i) { + for (int j = position_.y; j < position_.y + size_.y; ++j) { return collider.inside(glm::vec2(i, j)); + } + } return false; } -inline bool RectangleCollider::inside(const glm::vec2& point) const { +inline bool RectangleCollider::inside(const glm::vec2 &point) const +{ return position_.x < point.x && position_.x + size_.x > point.x && position_.y < point.y && position_.y + size_.y > point.y; } -} // yage +} // yage |