aboutsummaryrefslogtreecommitdiff
path: root/src/crepe
diff options
context:
space:
mode:
authorJAROWMR <jarorutjes07@gmail.com>2024-12-14 13:24:14 +0100
committerJAROWMR <jarorutjes07@gmail.com>2024-12-14 13:24:14 +0100
commit1a5116b944bcbdeeb3474faefbe150e82f8697b1 (patch)
tree2e81437bfe5b2ac88f103a6aa4e847a550121e2c /src/crepe
parent876896e50711509e80ef551b4e8ad440e8039b97 (diff)
updated api and game
Diffstat (limited to 'src/crepe')
-rw-r--r--src/crepe/api/BoxCollider.cpp3
-rw-r--r--src/crepe/api/BoxCollider.h2
-rw-r--r--src/crepe/api/CircleCollider.cpp3
-rw-r--r--src/crepe/api/CircleCollider.h2
-rw-r--r--src/crepe/api/Rigidbody.h2
5 files changed, 5 insertions, 7 deletions
diff --git a/src/crepe/api/BoxCollider.cpp b/src/crepe/api/BoxCollider.cpp
index c097a24..302bdd2 100644
--- a/src/crepe/api/BoxCollider.cpp
+++ b/src/crepe/api/BoxCollider.cpp
@@ -4,7 +4,6 @@
using namespace crepe;
-BoxCollider::BoxCollider(game_object_id_t game_object_id, const vec2 & offset,
- const vec2 & dimensions)
+BoxCollider::BoxCollider(game_object_id_t game_object_id,const vec2 & dimensions,const vec2 & offset)
: Collider(game_object_id, offset),
dimensions(dimensions) {}
diff --git a/src/crepe/api/BoxCollider.h b/src/crepe/api/BoxCollider.h
index 1ac4d46..a507e0c 100644
--- a/src/crepe/api/BoxCollider.h
+++ b/src/crepe/api/BoxCollider.h
@@ -13,7 +13,7 @@ namespace crepe {
*/
class BoxCollider : public Collider {
public:
- BoxCollider(game_object_id_t game_object_id, const vec2 & offset, const vec2 & dimensions);
+ BoxCollider(game_object_id_t game_object_id, const vec2 & dimensions,const vec2 & offset= {0,0});
//! Width and height of the box collider
vec2 dimensions;
diff --git a/src/crepe/api/CircleCollider.cpp b/src/crepe/api/CircleCollider.cpp
index a4271e9..e542275 100644
--- a/src/crepe/api/CircleCollider.cpp
+++ b/src/crepe/api/CircleCollider.cpp
@@ -2,7 +2,6 @@
using namespace crepe;
-CircleCollider::CircleCollider(game_object_id_t game_object_id, const vec2 & offset,
- float radius)
+CircleCollider::CircleCollider(game_object_id_t game_object_id, float radius, const vec2 & offset)
: Collider(game_object_id, offset),
radius(radius) {}
diff --git a/src/crepe/api/CircleCollider.h b/src/crepe/api/CircleCollider.h
index c7bf66e..ea40068 100644
--- a/src/crepe/api/CircleCollider.h
+++ b/src/crepe/api/CircleCollider.h
@@ -13,7 +13,7 @@ namespace crepe {
*/
class CircleCollider : public Collider {
public:
- CircleCollider(game_object_id_t game_object_id, const vec2 & offset, float radius);
+ CircleCollider(game_object_id_t game_object_id, float radius, const vec2 & offset= {0,0});
//! Radius of the circle collider.
float radius;
diff --git a/src/crepe/api/Rigidbody.h b/src/crepe/api/Rigidbody.h
index b08c8db..6900295 100644
--- a/src/crepe/api/Rigidbody.h
+++ b/src/crepe/api/Rigidbody.h
@@ -139,7 +139,7 @@ public:
* Each element represents a layer ID, and the GameObject will only detect
* collisions with other GameObjects that belong to these layers.
*/
- std::set<int> collision_layers;
+ std::set<int> collision_layers = {0};
};
public: