Skip to content

Commit

Permalink
merge: fix broadcast reversed west and east directions
Browse files Browse the repository at this point in the history 
fix(server): broadcast reversed west and east directions
  • Loading branch information
@sdragos1
sdragos1 authored Jun 24, 2024
2 parents d5b1f87 + 1073343 commit 3441815
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions server/src/types/direction/quadrant.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

static const direction_quadrant_t direction_quadrants[] = {
{.direction = DIR_NORTH, .quadrants = {7, 8, 1, 2, 3, 4, 5, 6}},
{.direction = DIR_EAST, .quadrants = {5, 6, 7, 8, 1, 2, 3, 4}},
{.direction = DIR_EAST, .quadrants = {1, 2, 3, 4, 5, 6, 7, 8}},
{.direction = DIR_SOUTH, .quadrants = {3, 4, 5, 6, 7, 8, 1, 2}},
{.direction = DIR_WEST, .quadrants = {1, 2, 3, 4, 5, 6, 7, 8}},
{.direction = DIR_WEST, .quadrants = {5, 6, 7, 8, 1, 2, 3, 4}},
};

int direction_get_quadrant(direction_t direction, int quadrant)
Expand Down
32 changes: 16 additions & 16 deletions server/tests/unit/types/trantor/map_tests.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,14 +148,14 @@ Test(map_broadcast_angle_tests, subject_example)
vector2u_t src_pos = {2, 9};
double final_angle = (map_get_sound_angle(world->map, src_pos, dest_pos));
int quadrant = angle_to_quadrant(final_angle);
int normalized_quadrant = direction_get_quadrant(DIR_WEST, quadrant);
int normalized_quadrant = direction_get_quadrant(DIR_EAST, quadrant);

cr_assert_eq(normalized_quadrant, 4);
normalized_quadrant = direction_get_quadrant(DIR_SOUTH, quadrant);
cr_assert_eq(normalized_quadrant, 6);
normalized_quadrant = direction_get_quadrant(DIR_NORTH, quadrant);
cr_assert_eq(normalized_quadrant, 2);
normalized_quadrant = direction_get_quadrant(DIR_EAST, quadrant);
normalized_quadrant = direction_get_quadrant(DIR_WEST, quadrant);
cr_assert_eq(normalized_quadrant, 8);
free(world);
}
Expand All @@ -168,14 +168,14 @@ Test(map_broadcast_angle_tests, reversed_x_subject_example)
vector2u_t src_pos = {5, 9};
double final_angle = (map_get_sound_angle(world->map, src_pos, dest_pos));
int quadrant = angle_to_quadrant(final_angle);
int normalized_quadrant = direction_get_quadrant(DIR_WEST, quadrant);
int normalized_quadrant = direction_get_quadrant(DIR_EAST, quadrant);

cr_assert_eq(normalized_quadrant, 2);
normalized_quadrant = direction_get_quadrant(DIR_SOUTH, quadrant);
cr_assert_eq(normalized_quadrant, 4);
normalized_quadrant = direction_get_quadrant(DIR_NORTH, quadrant);
cr_assert_eq(normalized_quadrant, 8);
normalized_quadrant = direction_get_quadrant(DIR_EAST, quadrant);
normalized_quadrant = direction_get_quadrant(DIR_WEST, quadrant);
cr_assert_eq(normalized_quadrant, 6);
free(world);
}
Expand All @@ -188,14 +188,14 @@ Test(map_broadcast_angle_tests, reversed_y_subject_example)
vector2u_t src_pos = {2, 2};
double final_angle = (map_get_sound_angle(world->map, src_pos, dest_pos));
int quadrant = angle_to_quadrant(final_angle);
int normalized_quadrant = direction_get_quadrant(DIR_WEST, quadrant);
int normalized_quadrant = direction_get_quadrant(DIR_EAST, quadrant);

cr_assert_eq(normalized_quadrant, 6);
normalized_quadrant = direction_get_quadrant(DIR_SOUTH, quadrant);
cr_assert_eq(normalized_quadrant, 8);
normalized_quadrant = direction_get_quadrant(DIR_NORTH, quadrant);
cr_assert_eq(normalized_quadrant, 4);
normalized_quadrant = direction_get_quadrant(DIR_EAST, quadrant);
normalized_quadrant = direction_get_quadrant(DIR_WEST, quadrant);
cr_assert_eq(normalized_quadrant, 2);
free(world);
}
Expand All @@ -208,14 +208,14 @@ Test(map_broadcast_angle_tests, reversed_y_x_subject_example)
vector2u_t src_pos = {5, 2};
double final_angle = (map_get_sound_angle(world->map, src_pos, dest_pos));
int quadrant = angle_to_quadrant(final_angle);
int normalized_quadrant = direction_get_quadrant(DIR_WEST, quadrant);
int normalized_quadrant = direction_get_quadrant(DIR_EAST, quadrant);

cr_assert_eq(normalized_quadrant, 8);
normalized_quadrant = direction_get_quadrant(DIR_SOUTH, quadrant);
cr_assert_eq(normalized_quadrant, 2);
normalized_quadrant = direction_get_quadrant(DIR_NORTH, quadrant);
cr_assert_eq(normalized_quadrant, 6);
normalized_quadrant = direction_get_quadrant(DIR_EAST, quadrant);
normalized_quadrant = direction_get_quadrant(DIR_WEST, quadrant);
cr_assert_eq(normalized_quadrant, 4);
free(world);
}
Expand All @@ -229,10 +229,10 @@ Test(map_broadcast_angle_tests, same_tile)
double final_angle = (map_get_sound_angle(world->map, src_pos, dest_pos));
int quadrant = angle_to_quadrant(final_angle);

cr_assert_eq(direction_get_quadrant(DIR_WEST, quadrant), 1);
cr_assert_eq(direction_get_quadrant(DIR_EAST, quadrant), 1);
cr_assert_eq(direction_get_quadrant(DIR_SOUTH, quadrant), 3);
cr_assert_eq(direction_get_quadrant(DIR_NORTH, quadrant), 7);
cr_assert_eq(direction_get_quadrant(DIR_EAST, quadrant), 5);
cr_assert_eq(direction_get_quadrant(DIR_WEST, quadrant), 5);
free(world);
}

Expand All @@ -245,10 +245,10 @@ Test(map_broadcast_angle_tests, null_map)

cr_assert_eq(final_angle, -1);
cr_assert_eq(quadrant, -1);
cr_assert_eq(direction_get_quadrant(DIR_WEST, quadrant), -1);
cr_assert_eq(direction_get_quadrant(DIR_EAST, quadrant), -1);
cr_assert_eq(direction_get_quadrant(DIR_SOUTH, quadrant), -1);
cr_assert_eq(direction_get_quadrant(DIR_NORTH, quadrant), -1);
cr_assert_eq(direction_get_quadrant(DIR_EAST, quadrant), -1);
cr_assert_eq(direction_get_quadrant(DIR_WEST, quadrant), -1);
}

Test(map_broadcast_angle_tests, wrap_on_x_dest_bigger)
Expand All @@ -259,14 +259,14 @@ Test(map_broadcast_angle_tests, wrap_on_x_dest_bigger)
vector2u_t src_pos = {1, 5};
double final_angle = (map_get_sound_angle(world->map, src_pos, dest_pos));
int quadrant = angle_to_quadrant(final_angle);
int normalized_quadrant = direction_get_quadrant(DIR_WEST, quadrant);
int normalized_quadrant = direction_get_quadrant(DIR_EAST, quadrant);

cr_assert_eq(normalized_quadrant, 1);
normalized_quadrant = direction_get_quadrant(DIR_SOUTH, quadrant);
cr_assert_eq(normalized_quadrant, 3);
normalized_quadrant = direction_get_quadrant(DIR_NORTH, quadrant);
cr_assert_eq(normalized_quadrant, 7);
normalized_quadrant = direction_get_quadrant(DIR_EAST, quadrant);
normalized_quadrant = direction_get_quadrant(DIR_WEST, quadrant);
cr_assert_eq(normalized_quadrant, 5);
free(world);
}
Expand All @@ -279,14 +279,14 @@ Test(map_broadcast_angle_tests, wrap_on_x_src_bigger)
vector2u_t src_pos = {8, 5};
double final_angle = (map_get_sound_angle(world->map, src_pos, dest_pos));
int quadrant = angle_to_quadrant(final_angle);
int normalized_quadrant = direction_get_quadrant(DIR_WEST, quadrant);
int normalized_quadrant = direction_get_quadrant(DIR_EAST, quadrant);

cr_assert_eq(normalized_quadrant, 5);
normalized_quadrant = direction_get_quadrant(DIR_SOUTH, quadrant);
cr_assert_eq(normalized_quadrant, 7);
normalized_quadrant = direction_get_quadrant(DIR_NORTH, quadrant);
cr_assert_eq(normalized_quadrant, 3);
normalized_quadrant = direction_get_quadrant(DIR_EAST, quadrant);
normalized_quadrant = direction_get_quadrant(DIR_WEST, quadrant);
cr_assert_eq(normalized_quadrant, 1);
free(world);
}

0 comments on commit 3441815

Please sign in to comment.