Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/inputSystem

3 files changed, 31 insertions, 21 deletions

diff --git a/src/test/CollisionTest.cpp b/src/test/CollisionTest.cpp
index 5dbc670..2ad65fa 100644
--- a/src/test/CollisionTest.cpp
+++ b/src/test/CollisionTest.cpp
@@ -232,7 +232,7 @@ TEST_F(CollisionTest, collision_box_box_dynamic_x_direction) {
 		collision_happend = true;
 		EXPECT_EQ(ev.info.this_collider.game_object_id, 1);
 		EXPECT_EQ(ev.info.resolution.x, -5);
-		EXPECT_EQ(ev.info.resolution.y, -5);
+		EXPECT_EQ(ev.info.resolution.y, 5);
 		EXPECT_EQ(ev.info.resolution_direction,
 				  crepe::CollisionSystem::Direction::X_DIRECTION);
 	};
@@ -240,7 +240,7 @@ TEST_F(CollisionTest, collision_box_box_dynamic_x_direction) {
 		collision_happend = true;
 		EXPECT_EQ(ev.info.this_collider.game_object_id, 2);
 		EXPECT_EQ(ev.info.resolution.x, 5);
-		EXPECT_EQ(ev.info.resolution.y, 5);
+		EXPECT_EQ(ev.info.resolution.y, -5);
 		EXPECT_EQ(ev.info.resolution_direction,
 				  crepe::CollisionSystem::Direction::X_DIRECTION);
 	};
@@ -260,7 +260,7 @@ TEST_F(CollisionTest, collision_box_box_dynamic_y_direction) {
 	script_object1_ref->test_fn = [&collision_happend](const CollisionEvent & ev) {
 		collision_happend = true;
 		EXPECT_EQ(ev.info.this_collider.game_object_id, 1);
-		EXPECT_EQ(ev.info.resolution.x, -5);
+		EXPECT_EQ(ev.info.resolution.x, 5);
 		EXPECT_EQ(ev.info.resolution.y, -5);
 		EXPECT_EQ(ev.info.resolution_direction,
 				  crepe::CollisionSystem::Direction::Y_DIRECTION);
@@ -268,7 +268,7 @@ TEST_F(CollisionTest, collision_box_box_dynamic_y_direction) {
 	script_object2_ref->test_fn = [&collision_happend](const CollisionEvent & ev) {
 		collision_happend = true;
 		EXPECT_EQ(ev.info.this_collider.game_object_id, 2);
-		EXPECT_EQ(ev.info.resolution.x, 5);
+		EXPECT_EQ(ev.info.resolution.x, -5);
 		EXPECT_EQ(ev.info.resolution.y, 5);
 		EXPECT_EQ(ev.info.resolution_direction,
 				  crepe::CollisionSystem::Direction::Y_DIRECTION);
@@ -312,7 +312,7 @@ TEST_F(CollisionTest, collision_box_box_static_x_direction) {
 		collision_happend = true;
 		EXPECT_EQ(ev.info.this_collider.game_object_id, 1);
 		EXPECT_EQ(ev.info.resolution.x, -5);
-		EXPECT_EQ(ev.info.resolution.y, -5);
+		EXPECT_EQ(ev.info.resolution.y, 5);
 		EXPECT_EQ(ev.info.resolution_direction,
 				  crepe::CollisionSystem::Direction::X_DIRECTION);
 	};
@@ -336,7 +336,7 @@ TEST_F(CollisionTest, collision_box_box_static_y_direction) {
 	script_object1_ref->test_fn = [&collision_happend](const CollisionEvent & ev) {
 		collision_happend = true;
 		EXPECT_EQ(ev.info.this_collider.game_object_id, 1);
-		EXPECT_EQ(ev.info.resolution.x, -5);
+		EXPECT_EQ(ev.info.resolution.x, 5);
 		EXPECT_EQ(ev.info.resolution.y, -5);
 		EXPECT_EQ(ev.info.resolution_direction,
 				  crepe::CollisionSystem::Direction::Y_DIRECTION);
diff --git a/src/test/LoopTimerTest.cpp b/src/test/LoopTimerTest.cpp
index d76bf45..7bd6305 100644
--- a/src/test/LoopTimerTest.cpp
+++ b/src/test/LoopTimerTest.cpp
@@ -30,7 +30,7 @@ TEST_F(LoopTimerTest, EnforcesTargetFrameRate) {
 	auto elapsed_ms = duration_cast<milliseconds>(elapsed_time).count();
 
 	// For 60 FPS, the target frame time is around 16.67ms
-	ASSERT_NEAR(elapsed_ms, 16.7, 1);
+	ASSERT_NEAR(elapsed_ms, 16.7, 5);
 }
 
 TEST_F(LoopTimerTest, SetTargetFps) {
@@ -79,3 +79,19 @@ TEST_F(LoopTimerTest, DISABLED_getCurrentTime) {
 
 	ASSERT_NEAR(loop_timer.get_elapsed_time().count(), elapsed_time, 5);
 }
+TEST_F(LoopTimerTest, getFPS) {
+	// Set the target FPS to 60 (which gives a target time per frame of ~16.67 ms)
+	loop_timer.set_target_framerate(60);
+
+	auto start_time = steady_clock::now();
+	loop_timer.enforce_frame_rate();
+
+	auto elapsed_time = steady_clock::now() - start_time;
+	loop_timer.update();
+	unsigned int fps = loop_timer.get_fps();
+	auto elapsed_ms = duration_cast<milliseconds>(elapsed_time).count();
+
+	// For 60 FPS, the target frame time is around 16.67ms
+	ASSERT_NEAR(elapsed_ms, 16.7, 1);
+	ASSERT_NEAR(fps, 60, 2);
+}
diff --git a/src/test/SceneManagerTest.cpp b/src/test/SceneManagerTest.cpp
index 9bb260c..480e07a 100644
--- a/src/test/SceneManagerTest.cpp
+++ b/src/test/SceneManagerTest.cpp
@@ -15,11 +15,9 @@ using namespace crepe;
 class ConcreteScene1 : public Scene {
 public:
 	void load_scene() {
-		Mediator & mediator = this->mediator;
-		ComponentManager & mgr = mediator.component_manager;
-		GameObject object1 = mgr.new_object("scene_1", "tag_scene_1", vec2{0, 0}, 0, 1);
-		GameObject object2 = mgr.new_object("scene_1", "tag_scene_1", vec2{1, 0}, 0, 1);
-		GameObject object3 = mgr.new_object("scene_1", "tag_scene_1", vec2{2, 0}, 0, 1);
+		GameObject object1 = new_object("scene_1", "tag_scene_1", vec2{0, 0}, 0, 1);
+		GameObject object2 = new_object("scene_1", "tag_scene_1", vec2{1, 0}, 0, 1);
+		GameObject object3 = new_object("scene_1", "tag_scene_1", vec2{2, 0}, 0, 1);
 	}
 
 	string get_name() const { return "scene1"; }
@@ -28,12 +26,10 @@ public:
 class ConcreteScene2 : public Scene {
 public:
 	void load_scene() {
-		Mediator & mediator = this->mediator;
-		ComponentManager & mgr = mediator.component_manager;
-		GameObject object1 = mgr.new_object("scene_2", "tag_scene_2", vec2{0, 0}, 0, 1);
-		GameObject object2 = mgr.new_object("scene_2", "tag_scene_2", vec2{0, 1}, 0, 1);
-		GameObject object3 = mgr.new_object("scene_2", "tag_scene_2", vec2{0, 2}, 0, 1);
-		GameObject object4 = mgr.new_object("scene_2", "tag_scene_2", vec2{0, 3}, 0, 1);
+		GameObject object1 = new_object("scene_2", "tag_scene_2", vec2{0, 0}, 0, 1);
+		GameObject object2 = new_object("scene_2", "tag_scene_2", vec2{0, 1}, 0, 1);
+		GameObject object3 = new_object("scene_2", "tag_scene_2", vec2{0, 2}, 0, 1);
+		GameObject object4 = new_object("scene_2", "tag_scene_2", vec2{0, 3}, 0, 1);
 	}
 
 	string get_name() const { return "scene2"; }
@@ -44,9 +40,7 @@ public:
 	ConcreteScene3(const string & name) : name(name) {}
 
 	void load_scene() {
-		Mediator & mediator = this->mediator;
-		ComponentManager & mgr = mediator.component_manager;
-		GameObject object1 = mgr.new_object("scene_3", "tag_scene_3", vec2{0, 0}, 0, 1);
+		GameObject object1 = new_object("scene_3", "tag_scene_3", vec2{0, 0}, 0, 1);
 	}
 
 	string get_name() const { return name; }