aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoek Le Blansch <loek@pipeframe.xyz>2024-12-09 09:07:58 +0100
committerLoek Le Blansch <loek@pipeframe.xyz>2024-12-09 09:07:58 +0100
commitd3753404cdf58e529865782e7e3679aadb5bc18f (patch)
tree589e2b105e89faca4c1bd6972674f33e23c84d13
parentdc7a1c3d669b901adb9c520b4a76a868a3cc94e9 (diff)
revert #66 except for `src/test/InputTest.cpp`
-rw-r--r--src/crepe/facade/SDLContext.cpp4
-rw-r--r--src/test/CMakeLists.txt2
-rw-r--r--src/test/Profiling.cpp16
3 files changed, 10 insertions, 12 deletions
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index e010ac3..4cc2206 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -11,7 +11,6 @@
#include <cstddef>
#include <cstdint>
#include <functional>
-#include <iostream>
#include <memory>
#include <stdexcept>
@@ -325,8 +324,6 @@ SDLContext::CameraValues SDLContext::set_camera(const Camera & cam) {
render_scale.x = render_scale.y = scale;
}
- //cout << render_scale.x << " " << bar_size.x << " " << bar_size.y << endl;
-
SDL_SetRenderDrawColor(this->game_renderer.get(), cam_data.bg_color.r, cam_data.bg_color.g,
cam_data.bg_color.b, cam_data.bg_color.a);
@@ -377,7 +374,6 @@ ivec2 SDLContext::get_size(const Texture & ctx) {
void SDLContext::delay(int ms) const { SDL_Delay(ms); }
-
std::vector<SDLContext::EventData> SDLContext::get_events() {
std::vector<SDLContext::EventData> event_list;
SDL_Event event;
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index eae59f2..c9cbac5 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -13,8 +13,8 @@ target_sources(test_main PUBLIC
ValueBrokerTest.cpp
DBTest.cpp
Vector2Test.cpp
- Profiling.cpp
InputTest.cpp
ScriptEventTest.cpp
ScriptSceneTest.cpp
+ Profiling.cpp
)
diff --git a/src/test/Profiling.cpp b/src/test/Profiling.cpp
index d40ee1d..c753bca 100644
--- a/src/test/Profiling.cpp
+++ b/src/test/Profiling.cpp
@@ -1,3 +1,7 @@
+#include "manager/Mediator.h"
+#include "system/ParticleSystem.h"
+#include "system/PhysicsSystem.h"
+#include "system/RenderSystem.h"
#include <chrono>
#include <cmath>
#include <gtest/gtest.h>
@@ -17,10 +21,6 @@
#include <crepe/system/ScriptSystem.h>
#include <crepe/types.h>
#include <crepe/util/Log.h>
-#include "manager/Mediator.h"
-#include "system/ParticleSystem.h"
-#include "system/PhysicsSystem.h"
-#include "system/RenderSystem.h"
using namespace std;
using namespace std::chrono_literals;
@@ -47,7 +47,7 @@ public:
// Minimum amount to let test pass
const int min_gameobject_count = 100;
// Maximum amount to stop test
- const int max_gameobject_count = 1000;
+ const int max_gameobject_count = 150;
// Amount of times a test runs to calculate average
const int average = 5;
// Maximum duration to stop test
@@ -98,8 +98,10 @@ public:
std::chrono::microseconds run_all_systems() {
std::chrono::microseconds total_microseconds = 0us;
total_microseconds += time_function("PhysicsSystem", [&]() { physics_sys.update(); });
- //total_microseconds += time_function("CollisionSystem", [&]() { collision_sys.update(); });
- total_microseconds += time_function("ParticleSystem", [&]() { particle_sys.update(); });
+ total_microseconds
+ += time_function("CollisionSystem", [&]() { collision_sys.update(); });
+ total_microseconds
+ += time_function("ParticleSystem", [&]() { particle_sys.update(); });
total_microseconds += time_function("RenderSystem", [&]() { render_sys.update(); });
return total_microseconds;
}