reverted to master

5 files changed, 8 insertions, 17 deletions

diff --git a/src/crepe/manager/EventManager.cpp b/src/crepe/manager/EventManager.cpp
index 17fe528..20f0dd3 100644
--- a/src/crepe/manager/EventManager.cpp
+++ b/src/crepe/manager/EventManager.cpp
@@ -1,11 +1,9 @@
 #include "EventManager.h"
-#include "util/Log.h"
 
 using namespace crepe;
 using namespace std;
 
 EventManager & EventManager::get_instance() {
-	dbg_trace();
 	static EventManager instance;
 	return instance;
 }
diff --git a/src/crepe/manager/SceneManager.cpp b/src/crepe/manager/SceneManager.cpp
index a788c51..50a9fbb 100644
--- a/src/crepe/manager/SceneManager.cpp
+++ b/src/crepe/manager/SceneManager.cpp
@@ -4,13 +4,10 @@
 #include "ComponentManager.h"
 #include "SceneManager.h"
 
-#include "util/Log.h"
-
 using namespace crepe;
 using namespace std;
 
 SceneManager::SceneManager(Mediator & mediator) : Manager(mediator) {
-	dbg_trace();
 	mediator.scene_manager = *this;
 }
 
diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp
index df358e6..d6b2ca1 100644
--- a/src/crepe/system/ScriptSystem.cpp
+++ b/src/crepe/system/ScriptSystem.cpp
@@ -8,7 +8,7 @@ using namespace std;
 using namespace crepe;
 
 void ScriptSystem::update() {
-	//dbg_trace();
+	dbg_trace();
 
 	ComponentManager & mgr = this->mediator.component_manager;
 	RefVector<BehaviorScript> behavior_scripts = mgr.get_components_by_type<BehaviorScript>();
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 15937af..7196404 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -15,7 +15,7 @@ target_sources(test_main PUBLIC
 	ValueBrokerTest.cpp
 	DBTest.cpp
 	Vector2Test.cpp
-	#InputTest.cpp
+	InputTest.cpp
 	ScriptEventTest.cpp
 	ScriptSceneTest.cpp
 	Profiling.cpp
diff --git a/src/test/Profiling.cpp b/src/test/Profiling.cpp
index 46da378..c753bca 100644
--- a/src/test/Profiling.cpp
+++ b/src/test/Profiling.cpp
@@ -1,6 +1,4 @@
-#include "facade/SDLContext.h"
 #include "manager/Mediator.h"
-#include "manager/ResourceManager.h"
 #include "system/ParticleSystem.h"
 #include "system/PhysicsSystem.h"
 #include "system/RenderSystem.h"
@@ -43,7 +41,7 @@ class TestScript : public Script {
 	}
 };
 
-class ProfilingTest : public Test {
+class DISABLED_ProfilingTest : public Test {
 public:
 	// Config for test
 	// Minimum amount to let test pass
@@ -63,8 +61,6 @@ public:
 	ParticleSystem particle_sys{m};
 	RenderSystem render_sys{m};
 	ScriptSystem script_sys{m};
-	SDLContext ctx{m};
-	ResourceManager resource_manager{m};
 
 	// Test data
 	std::map<std::string, std::chrono::microseconds> timings;
@@ -134,7 +130,7 @@ public:
 	}
 };
 
-TEST_F(ProfilingTest, Profiling_1) {
+TEST_F(DISABLED_ProfilingTest, Profiling_1) {
 	while (this->total_time / this->average < this->duration) {
 
 		{
@@ -157,7 +153,7 @@ TEST_F(ProfilingTest, Profiling_1) {
 	EXPECT_GE(this->game_object_count, this->min_gameobject_count);
 }
 
-TEST_F(ProfilingTest, Profiling_2) {
+TEST_F(DISABLED_ProfilingTest, Profiling_2) {
 	while (this->total_time / this->average < this->duration) {
 
 		{
@@ -171,7 +167,7 @@ TEST_F(ProfilingTest, Profiling_2) {
 			gameobject.add_component<BoxCollider>(vec2{0, 0}, vec2{1, 1});
 
 			gameobject.add_component<BehaviorScript>().set_script<TestScript>();
-			auto img = Asset("asset/texture/square.png");
+			auto img = Texture("asset/texture/square.png");
 			Sprite & test_sprite = gameobject.add_component<Sprite>(
 				img, Sprite::Data{
 						 .color = {0, 0, 0, 0},
@@ -196,7 +192,7 @@ TEST_F(ProfilingTest, Profiling_2) {
 	EXPECT_GE(this->game_object_count, this->min_gameobject_count);
 }
 
-TEST_F(ProfilingTest, Profiling_3) {
+TEST_F(DISABLED_ProfilingTest, Profiling_3) {
 	while (this->total_time / this->average < this->duration) {
 
 		{
@@ -209,7 +205,7 @@ TEST_F(ProfilingTest, Profiling_3) {
 			});
 			gameobject.add_component<BoxCollider>(vec2{0, 0}, vec2{1, 1});
 			gameobject.add_component<BehaviorScript>().set_script<TestScript>();
-			auto img = Asset("asset/texture/square.png");
+			auto img = Texture("asset/texture/square.png");
 			Sprite & test_sprite = gameobject.add_component<Sprite>(
 				img, Sprite::Data{
 						 .color = {0, 0, 0, 0},