adding TetrisTwoBlockApp

Author: trevorwslee

dumbdisplay_examples/tetris/tetris_common.py

@@ -63,4 +63,25 @@ def _draw_grid(grid: Grid, pen: LayerTurtle):
             color_number = grid.get_value(y, x)
             _draw(x, y, color_number, pen)
 
+def _check_can_place_block_grid(block_grid: Grid, block_grid_x_off: int, block_grid_y_offset: int, grid: Grid) -> bool:
+    for y in range(block_grid.n_rows):
+        for x in range(block_grid.n_cols):
+            if block_grid.get_value(y, x) != 0:
+                row_idx = y + block_grid_y_offset
+                col_idx = x + block_grid_x_off
+                if row_idx < 0 or row_idx >= grid.n_rows:
+                    return True
+                if col_idx < 0 or col_idx >= grid.n_cols:
+                    return True
+                if grid.get_value(row_idx, col_idx) != 0:
+                    return True
+    return False
+
+
+def _commit_block_grid(block_grid: Grid, block_grid_x_off: int, block_grid_y_offset: int, grid: Grid):
+    for y in range(block_grid.n_rows):
+        for x in range(block_grid.n_cols):
+            color = block_grid.get_value(y, x)
+            if color != 0:
+                grid.set_value(y + block_grid_y_offset, x + block_grid_x_off, color)
 

dumbdisplay_examples/tetris/tetris_one_block.py

@@ -157,7 +157,7 @@ def _create_grid() -> Grid:
 
 
 
-class Block:
+class OneBlock:
     def __init__(self, x: int, y: int, block_pen: LayerTurtle):
         # self.x = _INIT_BLOCK_X
         # self.y = 0
@@ -242,7 +242,7 @@ class Shape:
     def __init__(self, pen: LayerTurtle, block_pen: LayerTurtle):
         self.grid = _create_grid()
         self.score_count = 0
-        self.block: Block = None
+        self.block: OneBlock = None
         self.pen = pen
         self.block_pen = block_pen
         if not self.reset_block():
@@ -260,7 +260,7 @@ def reset_block(self) -> bool:
         if self.grid.get_value(y, x) != 0:
             #self.sync_image()
             return False
-        self.block = Block(x, y, self.block_pen)
+        self.block = OneBlock(x, y, self.block_pen)
         self.sync_image()
         return True
 

dumbdisplay_examples/tetris/tetris_two_block.py

@@ -10,7 +10,7 @@
 from dumbdisplay.layer_turtle import LayerTurtle
 from dumbdisplay.layer_lcd import LayerLcd
 from dumbdisplay_examples.tetris.tetris_common import Grid, _colors, _grid_n_rows, _grid_n_cols, _block_unit_width, \
-    _width, _height, _left, _top, _draw_grid
+    _width, _height, _left, _top, _draw_grid, _check_can_place_block_grid, _commit_block_grid
 
 from dumbdisplay_examples.utils import DDAppBase, create_example_wifi_dd
 
@@ -97,27 +97,27 @@ def _randomize_grid() -> Grid:
         grid_cells.append(grid_row)
     return Grid(grid_cells=grid_cells)
 
-def _check_can_place_block_grid(block_grid: Grid, block_grid_x_off: int, block_grid_y_offset: int, grid: Grid) -> bool:
-    for y in range(block_grid.n_rows):
-        for x in range(block_grid.n_cols):
-            if block_grid.get_value(y, x) != 0:
-                row_idx = y + block_grid_y_offset
-                col_idx = x + block_grid_x_off
-                if row_idx < 0 or row_idx >= grid.n_rows:
-                    return True
-                if col_idx < 0 or col_idx >= grid.n_cols:
-                    return True
-                if grid.get_value(row_idx, col_idx) != 0:
-                    return True
-    return False
-
-
-def _commit_block_grid(block_grid: Grid, block_grid_x_off: int, block_grid_y_offset: int, grid: Grid):
-    for y in range(block_grid.n_rows):
-        for x in range(block_grid.n_cols):
-            color = block_grid.get_value(y, x)
-            if color != 0:
-                grid.set_value(y + block_grid_y_offset, x + block_grid_x_off, color)
+# def _check_can_place_block_grid(block_grid: Grid, block_grid_x_off: int, block_grid_y_offset: int, grid: Grid) -> bool:
+#     for y in range(block_grid.n_rows):
+#         for x in range(block_grid.n_cols):
+#             if block_grid.get_value(y, x) != 0:
+#                 row_idx = y + block_grid_y_offset
+#                 col_idx = x + block_grid_x_off
+#                 if row_idx < 0 or row_idx >= grid.n_rows:
+#                     return True
+#                 if col_idx < 0 or col_idx >= grid.n_cols:
+#                     return True
+#                 if grid.get_value(row_idx, col_idx) != 0:
+#                     return True
+#     return False
+#
+#
+# def _commit_block_grid(block_grid: Grid, block_grid_x_off: int, block_grid_y_offset: int, grid: Grid):
+#     for y in range(block_grid.n_rows):
+#         for x in range(block_grid.n_cols):
+#             color = block_grid.get_value(y, x)
+#             if color != 0:
+#                 grid.set_value(y + block_grid_y_offset, x + block_grid_x_off, color)
 
 
 # def _draw(x, y, color_number, pen: LayerTurtle):
@@ -260,7 +260,7 @@ def sync_image(self):
         _draw_grid(self.grid, self.pen)
 
 
-class TetrisOneBlock2App(DDAppBase):
+class TetrisTwoBlockApp(DDAppBase):
     def __init__(self, dd: DumbDisplay = create_example_wifi_dd()):
         super().__init__(dd)
         self.score: LayerTurtle = None
@@ -426,5 +426,5 @@ def moveBlockRight(self) -> bool:
 
 if __name__ == "__main__":
     from dumbdisplay_examples.utils import create_example_wifi_dd, DDAppBase
-    app = TetrisOneBlock2App(create_example_wifi_dd())
+    app = TetrisTwoBlockApp(create_example_wifi_dd())
     app.run()