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

Add simple water flowing visual

scene_man
En Yi 2023-07-24 23:59:19 +08:00
parent 478dea2d9c
commit f6c5fa10fd
4 changed files with 105 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
scenes/editor_scene.c
View File

@ -99,6 +99,36 @@ static void level_scene_render_func(Scene_t* scene)
tilemap.tiles[i].size.x, tilemap.tiles[i].size.y, RED tilemap.tiles[i].size.x, tilemap.tiles[i].size.y, RED
); );
} }
if (tilemap.tiles[i].wet)
{
#define SURFACE_THICKNESS 4
int up = i - tilemap.width;
int bot = i + tilemap.width;
int right = i + 1;
int left = i - 1;
int bot_line = y + TILE_SIZE - tilemap.tiles[i].water_level * WATER_BBOX_STEP - SURFACE_THICKNESS / 2;
if (up >= 0 && tilemap.tiles[up].wet)
{
DrawLineEx((Vector2){x + TILE_SIZE / 2, y}, (Vector2){x + TILE_SIZE / 2, y + TILE_SIZE - tilemap.tiles[i].water_level * WATER_BBOX_STEP}, SURFACE_THICKNESS, ColorAlpha(BLUE, 0.7));
}
if (
bot <= tilemap.n_tiles
&& tilemap.tiles[bot].water_level < MAX_WATER_LEVEL
&& tilemap.tiles[i].water_level == 0
)
{
if (i % tilemap.width != 0 && tilemap.tiles[left].wet)
{
DrawLineEx((Vector2){x, bot_line}, (Vector2){x + TILE_SIZE / 2, bot_line}, SURFACE_THICKNESS, ColorAlpha(BLUE, 0.7));
}
if (right % tilemap.width != 0 && tilemap.tiles[right].wet)
{
DrawLineEx((Vector2){x + TILE_SIZE / 2, bot_line}, (Vector2){x + TILE_SIZE, bot_line}, SURFACE_THICKNESS, ColorAlpha(BLUE, 0.7));
}
}
}
// Draw water tile // Draw water tile
uint32_t water_height = tilemap.tiles[i].water_level * WATER_BBOX_STEP; uint32_t water_height = tilemap.tiles[i].water_level * WATER_BBOX_STEP;
@ -513,7 +543,11 @@ static void toggle_block_system(Scene_t* scene)
{ {
case TOGGLE_TILE: case TOGGLE_TILE:
new_type = (tilemap.tiles[tile_idx].tile_type == SOLID_TILE)? EMPTY_TILE : SOLID_TILE; new_type = (tilemap.tiles[tile_idx].tile_type == SOLID_TILE)? EMPTY_TILE : SOLID_TILE;
if (new_type == SOLID_TILE) tilemap.tiles[tile_idx].water_level = 0; if (new_type == SOLID_TILE)
{
tilemap.tiles[tile_idx].water_level = 0;
tilemap.tiles[tile_idx].wet = false;
}
break; break;
case TOGGLE_ONEWAY: case TOGGLE_ONEWAY:
new_type = (tilemap.tiles[tile_idx].tile_type == ONEWAY_TILE)? EMPTY_TILE : ONEWAY_TILE; new_type = (tilemap.tiles[tile_idx].tile_type == ONEWAY_TILE)? EMPTY_TILE : ONEWAY_TILE;

2
scenes/engine/collisions.h
View File

@ -20,6 +20,7 @@ typedef struct Tile {
Vector2 offset; Vector2 offset;
Vector2 size; Vector2 size;
bool moveable; bool moveable;
bool wet;
}Tile_t; }Tile_t;
typedef struct TileGrid typedef struct TileGrid
@ -28,7 +29,6 @@ typedef struct TileGrid
unsigned int height; unsigned int height;
unsigned int n_tiles; unsigned int n_tiles;
unsigned int tile_size; unsigned int tile_size;
//unsigned int max_water_level;
Tile_t* tiles; Tile_t* tiles;
}TileGrid_t; }TileGrid_t;

1
scenes/water_flow.c
View File

@ -219,6 +219,7 @@ void update_water_runner_system(Scene_t* scene)
CTransform_t* p_ct = get_component(ent, CTRANSFORM_COMP_T); CTransform_t* p_ct = get_component(ent, CTRANSFORM_COMP_T);
p_ct->position.x = (p_crunner->current_tile % tilemap.width) * tilemap.tile_size; p_ct->position.x = (p_crunner->current_tile % tilemap.width) * tilemap.tile_size;
p_ct->position.y = (p_crunner->current_tile / tilemap.width) * tilemap.tile_size; p_ct->position.y = (p_crunner->current_tile / tilemap.width) * tilemap.tile_size;
tilemap.tiles[p_crunner->current_tile].wet = true;
if (p_crunner->current_tile == p_crunner->target_tile) if (p_crunner->current_tile == p_crunner->target_tile)
{ {
p_crunner->state = REACHABILITY_SEARCH; p_crunner->state = REACHABILITY_SEARCH;

69
water_test.c
View File

@ -54,6 +54,37 @@ static void level_scene_render_func(Scene_t* scene)
{ {
DrawRectangle(x, y, TILE_SIZE, TILE_SIZE, BLACK); DrawRectangle(x, y, TILE_SIZE, TILE_SIZE, BLACK);
} }
if (tilemap.tiles[i].wet)
{
#define SURFACE_THICKNESS 4
int up = i - tilemap.width;
int bot = i + tilemap.width;
int right = i + 1;
int left = i - 1;
int bot_line = y + TILE_SIZE - tilemap.tiles[i].water_level * WATER_BBOX_STEP - SURFACE_THICKNESS / 2;
if (up >= 0 && tilemap.tiles[up].wet)
{
DrawLineEx((Vector2){x + TILE_SIZE / 2, y}, (Vector2){x + TILE_SIZE / 2, y + TILE_SIZE - tilemap.tiles[i].water_level * WATER_BBOX_STEP}, SURFACE_THICKNESS, ColorAlpha(BLUE, 0.7));
}
if (
bot <= tilemap.n_tiles
&& tilemap.tiles[bot].water_level < MAX_WATER_LEVEL
&& tilemap.tiles[i].water_level == 0
)
{
if (i % tilemap.width != 0 && tilemap.tiles[left].wet)
{
DrawLineEx((Vector2){x, bot_line}, (Vector2){x + TILE_SIZE / 2, bot_line}, SURFACE_THICKNESS, ColorAlpha(BLUE, 0.7));
}
if (right % tilemap.width != 0 && tilemap.tiles[right].wet)
{
DrawLineEx((Vector2){x + TILE_SIZE / 2, bot_line}, (Vector2){x + TILE_SIZE, bot_line}, SURFACE_THICKNESS, ColorAlpha(BLUE, 0.7));
}
}
}
uint32_t water_height = tilemap.tiles[i].water_level * WATER_BBOX_STEP; uint32_t water_height = tilemap.tiles[i].water_level * WATER_BBOX_STEP;
// Draw water tile // Draw water tile
@ -221,7 +252,11 @@ static void toggle_block_system(Scene_t* scene)
{ {
TileType_t new_type = EMPTY_TILE; TileType_t new_type = EMPTY_TILE;
new_type = (tilemap.tiles[tile_idx].tile_type == SOLID_TILE)? EMPTY_TILE : SOLID_TILE; new_type = (tilemap.tiles[tile_idx].tile_type == SOLID_TILE)? EMPTY_TILE : SOLID_TILE;
if (new_type == SOLID_TILE) tilemap.tiles[tile_idx].water_level = 0; if (new_type == SOLID_TILE)
{
tilemap.tiles[tile_idx].water_level = 0;
tilemap.tiles[tile_idx].wet = false;
}
change_a_tile(&tilemap, tile_idx, new_type); change_a_tile(&tilemap, tile_idx, new_type);
} }
else else
@ -243,7 +278,39 @@ static void toggle_block_system(Scene_t* scene)
CWaterRunner_t* p_crunner; CWaterRunner_t* p_crunner;
sc_map_foreach_value(&scene->ent_manager.component_map[CWATERRUNNER_T], p_crunner) sc_map_foreach_value(&scene->ent_manager.component_map[CWATERRUNNER_T], p_crunner)
{ {
//if (tilemap.tiles[tile_idx].solid)
//{
// int curr_idx = p_crunner->current_tile;
// //Tile_t* curr_tile = tilemap.tiles + p_crunner->current_tile;
// bool blocked = false;
// puts("Retracing");
// while(curr_idx >= 0)
// {
// printf("%u\n", curr_idx);
// if (curr_idx == tile_idx)
// {
// blocked = true;
// break;
// }
// curr_idx = p_crunner->bfs_tilemap.tilemap[curr_idx].from;
// }
// if (blocked)
// {
// int return_idx = p_crunner->current_tile;
// if (p_crunner->bfs_tilemap.tilemap[curr_idx].from >= 0)
// {
// p_crunner->current_tile = p_crunner->bfs_tilemap.tilemap[curr_idx].from;
// }
// puts("Blocking...");
// while(curr_idx != return_idx)
// {
// tilemap.tiles[curr_idx].wet = false;
// curr_idx = p_crunner->bfs_tilemap.tilemap[curr_idx].to;
// }
// }
//}
p_crunner->state = BFS_RESET; p_crunner->state = BFS_RESET;
} }
} }
else if (IsMouseButtonReleased(MOUSE_RIGHT_BUTTON)) else if (IsMouseButtonReleased(MOUSE_RIGHT_BUTTON))