Fixed compiling
Some checks failed
Build Dusk / run-tests (push) Failing after 15s

This commit is contained in:
2026-03-10 21:11:12 -05:00
parent 58c239f4b4
commit 4517b63557
5 changed files with 31 additions and 23 deletions

View File

@@ -6,6 +6,6 @@
add_subdirectory(assert)
add_subdirectory(display)
# add_subdirectory(rpg)
add_subdirectory(item)
# add_subdirectory(item)
add_subdirectory(time)
add_subdirectory(util)

View File

@@ -32,10 +32,10 @@ static void test_timeInit(void **state) {
timeInit();
// Inital struct is set.
assert_float_equal(TIME.time, TIME_STEP, 0.0001f);
assert_float_equal(TIME.delta, TIME_STEP, 0.0001f);
assert_float_equal(TIME.dynamicTime, TIME_STEP, 0.0001f);
assert_float_equal(TIME.dynamicDelta, TIME_STEP, 0.0001f);
assert_float_equal(TIME.time, DUSK_TIME_STEP, 0.0001f);
assert_float_equal(TIME.delta, DUSK_TIME_STEP, 0.0001f);
assert_float_equal(TIME.dynamicTime, DUSK_TIME_STEP, 0.0001f);
assert_float_equal(TIME.dynamicDelta, DUSK_TIME_STEP, 0.0001f);
assert_false(TIME.dynamicUpdate);
}
@@ -52,9 +52,11 @@ static void test_timeUpdate(void **state) {
assert_true(SDL_GETTICKS_CALLED);
assert_true(TIME.dynamicUpdate);
assert_float_equal(TIME.dynamicDelta, 0.014f, 0.0001f);
assert_float_equal(TIME.dynamicTime, TIME_STEP + TIME.dynamicDelta, 0.0001f);
assert_float_equal(TIME.delta, TIME_STEP, 0.0001f); // Not changed
assert_float_equal(TIME.time, TIME_STEP, 0.0001f); // Not changed
assert_float_equal(
TIME.dynamicTime, DUSK_TIME_STEP + TIME.dynamicDelta, 0.0001f
);
assert_float_equal(TIME.delta, DUSK_TIME_STEP, 0.0001f); // Not changed
assert_float_equal(TIME.time, DUSK_TIME_STEP, 0.0001f); // Not changed
// Simulate total 16ms elapsed (2ms more)
SDL_GETTICKS_TICKS = 16;
@@ -63,9 +65,9 @@ static void test_timeUpdate(void **state) {
assert_true(SDL_GETTICKS_CALLED);
assert_false(TIME.dynamicUpdate);
assert_float_equal(TIME.dynamicDelta, 0.002f, 0.0001f);
assert_float_equal(TIME.dynamicTime, TIME_STEP * 2, 0.0001f);
assert_float_equal(TIME.delta, TIME_STEP, 0.0001f);
assert_float_equal(TIME.time, TIME_STEP * 2, 0.0001f); // Stepped once
assert_float_equal(TIME.dynamicTime, DUSK_TIME_STEP * 2, 0.0001f);
assert_float_equal(TIME.delta, DUSK_TIME_STEP, 0.0001f);
assert_float_equal(TIME.time, DUSK_TIME_STEP * 2, 0.0001f); // Stepped once
// Second test, half step (16 + 8)
SDL_GETTICKS_TICKS = 24;
@@ -74,9 +76,9 @@ static void test_timeUpdate(void **state) {
assert_true(SDL_GETTICKS_CALLED);
assert_true(TIME.dynamicUpdate);
assert_float_equal(TIME.dynamicDelta, 0.008f, 0.0001f);
assert_float_equal(TIME.dynamicTime, TIME_STEP + 0.024f, 0.0001f);
assert_float_equal(TIME.delta, TIME_STEP, 0.0001f);
assert_float_equal(TIME.time, TIME_STEP * 2, 0.0001f);// Unchanged.
assert_float_equal(TIME.dynamicTime, DUSK_TIME_STEP + 0.024f, 0.0001f);
assert_float_equal(TIME.delta, DUSK_TIME_STEP, 0.0001f);
assert_float_equal(TIME.time, DUSK_TIME_STEP * 2, 0.0001f);// Unchanged.
// Third test, another half step, leading to non dynamic update
SDL_GETTICKS_TICKS = 32;
@@ -85,9 +87,9 @@ static void test_timeUpdate(void **state) {
assert_true(SDL_GETTICKS_CALLED);
assert_false(TIME.dynamicUpdate);
assert_float_equal(TIME.dynamicDelta, 0.008f, 0.0001f);
assert_float_equal(TIME.dynamicTime, TIME_STEP + 0.032f, 0.0001f);
assert_float_equal(TIME.delta, TIME_STEP, 0.0001f);
assert_float_equal(TIME.time, TIME_STEP * 3, 0.0001f);
assert_float_equal(TIME.dynamicTime, DUSK_TIME_STEP + 0.032f, 0.0001f);
assert_float_equal(TIME.delta, DUSK_TIME_STEP, 0.0001f);
assert_float_equal(TIME.time, DUSK_TIME_STEP * 3, 0.0001f);
// Fourth test, large jump, should only step once
SDL_GETTICKS_TICKS = 100; // Simulate 100ms elapsed
@@ -96,9 +98,9 @@ static void test_timeUpdate(void **state) {
assert_true(SDL_GETTICKS_CALLED);
assert_false(TIME.dynamicUpdate);
assert_float_equal(TIME.dynamicDelta, 0.068f, 0.0001f);
assert_float_equal(TIME.dynamicTime, TIME_STEP + 0.100f, 0.0001f);
assert_float_equal(TIME.delta, TIME_STEP, 0.0001f);
assert_float_equal(TIME.time, TIME_STEP * 4, 0.0001f);
assert_float_equal(TIME.dynamicTime, DUSK_TIME_STEP + 0.100f, 0.0001f);
assert_float_equal(TIME.delta, DUSK_TIME_STEP, 0.0001f);
assert_float_equal(TIME.time, DUSK_TIME_STEP * 4, 0.0001f);
// Fifth test, despite a small time passing the game should not start
// trying to run ahead
@@ -108,9 +110,9 @@ static void test_timeUpdate(void **state) {
assert_true(SDL_GETTICKS_CALLED);
assert_true(TIME.dynamicUpdate);
assert_float_equal(TIME.dynamicDelta, 0.004f, 0.0001f);
assert_float_equal(TIME.dynamicTime, TIME_STEP + 0.104f, 0.0001f);
assert_float_equal(TIME.delta, TIME_STEP, 0.0001f);
assert_float_equal(TIME.time, TIME_STEP * 4, 0.0001f);
assert_float_equal(TIME.dynamicTime, DUSK_TIME_STEP + 0.104f, 0.0001f);
assert_float_equal(TIME.delta, DUSK_TIME_STEP, 0.0001f);
assert_float_equal(TIME.time, DUSK_TIME_STEP * 4, 0.0001f);
// Time can stand still if needed
SDL_GETTICKS_CALLED = false;