general refactoring, prepare breakout game

1 files changed, 17 insertions, 15 deletions

diff --git a/src/games/tetris/Tetromino.cpp b/src/games/tetris/Tetromino.cpp
index 94343c0..9179d6d 100644
--- a/src/games/tetris/Tetromino.cpp
+++ b/src/games/tetris/Tetromino.cpp
@@ -158,22 +158,24 @@ Color Tetromino::GetColor(TetrominoId id) {
     using enum TetrominoId;
 
     Color color;
+
     switch (id) {
-        case i_piece:
-        case o_piece:
-        case t_piece: {
-            color = {0.8f, 0.8f, 0.8f, 1.0f};
-        } break;
-
-        case j_piece:
-        case s_piece: {
-            color = {0.8f, 0.2f, 0.2f, 1.0f};
-        } break;
-
-        default: {
-            color = {0.2f, 0.4f, 0.2f, 1.0f};
-        }
+    case i_piece:
+    case o_piece:
+    case t_piece: {
+        color = {0.8f, 0.8f, 0.8f, 1.0f};
+    } break;
+
+    case j_piece:
+    case s_piece: {
+        color = {0.8f, 0.2f, 0.2f, 1.0f};
+    } break;
+
+    default: {
+        color = {0.2f, 0.4f, 0.2f, 1.0f};
     }
+    }
+
     return color;
 }
 
@@ -202,7 +204,7 @@ void Tetromino::Draw(TetrominoId id, int32_t ori, V2F32 pos, float scale) {
                     1.0f
                 };
                 V2F32 world_dim = local_dim;
-                RectF32 world_rect = {
+                Rectangle world_rect = {
                     world_pos.x,
                     world_pos.y,
                     world_pos.x + world_dim.x,