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

Attempt to tune up boulder sliding behaviour

scene_man
En Yi 2023-11-24 21:45:48 +08:00
parent bdbf936c7c
commit 402d6f658e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scenes/game_systems.c
View File

@ -1070,7 +1070,7 @@ void moveable_update_system(Scene_t* scene)
CBBox_t* p_other_bbox = get_component(other_ent, CBBOX_COMP_T); CBBox_t* p_other_bbox = get_component(other_ent, CBBOX_COMP_T);
CTransform_t* p_other_ct = get_component(other_ent, CTRANSFORM_COMP_T); CTransform_t* p_other_ct = get_component(other_ent, CTRANSFORM_COMP_T);
Rectangle box = {p_other_ct->position.x, p_other_ct->position.y, p_other_bbox->size.x, p_other_bbox->size.y}; Rectangle box = {p_other_ct->position.x, p_other_ct->position.y, p_other_bbox->size.x, p_other_bbox->size.y};
if (!point_in_AABB(point_to_check, box)) continue; if (!point_in_AABB(point_to_check, box) || Vector2LengthSqr(p_other_ct->velocity) != 0) continue;
} }
tile_x = (p_ctransform->position.x) / TILE_SIZE - 1; tile_x = (p_ctransform->position.x) / TILE_SIZE - 1;
@ -1092,7 +1092,9 @@ void moveable_update_system(Scene_t* scene)
CBBox_t* p_other_bbox = get_component(other_ent, CBBOX_COMP_T); CBBox_t* p_other_bbox = get_component(other_ent, CBBOX_COMP_T);
if (p_other_bbox != NULL) if (p_other_bbox != NULL)
{ {
any_solid |= p_other_bbox->solid; //any_solid |= p_other_bbox->solid;
any_solid |= true;
break;
} }
} }
sc_map_foreach_key(&tilemap.tiles[tile_idx2].entities_set, idx_to_check) sc_map_foreach_key(&tilemap.tiles[tile_idx2].entities_set, idx_to_check)
@ -1101,7 +1103,9 @@ void moveable_update_system(Scene_t* scene)
CBBox_t* p_other_bbox = get_component(other_ent, CBBOX_COMP_T); CBBox_t* p_other_bbox = get_component(other_ent, CBBOX_COMP_T);
if (p_other_bbox != NULL) if (p_other_bbox != NULL)
{ {
any_solid |= p_other_bbox->solid; //any_solid |= p_other_bbox->solid;
any_solid |= true;
break;
} }
} }
if (!any_solid) if (!any_solid)