thepigeongenerator/tetris_clone
1
0
Fork 0
mirror of https://github.com/thepigeongenerator/tetris_clone.git synced 2025-12-17 14:05:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

next block rendering

Browse Source
This commit is contained in:
Quinn
2025-02-03 16:24:12 +01:00
parent a9541812e0
commit be800d2612
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/game/game.c
View File

@@ -24,6 +24,7 @@ void next_shape(GameData* const game_data) {
game_data->curr_idx = 0; game_data->curr_idx = 0;
// BUG: seventh element is overritten (but when starting the seventh element will always be J if we just exclude the last one from sorting)
// shuffle the next shapes using a Fisher–Yates shuffle // shuffle the next shapes using a Fisher–Yates shuffle
for (uint8_t i = 0; i < (TETROMINO_COUNT - 1); i++) { for (uint8_t i = 0; i < (TETROMINO_COUNT - 1); i++) {
const uint8_t j = i + rand() % (TETROMINO_COUNT - i); const uint8_t j = i + rand() % (TETROMINO_COUNT - i);

14
src/window/renderer.c
View File

@@ -43,9 +43,8 @@ static inline void set_colour(SDL_Renderer* renderer, Colour8 c) {
(void)SDL_SetRenderDrawColor(renderer, colour8_red32(c), colour8_green32(c), colour8_blue32(c), 0xFF); (void)SDL_SetRenderDrawColor(renderer, colour8_red32(c), colour8_green32(c), colour8_blue32(c), 0xFF);
} }
// draw the selected block // draws a shape at the specified position
static void render_selected(SDL_Renderer* renderer, GameData* const game_data) { static void draw_shape(SDL_Renderer* const renderer, const ShapeId id, const int8_t pos_x, const int8_t pos_y) {
const ShapeId id = game_data->nxt[game_data->curr_idx];
const Shape shape = shape_from_id(id); const Shape shape = shape_from_id(id);
set_colour(renderer, colour_from_id(id)); set_colour(renderer, colour_from_id(id));
@@ -57,7 +56,7 @@ static void render_selected(SDL_Renderer* renderer, GameData* const game_data) {
for (int8_t x = 0; x < SHAPE_WIDTH; x++) for (int8_t x = 0; x < SHAPE_WIDTH; x++)
if (is_set(shape_row, x)) if (is_set(shape_row, x))
draw_block(renderer, game_data->sel_x + x, game_data->sel_y + y); draw_block(renderer, pos_x + x, pos_y + y);
} }
} }
@@ -76,7 +75,9 @@ static void render_level(SDL_Renderer* renderer, GameData* data) {
} }
void renderer_update(const RenderData* render_data) { void renderer_update(const RenderData* render_data) {
SDL_Renderer* renderer = render_data->renderer; SDL_Renderer* const renderer = render_data->renderer;
const GameData* game_data = render_data->game_data;
int success = 0; // if an error occurs, this value is <0 int success = 0; // if an error occurs, this value is <0
@@ -86,9 +87,10 @@ void renderer_update(const RenderData* render_data) {
set_colour(renderer, COLOUR_WHITE); set_colour(renderer, COLOUR_WHITE);
SDL_RenderDrawRect(renderer, &(SDL_Rect){TET_PADDING, TET_PADDING, TET_WIDTH + 1, TET_HEIGHT + 1}); SDL_RenderDrawRect(renderer, &(SDL_Rect){TET_PADDING, TET_PADDING, TET_WIDTH + 1, TET_HEIGHT + 1});
draw_shape(renderer, game_data->nxt[game_data->curr_idx + 1], COLUMNS, 2);
render_level(renderer, render_data->game_data); render_level(renderer, render_data->game_data);
render_selected(renderer, render_data->game_data); draw_shape(renderer, game_data->nxt[game_data->curr_idx], game_data->sel_x, game_data->sel_y);
if (success < 0) { if (success < 0) {
warn("something went wrong whilst renderering! SDL Error: %s\n", SDL_GetError()); warn("something went wrong whilst renderering! SDL Error: %s\n", SDL_GetError());