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

Update scanline fill function 

Changelog:
- Fill only a range of reachable tiles instead
- Tweak fill complete check
    - Count tiles filled, if zero: complete
- Allow multiple runner to fill without breaking the game
scene_man
En Yi 2023-07-22 20:29:20 +08:00
parent cf807be7a2
commit eed785162e
2 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scenes/engine/EC/EC.h
View File

@ -160,6 +160,7 @@ typedef struct _CWaterRunner {
int32_t current_tile; int32_t current_tile;
int32_t target_tile; int32_t target_tile;
int32_t fill_idx; int32_t fill_idx;
int16_t fill_range[2];
uint8_t movement_delay; uint8_t movement_delay;
int16_t counter; int16_t counter;
}CWaterRunner_t; }CWaterRunner_t;

45
scenes/water_flow.c
View File

@ -229,7 +229,7 @@ void update_water_runner_system(Scene_t* scene)
{ {
if (tilemap.tiles[p_crunner->current_tile].water_level == tilemap.max_water_level) if (tilemap.tiles[p_crunner->current_tile].water_level == tilemap.max_water_level)
{ {
p_crunner->state = FILL_COMPLETE; p_crunner->state = BFS_RESET;
break; break;
} }
int start_tile = int start_tile =
@ -243,19 +243,29 @@ void update_water_runner_system(Scene_t* scene)
int32_t lowest_tile = p_crunner->current_tile; int32_t lowest_tile = p_crunner->current_tile;
runner_BFS(&tilemap, p_crunner, &lowest_tile, p_crunner->current_tile); runner_BFS(&tilemap, p_crunner, &lowest_tile, p_crunner->current_tile);
p_crunner->counter = 0;
for (int i = 0; i < p_crunner->bfs_tilemap.width; ++i) for (int i = 0; i < p_crunner->bfs_tilemap.width; ++i)
{ {
Tile_t* curr_tile = tilemap.tiles + start_tile + i;
if ( if (
p_crunner->bfs_tilemap.tilemap[start_tile + i].reachable p_crunner->bfs_tilemap.tilemap[start_tile + i].reachable
&& curr_tile->water_level < tilemap.max_water_level
) )
{ {
p_crunner->counter++; p_crunner->fill_range[0] = i;
break;
} }
} }
p_crunner->fill_idx = 0; for (int i = p_crunner->bfs_tilemap.width - 1; i >= 0; --i)
{
if (
p_crunner->bfs_tilemap.tilemap[start_tile + i].reachable
)
{
p_crunner->fill_range[1] = i;
break;
}
}
p_crunner->fill_idx = p_crunner->fill_range[0];
p_crunner->counter = 0;
p_crunner->state = SCANLINE_FILL; p_crunner->state = SCANLINE_FILL;
} }
break; break;
@ -269,24 +279,27 @@ void update_water_runner_system(Scene_t* scene)
Tile_t* curr_tile = tilemap.tiles + curr_idx; Tile_t* curr_tile = tilemap.tiles + curr_idx;
if ( if (
p_crunner->bfs_tilemap.tilemap[curr_idx].reachable p_crunner->bfs_tilemap.tilemap[curr_idx].reachable
&& curr_tile->water_level < tilemap.max_water_level
) )
{ {
curr_tile->water_level++; if (curr_tile->water_level < tilemap.max_water_level)
if (curr_tile->water_level == tilemap.max_water_level)
{ {
p_crunner->counter--; curr_tile->water_level++;
p_crunner->counter++;
} }
} }
if (p_crunner->counter == 0)
{
p_crunner->state = BFS_RESET;
break;
}
p_crunner->fill_idx++; p_crunner->fill_idx++;
p_crunner->fill_idx %= p_crunner->bfs_tilemap.width; if (p_crunner->fill_idx > p_crunner->fill_range[1])
{
if (p_crunner->counter == 0)
{
p_crunner->state = BFS_RESET;
break;
}
p_crunner->counter = 0;
p_crunner->fill_idx = p_crunner->fill_range[0];
}
} }
} }
break; break;