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

Add action to toggle grid for sandbox

scene_man
En Yi 2023-11-15 23:30:13 +08:00
parent c64ef906e0
commit 7dd4c8413b
4 changed files with 41 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engine/actions.h
View File

@ -16,5 +16,6 @@ typedef enum ActionType
ACTION_RESTART, ACTION_RESTART,
ACTION_NEXTLEVEL, ACTION_NEXTLEVEL,
ACTION_PREVLEVEL, ACTION_PREVLEVEL,
ACTION_TOGGLE_GRID,
}ActionType_t; }ActionType_t;
#endif // __ACTIONS_H #endif // __ACTIONS_H

64
scenes/editor_scene.c
View File

@ -451,38 +451,41 @@ static void render_editor_game_scene(Scene_t* scene)
draw_particle_system(&scene->part_sys); draw_particle_system(&scene->part_sys);
for (int tile_y = min.y; tile_y < max.y; tile_y++) if (data->show_grid)
{ {
for (int tile_x = min.x; tile_x < max.x; tile_x++) for (int tile_y = min.y; tile_y < max.y; tile_y++)
{ {
int i = tile_x + tile_y * tilemap.width; for (int tile_x = min.x; tile_x < max.x; tile_x++)
int x = tile_x * TILE_SIZE;
int y = tile_y * TILE_SIZE;
sprintf(buffer, "%u", sc_map_size_64v(&tilemap.tiles[i].entities_set));
if (tilemap.tiles[i].solid > 0)
{ {
DrawText(buffer, x, y, 10, WHITE); int i = tile_x + tile_y * tilemap.width;
} int x = tile_x * TILE_SIZE;
else int y = tile_y * TILE_SIZE;
{
// Draw water tile sprintf(buffer, "%u", sc_map_size_64v(&tilemap.tiles[i].entities_set));
DrawText(buffer, x, y, 10, BLACK);
if (tilemap.tiles[i].solid > 0)
{
DrawText(buffer, x, y, 10, WHITE);
}
else
{
// Draw water tile
DrawText(buffer, x, y, 10, BLACK);
}
} }
} }
}
// Draw tile grid // Draw tile grid
for (size_t i = min.x; i < max.x; ++i) for (size_t i = min.x; i < max.x; ++i)
{ {
int x = (i+1)*TILE_SIZE; int x = (i+1)*TILE_SIZE;
DrawLine(x, 0, x, tilemap.height * TILE_SIZE, BLACK); DrawLine(x, 0, x, tilemap.height * TILE_SIZE, BLACK);
} }
for (size_t i = min.y; i < max.y;++i) for (size_t i = min.y; i < max.y;++i)
{ {
int y = (i+1)*TILE_SIZE; int y = (i+1)*TILE_SIZE;
DrawLine(0, y, tilemap.width * TILE_SIZE, y, BLACK); DrawLine(0, y, tilemap.width * TILE_SIZE, y, BLACK);
}
} }
EndMode2D(); EndMode2D();
EndTextureMode(); EndTextureMode();
@ -770,6 +773,7 @@ static void restart_editor_level(Scene_t* scene)
static void level_do_action(Scene_t* scene, ActionType_t action, bool pressed) static void level_do_action(Scene_t* scene, ActionType_t action, bool pressed)
{ {
LevelSceneData_t* data = &(CONTAINER_OF(scene, LevelScene_t, scene)->data);
CPlayerState_t* p_playerstate; CPlayerState_t* p_playerstate;
sc_map_foreach_value(&scene->ent_manager.component_map[CPLAYERSTATE_T], p_playerstate) sc_map_foreach_value(&scene->ent_manager.component_map[CPLAYERSTATE_T], p_playerstate)
{ {
@ -875,6 +879,12 @@ static void level_do_action(Scene_t* scene, ActionType_t action, bool pressed)
case ACTION_RESTART: case ACTION_RESTART:
restart_editor_level(scene); restart_editor_level(scene);
break; break;
case ACTION_TOGGLE_GRID:
if (!pressed)
{
data->show_grid = !data->show_grid;
}
break;
default: default:
break; break;
} }
@ -894,6 +904,7 @@ void init_sandbox_scene(LevelScene_t* scene)
&scene->data, MAX_N_TILES, all_tiles, &scene->data, MAX_N_TILES, all_tiles,
(Rectangle){25, 25, VIEWABLE_MAP_WIDTH*TILE_SIZE, VIEWABLE_MAP_HEIGHT*TILE_SIZE} (Rectangle){25, 25, VIEWABLE_MAP_WIDTH*TILE_SIZE, VIEWABLE_MAP_HEIGHT*TILE_SIZE}
); );
scene->data.show_grid = true;
for (size_t i = 0; i < scene->data.tilemap.width; ++i) for (size_t i = 0; i < scene->data.tilemap.width; ++i)
{ {
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;
@ -1035,6 +1046,7 @@ void init_sandbox_scene(LevelScene_t* scene)
sc_map_put_64(&scene->scene.action_map, KEY_T, ACTION_CRATE_ACTIVATION); sc_map_put_64(&scene->scene.action_map, KEY_T, ACTION_CRATE_ACTIVATION);
sc_map_put_64(&scene->scene.action_map, KEY_L, ACTION_EXIT); sc_map_put_64(&scene->scene.action_map, KEY_L, ACTION_EXIT);
sc_map_put_64(&scene->scene.action_map, KEY_R, ACTION_RESTART); sc_map_put_64(&scene->scene.action_map, KEY_R, ACTION_RESTART);
sc_map_put_64(&scene->scene.action_map, KEY_H, ACTION_TOGGLE_GRID);
} }

2
scenes/scene_impl.h
View File

@ -42,12 +42,12 @@ typedef struct LevelSceneData {
TileGrid_t tilemap; TileGrid_t tilemap;
RenderTexture2D game_viewport; RenderTexture2D game_viewport;
Rectangle game_rec; Rectangle game_rec;
//Camera2D cam;
LevelCamera_t camera; LevelCamera_t camera;
Sprite_t* tile_sprites[MAX_TILE_SPRITES]; Sprite_t* tile_sprites[MAX_TILE_SPRITES];
LevelPack_t* level_pack; LevelPack_t* level_pack;
unsigned int current_level; unsigned int current_level;
CoinCounter_t coins; CoinCounter_t coins;
bool show_grid;
}LevelSceneData_t; }LevelSceneData_t;
typedef struct LevelScene { typedef struct LevelScene {

1
scenes/scene_systems.c
View File

@ -44,6 +44,7 @@ void init_level_scene_data(LevelSceneData_t* data, uint32_t max_tiles, Tile_t* t
data->tilemap.tiles[i].size = (Vector2){TILE_SIZE, TILE_SIZE}; data->tilemap.tiles[i].size = (Vector2){TILE_SIZE, TILE_SIZE};
} }
memset(&data->coins, 0, sizeof(data->coins)); memset(&data->coins, 0, sizeof(data->coins));
data->show_grid = false;
} }
void term_level_scene_data(LevelSceneData_t* data) void term_level_scene_data(LevelSceneData_t* data)