From dc7a1c3d669b901adb9c520b4a76a868a3cc94e9 Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Sun, 8 Dec 2024 12:54:35 +0100 Subject: fixed inputtest test because of adjusting inputtest values. however inputtest passes while sdlcontext returns pixel coordinates????? --- src/crepe/facade/SDLContext.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/crepe/facade') diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp index 4cc2206..e010ac3 100644 --- a/src/crepe/facade/SDLContext.cpp +++ b/src/crepe/facade/SDLContext.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -324,6 +325,8 @@ 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); @@ -374,6 +377,7 @@ ivec2 SDLContext::get_size(const Texture & ctx) { void SDLContext::delay(int ms) const { SDL_Delay(ms); } + std::vector SDLContext::get_events() { std::vector event_list; SDL_Event event; -- cgit v1.2.3 From d3753404cdf58e529865782e7e3679aadb5bc18f Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Mon, 9 Dec 2024 09:07:58 +0100 Subject: revert #66 except for `src/test/InputTest.cpp` --- src/crepe/facade/SDLContext.cpp | 4 ---- src/test/CMakeLists.txt | 2 +- src/test/Profiling.cpp | 16 +++++++++------- 3 files changed, 10 insertions(+), 12 deletions(-) (limited to 'src/crepe/facade') 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 #include #include -#include #include #include @@ -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::get_events() { std::vector 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 #include #include @@ -17,10 +21,6 @@ #include #include #include -#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; } -- cgit v1.2.3 From f70d74dbe65c4700477629f50bf916eba0e32151 Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Mon, 9 Dec 2024 12:05:11 +0100 Subject: hotfix draw call --- src/crepe/api/LoopManager.cpp | 1 - src/crepe/facade/SDLContext.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'src/crepe/facade') diff --git a/src/crepe/api/LoopManager.cpp b/src/crepe/api/LoopManager.cpp index 044f096..88243c4 100644 --- a/src/crepe/api/LoopManager.cpp +++ b/src/crepe/api/LoopManager.cpp @@ -65,7 +65,6 @@ void LoopManager::setup() { this->scene_manager.load_next_scene(); timer.start(); timer.set_fps(200); - this->scene_manager.load_next_scene(); } void LoopManager::render() { diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp index 4cc2206..6becf60 100644 --- a/src/crepe/facade/SDLContext.cpp +++ b/src/crepe/facade/SDLContext.cpp @@ -234,7 +234,7 @@ SDL_FRect SDLContext::get_dst_rect(const DestinationRectangleData & ctx) const { const Sprite::Data & data = ctx.sprite.data; - vec2 size; + vec2 size = data.size; if (data.size.x == 0 && data.size.y != 0) { size.x = data.size.y * ctx.sprite.aspect_ratio; } -- cgit v1.2.3