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

Add spike destruction 

Changelog:
- Spike collision is now checked against all bboxes
    - Non player will destroy it
- Add moveable flag for each tile to determine whether a boulder can
  move into it
scene_man
En Yi 2023-06-22 23:14:07 +08:00
parent 3ee14d5f47
commit c7ef3f473f
4 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scenes/editor_scene.c
View File

@ -98,6 +98,12 @@ static void level_scene_render_func(Scene_t* scene)
Color water_colour = ColorAlpha(BLUE, 0.5); Color water_colour = ColorAlpha(BLUE, 0.5);
DrawRectangle(x, y, TILE_SIZE, TILE_SIZE, water_colour); DrawRectangle(x, y, TILE_SIZE, TILE_SIZE, water_colour);
} }
if (tilemap.tiles[i].moveable)
{
// Draw water tile
Color water_colour = ColorAlpha(GREEN, 0.2);
DrawRectangle(x, y, TILE_SIZE, TILE_SIZE, water_colour);
}
} }
char buffer[64] = {0}; char buffer[64] = {0};
@ -390,6 +396,10 @@ static void toggle_block_system(Scene_t* scene)
tilemap.tiles[tile_idx].size = (Vector2){32,32}; tilemap.tiles[tile_idx].size = (Vector2){32,32};
} }
last_tile_idx = tile_idx; last_tile_idx = tile_idx;
tilemap.tiles[tile_idx].moveable = (
tilemap.tiles[tile_idx].tile_type == EMPTY_TILE
|| tilemap.tiles[tile_idx].tile_type == SPIKES
);
} }
} }
else if (IsMouseButtonDown(MOUSE_RIGHT_BUTTON)) else if (IsMouseButtonDown(MOUSE_RIGHT_BUTTON))
@ -493,7 +503,7 @@ void init_level_scene(LevelScene_t* scene)
sc_array_add(&scene->scene.systems, &update_tilemap_system); sc_array_add(&scene->scene.systems, &update_tilemap_system);
sc_array_add(&scene->scene.systems, &hitbox_update_system); sc_array_add(&scene->scene.systems, &hitbox_update_system);
sc_array_add(&scene->scene.systems, &player_crushing_system); sc_array_add(&scene->scene.systems, &player_crushing_system);
sc_array_add(&scene->scene.systems, &player_spike_collision_system); sc_array_add(&scene->scene.systems, &spike_collision_system);
sc_array_add(&scene->scene.systems, &state_transition_update_system); sc_array_add(&scene->scene.systems, &state_transition_update_system);
sc_array_add(&scene->scene.systems, &player_ground_air_transition_system); sc_array_add(&scene->scene.systems, &player_ground_air_transition_system);
sc_array_add(&scene->scene.systems, &sprite_animation_system); sc_array_add(&scene->scene.systems, &sprite_animation_system);
@ -524,6 +534,7 @@ void init_level_scene(LevelScene_t* scene)
{ {
all_tiles[i].solid = NOT_SOLID; all_tiles[i].solid = NOT_SOLID;
all_tiles[i].tile_type = EMPTY_TILE; all_tiles[i].tile_type = EMPTY_TILE;
all_tiles[i].moveable = true;
sc_map_init_64v(&all_tiles[i].entities_set, 16, 0); sc_map_init_64v(&all_tiles[i].entities_set, 16, 0);
all_tiles[i].size = (Vector2){TILE_SIZE, TILE_SIZE}; all_tiles[i].size = (Vector2){TILE_SIZE, TILE_SIZE};
} }
@ -532,6 +543,7 @@ void init_level_scene(LevelScene_t* scene)
unsigned int tile_idx = (scene->data.tilemap.height - 1) * scene->data.tilemap.width + i; unsigned int tile_idx = (scene->data.tilemap.height - 1) * scene->data.tilemap.width + i;
all_tiles[tile_idx].solid = SOLID; // for testing all_tiles[tile_idx].solid = SOLID; // for testing
all_tiles[tile_idx].tile_type = SOLID_TILE; // for testing all_tiles[tile_idx].tile_type = SOLID_TILE; // for testing
all_tiles[tile_idx].moveable = false;
} }
create_player(&scene->scene.ent_manager, &scene->scene.engine->assets); create_player(&scene->scene.ent_manager, &scene->scene.engine->assets);

43
scenes/game_systems.c
View File

@ -732,15 +732,17 @@ void player_crushing_system(Scene_t* scene)
} }
} }
void player_spike_collision_system(Scene_t* scene) void spike_collision_system(Scene_t* scene)
{ {
LevelSceneData_t* data = &(CONTAINER_OF(scene, LevelScene_t, scene)->data); LevelSceneData_t* data = &(CONTAINER_OF(scene, LevelScene_t, scene)->data);
TileGrid_t tilemap = data->tilemap; TileGrid_t tilemap = data->tilemap;
Entity_t* p_player; //Entity_t* p_player;
sc_map_foreach_value(&scene->ent_manager.entities_map[PLAYER_ENT_TAG], p_player) CBBox_t* p_bbox;
unsigned int ent_idx;
sc_map_foreach(&scene->ent_manager.component_map[CBBOX_COMP_T], ent_idx, p_bbox)
{ {
CTransform_t* p_ctransform = get_component(p_player, CTRANSFORM_COMP_T); Entity_t* p_ent = get_entity(&scene->ent_manager, ent_idx);
CBBox_t* p_bbox = get_component(p_player, CBBOX_COMP_T); CTransform_t* p_ctransform = get_component(p_ent, CTRANSFORM_COMP_T);
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 - 1) / TILE_SIZE;
@ -753,17 +755,26 @@ void player_spike_collision_system(Scene_t* scene)
unsigned int tile_idx = tile_y * tilemap.width + tile_x; unsigned int tile_idx = tile_y * tilemap.width + tile_x;
if(tilemap.tiles[tile_idx].tile_type == SPIKES) if(tilemap.tiles[tile_idx].tile_type == SPIKES)
{ {
if (find_AABB_overlap( uint8_t collide = find_AABB_overlap(
p_ctransform->position, p_bbox->size, p_ctransform->position, p_bbox->size,
(Vector2){ (Vector2){
tile_x * TILE_SIZE + tilemap.tiles[tile_idx].offset.x, tile_x * TILE_SIZE + tilemap.tiles[tile_idx].offset.x,
tile_y * TILE_SIZE + tilemap.tiles[tile_idx].offset.y tile_y * TILE_SIZE + tilemap.tiles[tile_idx].offset.y
}, },
tilemap.tiles[tile_idx].size, tilemap.tiles[tile_idx].size,
&overlap)) &overlap);
if (collide)
{ {
p_player->m_alive = false; if (p_ent->m_tag == PLAYER_ENT_TAG)
return; {
p_ent->m_alive = false;
return;
}
else
{
tilemap.tiles[tile_idx].tile_type = EMPTY_TILE;
}
} }
} }
} }
@ -1070,10 +1081,7 @@ void moveable_update_system(Scene_t* scene)
{ {
unsigned int tile_idx1 = tile_y * tilemap.width + tile_x; unsigned int tile_idx1 = tile_y * tilemap.width + tile_x;
unsigned int tile_idx2 = tile_y2 * tilemap.width + tile_x; unsigned int tile_idx2 = tile_y2 * tilemap.width + tile_x;
if ( if ( tilemap.tiles[tile_idx1].moveable && tilemap.tiles[tile_idx2].moveable )
tilemap.tiles[tile_idx1].tile_type == EMPTY_TILE
&& tilemap.tiles[tile_idx2].tile_type == EMPTY_TILE
)
{ {
bool any_solid = false; bool any_solid = false;
unsigned int idx_to_check; unsigned int idx_to_check;
@ -1102,9 +1110,7 @@ void moveable_update_system(Scene_t* scene)
{ {
unsigned int tile_idx1 = tile_y * tilemap.width + tile_x; unsigned int tile_idx1 = tile_y * tilemap.width + tile_x;
unsigned int tile_idx2 = tile_y2 * tilemap.width + tile_x; unsigned int tile_idx2 = tile_y2 * tilemap.width + tile_x;
if (tilemap.tiles[tile_idx1].tile_type == EMPTY_TILE if ( tilemap.tiles[tile_idx1].moveable && tilemap.tiles[tile_idx2].moveable )
&& tilemap.tiles[tile_idx2].tile_type == EMPTY_TILE
)
{ {
bool any_solid = false; bool any_solid = false;
unsigned int idx_to_check; unsigned int idx_to_check;
@ -1215,7 +1221,7 @@ void player_pushing_system(Scene_t* scene)
{ {
unsigned int target_tile_idx = tile_y * tilemap.width + tile_x; unsigned int target_tile_idx = tile_y * tilemap.width + tile_x;
if ( if (
tilemap.tiles[target_tile_idx].tile_type == EMPTY_TILE tilemap.tiles[target_tile_idx].moveable
&& sc_map_size_64v(&tilemap.tiles[target_tile_idx].entities_set) == 0 && sc_map_size_64v(&tilemap.tiles[target_tile_idx].entities_set) == 0
) )
{ {
@ -1558,15 +1564,18 @@ void boulder_destroy_wooden_tile_system(Scene_t* scene)
{ {
tilemap.tiles[tile_idx].tile_type = EMPTY_TILE; tilemap.tiles[tile_idx].tile_type = EMPTY_TILE;
tilemap.tiles[tile_idx].solid = NOT_SOLID; tilemap.tiles[tile_idx].solid = NOT_SOLID;
tilemap.tiles[tile_idx].moveable = true;
if (tile_x > 0 && tilemap.tiles[tile_idx - 1].tile_type == ONEWAY_TILE) if (tile_x > 0 && tilemap.tiles[tile_idx - 1].tile_type == ONEWAY_TILE)
{ {
tilemap.tiles[tile_idx - 1].tile_type = EMPTY_TILE; tilemap.tiles[tile_idx - 1].tile_type = EMPTY_TILE;
tilemap.tiles[tile_idx - 1].solid = NOT_SOLID; tilemap.tiles[tile_idx - 1].solid = NOT_SOLID;
tilemap.tiles[tile_idx - 1].moveable = true;
} }
if (tile_x < tilemap.width && tilemap.tiles[tile_idx + 1].tile_type == ONEWAY_TILE) if (tile_x < tilemap.width && tilemap.tiles[tile_idx + 1].tile_type == ONEWAY_TILE)
{ {
tilemap.tiles[tile_idx + 1].tile_type = EMPTY_TILE; tilemap.tiles[tile_idx + 1].tile_type = EMPTY_TILE;
tilemap.tiles[tile_idx + 1].solid = NOT_SOLID; tilemap.tiles[tile_idx + 1].solid = NOT_SOLID;
tilemap.tiles[tile_idx + 1].moveable = true;
} }
} }
} }

2
scenes/game_systems.h
View File

@ -22,5 +22,5 @@ void boulder_destroy_wooden_tile_system(Scene_t* scene);
void camera_update_system(Scene_t* scene); void camera_update_system(Scene_t* scene);
void player_dir_reset_system(Scene_t* scene); void player_dir_reset_system(Scene_t* scene);
void player_respawn_system(Scene_t* scene); void player_respawn_system(Scene_t* scene);
void player_spike_collision_system(Scene_t* scene); void spike_collision_system(Scene_t* scene);
#endif // __GAME_SYSTEMS_H #endif // __GAME_SYSTEMS_H

1
scenes/scene_impl.h
View File

@ -34,6 +34,7 @@ typedef struct Tile {
struct sc_map_64v entities_set; struct sc_map_64v entities_set;
Vector2 offset; Vector2 offset;
Vector2 size; Vector2 size;
bool moveable;
}Tile_t; }Tile_t;
typedef struct TileGrid { typedef struct TileGrid {