aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/crepe/api/BoxCollider.cpp3
-rw-r--r--src/crepe/api/BoxCollider.h3
-rw-r--r--src/crepe/api/CircleCollider.cpp3
-rw-r--r--src/crepe/api/CircleCollider.h3
-rw-r--r--src/example/game.cpp18
-rw-r--r--src/test/CollisionTest.cpp12
6 files changed, 27 insertions, 15 deletions
diff --git a/src/crepe/api/BoxCollider.cpp b/src/crepe/api/BoxCollider.cpp
index 302bdd2..a893d41 100644
--- a/src/crepe/api/BoxCollider.cpp
+++ b/src/crepe/api/BoxCollider.cpp
@@ -4,6 +4,7 @@
using namespace crepe;
-BoxCollider::BoxCollider(game_object_id_t game_object_id,const vec2 & dimensions,const vec2 & offset)
+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 a507e0c..d643e7f 100644
--- a/src/crepe/api/BoxCollider.h
+++ b/src/crepe/api/BoxCollider.h
@@ -13,7 +13,8 @@ namespace crepe {
*/
class BoxCollider : public Collider {
public:
- BoxCollider(game_object_id_t game_object_id, const vec2 & dimensions,const vec2 & offset= {0,0});
+ 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 e542275..90ab5e7 100644
--- a/src/crepe/api/CircleCollider.cpp
+++ b/src/crepe/api/CircleCollider.cpp
@@ -2,6 +2,7 @@
using namespace crepe;
-CircleCollider::CircleCollider(game_object_id_t game_object_id, float radius, const vec2 & offset)
+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 ea40068..22da836 100644
--- a/src/crepe/api/CircleCollider.h
+++ b/src/crepe/api/CircleCollider.h
@@ -13,7 +13,8 @@ namespace crepe {
*/
class CircleCollider : public Collider {
public:
- CircleCollider(game_object_id_t game_object_id, float radius, const vec2 & offset= {0,0});
+ 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/example/game.cpp b/src/example/game.cpp
index d03d78d..61f8760 100644
--- a/src/example/game.cpp
+++ b/src/example/game.cpp
@@ -36,7 +36,7 @@ class MyScript1 : public Script {
case Keycode::W: {
Rigidbody & tf = this->get_component<Rigidbody>();
// tf.data.linear_velocity.y -= 1;
- tf.add_force_linear({0,-1});
+ tf.add_force_linear({0, -1});
break;
}
case Keycode::S: {
@@ -178,10 +178,18 @@ public:
.body_type = Rigidbody::BodyType::STATIC,
.offset = {0, 0},
});
- world.add_component<BoxCollider>(vec2{world_collider, world_collider},vec2{0, 0 - (screen_size_height / 2 + world_collider / 2)}); // Top
- world.add_component<BoxCollider>(vec2{world_collider, world_collider},vec2{0, screen_size_height / 2 + world_collider / 2}); // Bottom
- world.add_component<BoxCollider>(vec2{world_collider, world_collider},vec2{0 - (screen_size_width / 2 + world_collider / 2), 0}); // Left
- world.add_component<BoxCollider>(vec2{world_collider, world_collider},vec2{screen_size_width / 2 + world_collider / 2, 0}); // right
+ world.add_component<BoxCollider>(
+ vec2{world_collider, world_collider},
+ vec2{0, 0 - (screen_size_height / 2 + world_collider / 2)}); // Top
+ world.add_component<BoxCollider>(
+ vec2{world_collider, world_collider},
+ vec2{0, screen_size_height / 2 + world_collider / 2}); // Bottom
+ world.add_component<BoxCollider>(
+ vec2{world_collider, world_collider},
+ vec2{0 - (screen_size_width / 2 + world_collider / 2), 0}); // Left
+ world.add_component<BoxCollider>(
+ vec2{world_collider, world_collider},
+ vec2{screen_size_width / 2 + world_collider / 2, 0}); // right
world.add_component<Camera>(
ivec2{static_cast<int>(screen_size_width), static_cast<int>(screen_size_height)},
vec2{screen_size_width, screen_size_height},
diff --git a/src/test/CollisionTest.cpp b/src/test/CollisionTest.cpp
index b34bede..ff9e7cc 100644
--- a/src/test/CollisionTest.cpp
+++ b/src/test/CollisionTest.cpp
@@ -69,10 +69,10 @@ public:
.offset = {0, 0},
});
// Create a box with an inner size of 10x10 units
- world.add_component<BoxCollider>(vec2{100, 100},vec2{0, -100}); // Top
- world.add_component<BoxCollider>(vec2{100, 100},vec2{0, 100}); // Bottom
- world.add_component<BoxCollider>(vec2{100, 100},vec2{-100, 0}); // Left
- world.add_component<BoxCollider>(vec2{100, 100},vec2{100, 0}); // right
+ world.add_component<BoxCollider>(vec2{100, 100}, vec2{0, -100}); // Top
+ world.add_component<BoxCollider>(vec2{100, 100}, vec2{0, 100}); // Bottom
+ world.add_component<BoxCollider>(vec2{100, 100}, vec2{-100, 0}); // Left
+ world.add_component<BoxCollider>(vec2{100, 100}, vec2{100, 0}); // right
game_object1.add_component<Rigidbody>(Rigidbody::Data{
.mass = 1,
@@ -84,7 +84,7 @@ public:
.offset = {0, 0},
.collision_layers = {0},
});
- game_object1.add_component<BoxCollider>(vec2{10, 10},vec2{0, 0});
+ game_object1.add_component<BoxCollider>(vec2{10, 10}, vec2{0, 0});
BehaviorScript & script_object1
= game_object1.add_component<BehaviorScript>().set_script<CollisionHandler>(1);
script_object1_ref = static_cast<CollisionHandler *>(script_object1.script.get());
@@ -100,7 +100,7 @@ public:
.offset = {0, 0},
.collision_layers = {0},
});
- game_object2.add_component<BoxCollider>(vec2{10, 10},vec2{0, 0});
+ game_object2.add_component<BoxCollider>(vec2{10, 10}, vec2{0, 0});
BehaviorScript & script_object2
= game_object2.add_component<BehaviorScript>().set_script<CollisionHandler>(2);
script_object2_ref = static_cast<CollisionHandler *>(script_object2.script.get());