diff options
-rw-r--r-- | src/crepe/Collider.cpp | 2 | ||||
-rw-r--r-- | src/crepe/Collider.h | 6 | ||||
-rw-r--r-- | src/crepe/api/BoxCollider.cpp | 8 | ||||
-rw-r--r-- | src/crepe/api/BoxCollider.h | 15 | ||||
-rw-r--r-- | src/crepe/api/CircleCollider.cpp | 8 | ||||
-rw-r--r-- | src/crepe/api/CircleCollider.h | 7 |
6 files changed, 39 insertions, 7 deletions
diff --git a/src/crepe/Collider.cpp b/src/crepe/Collider.cpp index bbec488..0706371 100644 --- a/src/crepe/Collider.cpp +++ b/src/crepe/Collider.cpp @@ -2,4 +2,4 @@ using namespace crepe; -Collider::Collider(game_object_id_t id) : Component(id) {} +Collider::Collider(game_object_id_t id, Vector2 offset) : Component(id), offset(offset) {} diff --git a/src/crepe/Collider.h b/src/crepe/Collider.h index 827f83d..54695b1 100644 --- a/src/crepe/Collider.h +++ b/src/crepe/Collider.h @@ -1,14 +1,14 @@ #pragma once #include "Component.h" +#include "api/Vector2.h" namespace crepe { class Collider : public Component { public: - Collider(game_object_id_t id); - - int size; + Collider(game_object_id_t id, Vector2 offset); + Vector2 offset; }; } // namespace crepe diff --git a/src/crepe/api/BoxCollider.cpp b/src/crepe/api/BoxCollider.cpp new file mode 100644 index 0000000..c3cb60c --- /dev/null +++ b/src/crepe/api/BoxCollider.cpp @@ -0,0 +1,8 @@ +#pragma once + +#include "BoxCollider.h" + +using namespace crepe; + + +BoxCollider::BoxCollider(game_object_id_t game_object_id,Vector2 offset, int width, int height) : Collider(game_object_id,offset), width(width), height(height) {} diff --git a/src/crepe/api/BoxCollider.h b/src/crepe/api/BoxCollider.h new file mode 100644 index 0000000..2461636 --- /dev/null +++ b/src/crepe/api/BoxCollider.h @@ -0,0 +1,15 @@ +#pragma once + +#include "Vector2.h" +#include "../Collider.h" + +namespace crepe { + +class BoxCollider : public Collider { +public: + BoxCollider(game_object_id_t game_object_id,Vector2 offset, int width, int height); + double width; + double height; +}; + +} // namespace crepe diff --git a/src/crepe/api/CircleCollider.cpp b/src/crepe/api/CircleCollider.cpp new file mode 100644 index 0000000..9365793 --- /dev/null +++ b/src/crepe/api/CircleCollider.cpp @@ -0,0 +1,8 @@ +#pragma once + +#include "CircleCollider.h" + +using namespace crepe; + + +CircleCollider::CircleCollider(game_object_id_t game_object_id,Vector2 offset, int radius) : Collider(game_object_id,offset), radius(radius) {} diff --git a/src/crepe/api/CircleCollider.h b/src/crepe/api/CircleCollider.h index caa7e43..3a66355 100644 --- a/src/crepe/api/CircleCollider.h +++ b/src/crepe/api/CircleCollider.h @@ -1,13 +1,14 @@ #pragma once + +#include "Vector2.h" #include "../Collider.h" namespace crepe { class CircleCollider : public Collider { public: - CircleCollider(game_object_id_t game_object_id, int radius) - : Collider(game_object_id), radius(radius) {} - int radius; + CircleCollider(game_object_id_t game_object_id,Vector2 offset, int radius); + double radius; }; } // namespace crepe |