diff options
Diffstat (limited to 'src/crepe/api/CircleCollider.h')
| -rw-r--r-- | src/crepe/api/CircleCollider.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/crepe/api/CircleCollider.h b/src/crepe/api/CircleCollider.h index e77a592..e4f0452 100644 --- a/src/crepe/api/CircleCollider.h +++ b/src/crepe/api/CircleCollider.h @@ -1,14 +1,22 @@ #pragma once + +#include "Vector2.h" + #include "../Collider.h" namespace crepe { class CircleCollider : public Collider { public: +<<<<<<< HEAD + CircleCollider(game_object_id_t game_object_id,Vector2 offset, int radius); + double radius; +======= CircleCollider(game_object_id_t game_object_id, int radius) : Collider(game_object_id), radius(radius) {} int radius; +>>>>>>> be1e97bc7a494963ab1567492fafcda99e36f683 }; } // namespace crepe |