sadpmpk
/
HATPC
1
0
Fork 0
Code Issues 11 Pull Requests Projects 4 Releases Wiki Activity

Fix regression in collision system 

Changelog:
- Revert tile collision checking to extend one pixel out rightwards
  and downwards
- Fix off-by-one error in complete overlap handling
- Remove check for empty space before moving as it causes more issue
  than solving them.
scene_man
En Yi 2023-06-06 22:07:30 +08:00
parent bab18dd5e9
commit 7ce3894c79
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scenes/game_systems.c
View File

@ -184,11 +184,11 @@ static bool check_collision_and_move(
&& (p_ct->prev_position.y + p_bbox->size.y - 1 < other_pos->y)) && (p_ct->prev_position.y + p_bbox->size.y - 1 < other_pos->y))
) )
{ {
if (!check_collision_at(ent, p_ct->position, p_bbox->size, tilemap, offset)) //if (!check_collision_at(ent, p_ct->position, p_bbox->size, tilemap, offset))
{ {
p_ct->position = Vector2Add(p_ct->position, offset); p_ct->position = Vector2Add(p_ct->position, offset);
} }
else //else
{ {
//*other_pos = Vector2Subtract(*other_pos, offset); //*other_pos = Vector2Subtract(*other_pos, offset);
@ -201,14 +201,14 @@ static bool check_collision_and_move(
// On complete overlap, find a free space in this order: top, left, right, bottom // On complete overlap, find a free space in this order: top, left, right, bottom
Vector2 point_to_test = {0}; Vector2 point_to_test = {0};
point_to_test.x = p_ct->position.x; point_to_test.x = p_ct->position.x;
point_to_test.y = other_pos->y - p_bbox->size.y; point_to_test.y = other_pos->y - p_bbox->size.y + 1;
if (!check_collision_at(ent, point_to_test, p_bbox->size, tilemap, (Vector2){0})) if (!check_collision_at(ent, point_to_test, p_bbox->size, tilemap, (Vector2){0}))
{ {
p_ct->position = point_to_test; p_ct->position = point_to_test;
goto collision_end; goto collision_end;
} }
point_to_test.x = other_pos->x - p_bbox->size.x; point_to_test.x = other_pos->x - p_bbox->size.x + 1;
point_to_test.y = p_ct->position.y; point_to_test.y = p_ct->position.y;
if (!check_collision_at(ent, point_to_test, p_bbox->size, tilemap, (Vector2){0})) if (!check_collision_at(ent, point_to_test, p_bbox->size, tilemap, (Vector2){0}))
{ {
@ -216,7 +216,7 @@ static bool check_collision_and_move(
goto collision_end; goto collision_end;
} }
point_to_test.x = other_pos->x + other_bbox.x; point_to_test.x = other_pos->x + other_bbox.x - 1;
point_to_test.y = p_ct->position.y; point_to_test.y = p_ct->position.y;
if (!check_collision_at(ent, point_to_test, p_bbox->size, tilemap, (Vector2){0})) if (!check_collision_at(ent, point_to_test, p_bbox->size, tilemap, (Vector2){0}))
{ {
@ -225,7 +225,7 @@ static bool check_collision_and_move(
} }
point_to_test.x = p_ct->position.x; point_to_test.x = p_ct->position.x;
point_to_test.y = other_pos->y + other_bbox.y; point_to_test.y = other_pos->y + other_bbox.y - 1;
if (!check_collision_at(ent, point_to_test, p_bbox->size, tilemap, (Vector2){0})) if (!check_collision_at(ent, point_to_test, p_bbox->size, tilemap, (Vector2){0}))
{ {
p_ct->position = point_to_test; p_ct->position = point_to_test;
@ -233,7 +233,7 @@ static bool check_collision_and_move(
} }
// If no free space, Move up no matter what // If no free space, Move up no matter what
p_ct->position.x = p_ct->position.x; p_ct->position.x = p_ct->position.x;
p_ct->position.y = other_pos->y - p_bbox->size.y; p_ct->position.y = other_pos->y - p_bbox->size.y + 1;
} }
collision_end: collision_end:
return overlap_mode > 0; return overlap_mode > 0;
@ -649,10 +649,12 @@ void tile_collision_system(Scene_t* scene)
// Get the occupied tiles // Get the occupied tiles
// For each tile, loop through the entities, check collision and move // For each tile, loop through the entities, check collision and move
// exclude self // exclude self
// This has an extra pixel when gathering potential collision, just to avoid missing any
// This is only done here, collision methods do not have this
unsigned int tile_x1 = (p_ctransform->position.x) / TILE_SIZE; unsigned int tile_x1 = (p_ctransform->position.x) / TILE_SIZE;
unsigned int tile_y1 = (p_ctransform->position.y) / TILE_SIZE; unsigned int tile_y1 = (p_ctransform->position.y) / TILE_SIZE;
unsigned int tile_x2 = (p_ctransform->position.x + p_bbox->size.x - 1) / TILE_SIZE; unsigned int tile_x2 = (p_ctransform->position.x + p_bbox->size.x) / TILE_SIZE;
unsigned int tile_y2 = (p_ctransform->position.y + p_bbox->size.y - 1) / TILE_SIZE; unsigned int tile_y2 = (p_ctransform->position.y + p_bbox->size.y) / TILE_SIZE;
for (unsigned int tile_y = tile_y1; tile_y <= tile_y2; tile_y++) for (unsigned int tile_y = tile_y1; tile_y <= tile_y2; tile_y++)
{ {