diff options
Diffstat (limited to 'src/games/tetris/Tetromino.cpp')
| -rw-r--r-- | src/games/tetris/Tetromino.cpp | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/games/tetris/Tetromino.cpp b/src/games/tetris/Tetromino.cpp index 577a869..78ac68d 100644 --- a/src/games/tetris/Tetromino.cpp +++ b/src/games/tetris/Tetromino.cpp @@ -153,24 +153,24 @@ void Tetromino::GetBitmap(TetrominoId id, BoardPos pos, int32_t ori, uint16_t *b *dest = *src >> pos.x; } -V3F32 Tetromino::GetColor(TetrominoId id) { +Color Tetromino::GetColor(TetrominoId id) { using enum TetrominoId; - V3F32 color; + Color color; switch (id) { case TETROMINO_I: case TETROMINO_O: case TETROMINO_T: { - color = V3F32(0.8f, 0.8f, 0.8f); + color = {0.8f, 0.8f, 0.8f, 1.0f}; } break; case TETROMINO_J: case TETROMINO_S: { - color = V3F32(0.8f, 0.2f, 0.2f); + color = {0.8f, 0.2f, 0.2f, 1.0f}; } break; default: { - color = V3F32(0.2f, 0.4f, 0.2f); + color = {0.2f, 0.4f, 0.2f, 1.0f}; } } return color; @@ -201,10 +201,16 @@ void Tetromino::Draw(TetrominoId id, int32_t ori, V2F32 pos, float scale, Render 1.0f }; V2F32 world_dim = local_dim; + RectF32 world_rect = { + world_pos.x, + world_pos.y, + world_pos.x + world_dim.x, + world_pos.y + world_dim.y, + }; - V3F32 color = GetColor(id); - render_group.PushRectangle(world_pos, world_dim, color); + Color color = GetColor(id); + render_group.PushRectangle(world_rect, world_pos.z, color); } } } |
