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 /include/YAGE/Physics/rectanglecollider.hpp | |
parent | 0a49874288f92c120d7e165550eb6dbbe1ef7307 (diff) | |
parent | 5403490b941f7c031bf1aafdb91b1098f69edbf2 (diff) | |
download | YAGE-a326354ea6fccf76665a4212bf14daeba0f52ec8.tar.gz YAGE-a326354ea6fccf76665a4212bf14daeba0f52ec8.zip |
Merge pull request #3 from ymherklotz/developv0.1.0
Merge develop to master
Diffstat (limited to 'include/YAGE/Physics/rectanglecollider.hpp')
-rw-r--r-- | include/YAGE/Physics/rectanglecollider.hpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/YAGE/Physics/rectanglecollider.hpp b/include/YAGE/Physics/rectanglecollider.hpp index 7f9dd7f7..ba1d8384 100644 --- a/include/YAGE/Physics/rectanglecollider.hpp +++ b/include/YAGE/Physics/rectanglecollider.hpp @@ -13,16 +13,18 @@ #include <glm/glm.hpp> -namespace yage { +namespace yage +{ -class RectangleCollider : public Collider { +class RectangleCollider : public Collider +{ public: - RectangleCollider(const glm::vec2& position, const glm::vec2& size); + RectangleCollider(const glm::vec2 &position, const glm::vec2 &size); - virtual bool collides(const Collider& collider) const; - virtual bool inside(const glm::vec2& point) const; + bool collides(const Collider &collider) const override; + bool inside(const glm::vec2 &point) const override; }; -} // yage +} // yage #endif |