3 files changed, 89 insertions, 0 deletions
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index acab388..773f685 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -1,7 +1,12 @@
 target_sources(test_main PUBLIC
 	dummy.cpp
 	# audio.cpp
+<<<<<<< HEAD
+	PhysicsTest.cpp
+	CollisionTest.cpp
+=======
 	# PhysicsTest.cpp
 	ParticleTest.cpp
+>>>>>>> be1e97bc7a494963ab1567492fafcda99e36f683
 )
 
diff --git a/src/test/CollisionTest.cpp b/src/test/CollisionTest.cpp
new file mode 100644
index 0000000..3e43479
--- /dev/null
+++ b/src/test/CollisionTest.cpp
@@ -0,0 +1,83 @@
+#include "api/BoxCollider.h"
+#include "api/CircleCollider.h"
+#include "api/Vector2.h"
+#include <crepe/ComponentManager.h>
+#include <crepe/api/Config.h>
+#include <crepe/api/GameObject.h>
+#include <crepe/api/Rigidbody.h>
+#include <crepe/api/Transform.h>
+#include <crepe/system/CollisionSystem.h>
+#include <gtest/gtest.h>
+
+using namespace std;
+using namespace std::chrono_literals;
+using namespace crepe;
+
+class CollisionTest : public ::testing::Test {
+protected:
+	GameObject * game_object1;
+	GameObject * game_object2;
+	CollisionSystem collision_system;
+	void SetUp() override {
+		ComponentManager & mgr = ComponentManager::get_instance();
+		mgr.delete_all_components();
+		std::vector<std::reference_wrapper<Transform>> transforms
+			= mgr.get_components_by_id<Transform>(0);
+
+		// ob 1
+		game_object1 = new GameObject(0, "", "", Vector2{0, 0}, 0, 0);
+		game_object1->add_component<Rigidbody>(Rigidbody::Data{
+			.mass = 1,
+			.gravity_scale = 1,
+			.body_type = Rigidbody::BodyType::DYNAMIC,
+			.max_linear_velocity = Vector2{10, 10},
+			.max_angular_velocity = 10,
+			.constraints = {0, 0, 0},
+			.use_gravity = false,
+			.bounce = false,
+		});
+		
+		game_object1->add_component<BoxCollider>(Vector2{0,0},10,10);
+		
+
+		//ob 2
+		game_object2 = new GameObject(1, "", "", Vector2{50, 50}, 0, 0);
+		game_object2->add_component<Rigidbody>(Rigidbody::Data{
+			.mass = 1,
+			.gravity_scale = 1,
+			.body_type = Rigidbody::BodyType::DYNAMIC,
+			.max_linear_velocity = Vector2{10, 10},
+			.max_angular_velocity = 10,
+			.constraints = {0, 0, 0},
+			.use_gravity = false,
+			.bounce = false,
+		});
+		game_object2->add_component<CircleCollider>(Vector2{0,0},5);
+	}
+};
+
+TEST_F(CollisionTest, box_box_collision) {
+	Config::get_instance().physics.gravity = 1;
+	ComponentManager & mgr = ComponentManager::get_instance();
+	std::vector<std::reference_wrapper<Transform>> transforms
+		= mgr.get_components_by_id<Transform>(0);
+	Transform & transform = transforms.front().get();
+	ASSERT_FALSE(transforms.empty());
+	transform.position = {39,50};
+	collision_system.update();
+	transform.position = {40,50};
+	collision_system.update();
+	transform.position = {50,39};
+	collision_system.update();
+	transform.position = {50,40};
+	collision_system.update();
+	transform.position = {50,60};
+	collision_system.update();
+	transform.position = {50,61};
+	collision_system.update();
+	transform.position = {60,50};
+	collision_system.update();
+	transform.position = {61,50};
+	collision_system.update();
+}
+
diff --git a/src/test/PhysicsTest.cpp b/src/test/PhysicsTest.cpp
index 5385962..3332f74 100644
--- a/src/test/PhysicsTest.cpp
+++ b/src/test/PhysicsTest.cpp
@@ -16,6 +16,7 @@ protected:
 	PhysicsSystem physics_system;
 	void SetUp() override {
 		ComponentManager & mgr = ComponentManager::get_instance();
+		mgr.delete_all_components();
 		std::vector<std::reference_wrapper<Transform>> transforms
 			= mgr.get_components_by_id<Transform>(0);
 		if (transforms.empty()) {