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

Update swimming hit- and hurtbox proper

main
En Yi 2024-11-13 23:06:26 +08:00
parent 6b59064772
commit 5b29ad4ba4
1 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
scenes/game_systems.c
View File

@ -553,16 +553,11 @@ void player_bbox_update_system(Scene_t* scene)
} }
} }
Vector2 point_to_check = Vector2Add(p_player->position, offset);
if ( // As long as the change in hitbox is less than a tile size,
check_collision_at( // it should be fine
p_player, point_to_check, new_bbox, &tilemap set_bbox(p_bbox, new_bbox.x, new_bbox.y);
) != 1 p_player->position = Vector2Add(p_player->position, offset);
)
{
set_bbox(p_bbox, new_bbox.x, new_bbox.y);
p_player->position = Vector2Add(p_player->position, offset);
}
CHitBoxes_t* p_hitbox = get_component(p_player, CHITBOXES_T); CHitBoxes_t* p_hitbox = get_component(p_player, CHITBOXES_T);
p_hitbox->boxes[0].height = p_bbox->size.y + 4; p_hitbox->boxes[0].height = p_bbox->size.y + 4;
@ -571,22 +566,33 @@ void player_bbox_update_system(Scene_t* scene)
if ((p_mstate->water_state & 1) && !(p_mstate->ground_state & 1)) if ((p_mstate->water_state & 1) && !(p_mstate->ground_state & 1))
{ {
#define EXTENDED_WIDTH_FACTOR 1.5f;
float extended_width = p_bbox->size.x * EXTENDED_WIDTH_FACTOR;
p_hurtbox->size = p_bbox->size; p_hurtbox->size = p_bbox->size;
p_hurtbox->size.x *= 1.7; p_hurtbox->size.x *= EXTENDED_WIDTH_FACTOR;
p_hitbox->boxes[0].width = p_bbox->size.x * 2.0f; p_hitbox->boxes[0].width = extended_width;
p_hitbox->boxes[1].width = p_bbox->size.x * 2.0f + 4; p_hitbox->boxes[1].width = extended_width + 4;
if (p_mstate->x_dir > 0)
{ AnchorPoint_t anchor = p_mstate->x_dir > 0 ? AP_TOP_RIGHT : AP_TOP_LEFT;
p_hitbox->boxes[0].x = -p_bbox->size.x; Vector2 offset = shift_bbox(
p_hitbox->boxes[1].x = -p_bbox->size.x - 2; p_bbox->size,
p_hurtbox->offset.x = -p_bbox->size.x * 0.7; (Vector2){
} p_hitbox->boxes[0].width, p_hitbox->boxes[0].height
else },
{ anchor
p_hitbox->boxes[0].x = 0; );
p_hitbox->boxes[1].x = -2; p_hitbox->boxes[0].x = offset.x;
p_hurtbox->offset.x = 0;
} offset = shift_bbox(
p_bbox->size,
(Vector2){
p_hitbox->boxes[1].width, p_hitbox->boxes[1].height
},
anchor
);
p_hitbox->boxes[1].x = offset.x;
p_hurtbox->offset = shift_bbox(p_bbox->size, p_hurtbox->size, anchor);
} }
else else
{ {