From 31cb0604462e920e61aa803f2030c5e523fb7958 Mon Sep 17 00:00:00 2001
From: adrienmalin <41926238+adrienmalin@users.noreply.github.com>
Date: Sun, 11 Nov 2018 14:52:08 +0100
Subject: [PATCH] split file and center I and O initial position
move Blobk and GhostBlock into a separate file
move tetroI and tetroO initial position a block to the right
---
src/main/python/block.py | 131 +++++++++++++++++++++++++++++++++++
src/main/python/game_gui.py | 4 +-
src/main/python/main.py | 4 +-
src/main/python/tetromino.py | 129 +---------------------------------
4 files changed, 138 insertions(+), 130 deletions(-)
create mode 100644 src/main/python/block.py
diff --git a/src/main/python/block.py b/src/main/python/block.py
new file mode 100644
index 0000000..d2c3949
--- /dev/null
+++ b/src/main/python/block.py
@@ -0,0 +1,131 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+
+from PyQt5 import QtCore, QtGui
+
+import consts
+from consts import U, D
+from point import Point
+
+
+class Block:
+ """
+ Mino or block
+ Mino : A single square-shaped building block of a shape called a Tetrimino.
+ Four Minos arranged into any of their various connected patterns is known as a Tetrimino
+ Block : A single block locked in a cell in the Grid
+ """
+
+ # Colors
+ BORDER_COLOR = consts.BLOCK_BORDER_COLOR
+ FILL_COLOR = consts.BLOCK_FILL_COLOR
+ GLOWING_BORDER_COLOR = consts.BLOCK_GLOWING_BORDER_COLOR
+ GLOWING_FILL_COLOR = consts.BLOCK_GLOWING_FILL_COLOR
+ LIGHT_COLOR = consts.BLOCK_LIGHT_COLOR
+ TRANSPARENT = consts.BLOCK_TRANSPARENT
+ GLOWING = consts.BLOCK_GLOWING
+
+ side = consts.BLOCK_INITIAL_SIDE
+
+ def __init__(self, coord, trail=0):
+ self.coord = coord
+ self.trail = trail
+ self.border_color = self.BORDER_COLOR
+ self.fill_color = self.FILL_COLOR
+ self.glowing = self.GLOWING
+
+ def paint(self, painter, top_left_corner, spotlight):
+ p = top_left_corner + self.coord * Block.side
+ block_center = Point(Block.side / 2, Block.side / 2)
+ self.center = p + block_center
+ spotlight = top_left_corner + Block.side * spotlight + block_center
+ self.glint = 0.15 * spotlight + 0.85 * self.center
+
+ if self.trail:
+ start = (
+ top_left_corner + (self.coord + Point(0, self.trail * U)) * Block.side
+ )
+ stop = top_left_corner + (self.coord + Point(0, 2 * D)) * Block.side
+ fill = QtGui.QLinearGradient(start, stop)
+ fill.setColorAt(0, self.LIGHT_COLOR)
+ fill.setColorAt(1, self.GLOWING_FILL_COLOR)
+ painter.setBrush(fill)
+ painter.setPen(QtCore.Qt.NoPen)
+ painter.drawRoundedRect(
+ start.x,
+ start.y,
+ Block.side,
+ Block.side * (1 + self.trail),
+ 20,
+ 20,
+ QtCore.Qt.RelativeSize,
+ )
+
+ if self.glowing:
+ fill = QtGui.QRadialGradient(self.center, self.glowing * Block.side)
+ fill.setColorAt(0, self.TRANSPARENT)
+ fill.setColorAt(0.5 / self.glowing, self.LIGHT_COLOR)
+ fill.setColorAt(1, self.TRANSPARENT)
+ painter.setBrush(QtGui.QBrush(fill))
+ painter.setPen(QtCore.Qt.NoPen)
+ painter.drawEllipse(
+ self.center.x - self.glowing * Block.side,
+ self.center.y - self.glowing * Block.side,
+ 2 * self.glowing * Block.side,
+ 2 * self.glowing * Block.side,
+ )
+
+ painter.setBrush(self.brush())
+ painter.setPen(self.pen())
+ painter.drawRoundedRect(
+ p.x + 1,
+ p.y + 1,
+ Block.side - 2,
+ Block.side - 2,
+ 20,
+ 20,
+ QtCore.Qt.RelativeSize,
+ )
+
+ def brush(self):
+ if self.fill_color is None:
+ return QtCore.Qt.NoBrush
+
+ fill = QtGui.QRadialGradient(self.glint, 1.5 * Block.side)
+ fill.setColorAt(0, self.fill_color.lighter())
+ fill.setColorAt(1, self.fill_color)
+ return QtGui.QBrush(fill)
+
+ def pen(self):
+ if self.border_color is None:
+ return QtCore.Qt.NoPen
+
+ border = QtGui.QRadialGradient(self.glint, Block.side)
+ border.setColorAt(0, self.border_color.lighter())
+ border.setColorAt(1, self.border_color.darker())
+ return QtGui.QPen(QtGui.QBrush(border), 1, join=QtCore.Qt.RoundJoin)
+
+ def shine(self, glowing=2, delay=None):
+ self.border_color = Block.GLOWING_BORDER_COLOR
+ self.fill_color = Block.GLOWING_FILL_COLOR
+ self.glowing = glowing
+ if delay:
+ QtCore.QTimer.singleShot(delay, self.fade)
+
+ def fade(self):
+ self.border_color = Block.BORDER_COLOR
+ self.fill_color = Block.FILL_COLOR
+ self.glowing = 0
+ self.trail = 0
+
+
+class GhostBlock(Block):
+ """
+ Mino of the ghost piece
+ """
+
+ BORDER_COLOR = consts.GHOST_BLOCK_BORDER_COLOR
+ FILL_COLOR = consts.GHOST_BLOCK_FILL_COLOR
+ GLOWING_FILL_COLOR = consts.GHOST_BLOCK_GLOWING_FILL_COLOR
+ GLOWING = consts.GHOST_BLOCK_GLOWING
\ No newline at end of file
diff --git a/src/main/python/game_gui.py b/src/main/python/game_gui.py
index c9c3070..41ca5ec 100644
--- a/src/main/python/game_gui.py
+++ b/src/main/python/game_gui.py
@@ -25,7 +25,7 @@ class Grid(QtWidgets.QWidget):
ROWS = consts.GRID_DEFAULT_ROWS + consts.GRID_INVISIBLE_ROWS
COLUMNS = consts.GRID_DEFAULT_COLUMNS
STARTING_POSITION = Point(
- consts.GRID_DEFAULT_COLUMNS // 2,
+ consts.GRID_DEFAULT_COLUMNS // 2 - 1,
consts.GRID_DEFAULT_ROWS // 2 + consts.GRID_INVISIBLE_ROWS,
)
GRIDLINE_COLOR = consts.GRID_GRIDLINE_COLOR
@@ -493,7 +493,7 @@ class NextQueue(Grid):
def insert_pieces(self):
for y, piece in enumerate(self.pieces):
- piece.insert_into(self, Point(3, 3 * y + 1))
+ piece.insert_into(self, self.STARTING_POSITION + Point(0, 3 * y - 4))
def paintEvent(self, event=None):
if not settings[s.OTHER][s.SHOW_NEXT_QUEUE]:
diff --git a/src/main/python/main.py b/src/main/python/main.py
index 2ded616..e8bff34 100644
--- a/src/main/python/main.py
+++ b/src/main/python/main.py
@@ -20,6 +20,6 @@ class AppContext(ApplicationContext): # 1. Subclass ApplicationContext
return self.app.exec_() # 3. End run() with this line
if __name__ == '__main__':
- appctxt = AppContext() # 4. Instantiate the subclass
- exit_code = appctxt.run() # 5. Invoke run()
+ app = AppContext() # 4. Instantiate the subclass
+ exit_code = app.run() # 5. Invoke run()
sys.exit(exit_code)
diff --git a/src/main/python/tetromino.py b/src/main/python/tetromino.py
index b6ce625..f70949c 100644
--- a/src/main/python/tetromino.py
+++ b/src/main/python/tetromino.py
@@ -3,133 +3,10 @@
import random
-from PyQt5 import QtCore, QtGui
-import consts
from consts import L, R, U, D, CLOCKWISE, COUNTERCLOCKWISE
from point import Point
-
-
-class Block:
- """
- Mino or block
- Mino : A single square-shaped building block of a shape called a Tetrimino.
- Four Minos arranged into any of their various connected patterns is known as a Tetrimino
- Block : A single block locked in a cell in the Grid
- """
-
- # Colors
- BORDER_COLOR = consts.BLOCK_BORDER_COLOR
- FILL_COLOR = consts.BLOCK_FILL_COLOR
- GLOWING_BORDER_COLOR = consts.BLOCK_GLOWING_BORDER_COLOR
- GLOWING_FILL_COLOR = consts.BLOCK_GLOWING_FILL_COLOR
- LIGHT_COLOR = consts.BLOCK_LIGHT_COLOR
- TRANSPARENT = consts.BLOCK_TRANSPARENT
- GLOWING = consts.BLOCK_GLOWING
-
- side = consts.BLOCK_INITIAL_SIDE
-
- def __init__(self, coord, trail=0):
- self.coord = coord
- self.trail = trail
- self.border_color = self.BORDER_COLOR
- self.fill_color = self.FILL_COLOR
- self.glowing = self.GLOWING
-
- def paint(self, painter, top_left_corner, spotlight):
- p = top_left_corner + self.coord * Block.side
- block_center = Point(Block.side / 2, Block.side / 2)
- self.center = p + block_center
- spotlight = top_left_corner + Block.side * spotlight + block_center
- self.glint = 0.15 * spotlight + 0.85 * self.center
-
- if self.trail:
- start = (
- top_left_corner + (self.coord + Point(0, self.trail * U)) * Block.side
- )
- stop = top_left_corner + (self.coord + Point(0, 2 * D)) * Block.side
- fill = QtGui.QLinearGradient(start, stop)
- fill.setColorAt(0, self.LIGHT_COLOR)
- fill.setColorAt(1, self.GLOWING_FILL_COLOR)
- painter.setBrush(fill)
- painter.setPen(QtCore.Qt.NoPen)
- painter.drawRoundedRect(
- start.x,
- start.y,
- Block.side,
- Block.side * (1 + self.trail),
- 20,
- 20,
- QtCore.Qt.RelativeSize,
- )
-
- if self.glowing:
- fill = QtGui.QRadialGradient(self.center, self.glowing * Block.side)
- fill.setColorAt(0, self.TRANSPARENT)
- fill.setColorAt(0.5 / self.glowing, self.LIGHT_COLOR)
- fill.setColorAt(1, self.TRANSPARENT)
- painter.setBrush(QtGui.QBrush(fill))
- painter.setPen(QtCore.Qt.NoPen)
- painter.drawEllipse(
- self.center.x - self.glowing * Block.side,
- self.center.y - self.glowing * Block.side,
- 2 * self.glowing * Block.side,
- 2 * self.glowing * Block.side,
- )
-
- painter.setBrush(self.brush())
- painter.setPen(self.pen())
- painter.drawRoundedRect(
- p.x + 1,
- p.y + 1,
- Block.side - 2,
- Block.side - 2,
- 20,
- 20,
- QtCore.Qt.RelativeSize,
- )
-
- def brush(self):
- if self.fill_color is None:
- return QtCore.Qt.NoBrush
-
- fill = QtGui.QRadialGradient(self.glint, 1.5 * Block.side)
- fill.setColorAt(0, self.fill_color.lighter())
- fill.setColorAt(1, self.fill_color)
- return QtGui.QBrush(fill)
-
- def pen(self):
- if self.border_color is None:
- return QtCore.Qt.NoPen
-
- border = QtGui.QRadialGradient(self.glint, Block.side)
- border.setColorAt(0, self.border_color.lighter())
- border.setColorAt(1, self.border_color.darker())
- return QtGui.QPen(QtGui.QBrush(border), 1, join=QtCore.Qt.RoundJoin)
-
- def shine(self, glowing=2, delay=None):
- self.border_color = Block.GLOWING_BORDER_COLOR
- self.fill_color = Block.GLOWING_FILL_COLOR
- self.glowing = glowing
- if delay:
- QtCore.QTimer.singleShot(delay, self.fade)
-
- def fade(self):
- self.border_color = Block.BORDER_COLOR
- self.fill_color = Block.FILL_COLOR
- self.glowing = 0
- self.trail = 0
-
-
-class GhostBlock(Block):
- """
- Mino of the ghost piece
- """
-
- BORDER_COLOR = consts.GHOST_BLOCK_BORDER_COLOR
- FILL_COLOR = consts.GHOST_BLOCK_FILL_COLOR
- GLOWING_FILL_COLOR = consts.GHOST_BLOCK_GLOWING_FILL_COLOR
- GLOWING = consts.GHOST_BLOCK_GLOWING
+from block import Block, GhostBlock
class MetaTetro(type):
@@ -285,7 +162,7 @@ class TetroI(Tetromino, metaclass=MetaTetro):
four minoes in a straight line
"""
- COORDS = (L, 0), (2 * L, 0), (0, 0), (R, 0)
+ COORDS = (L, 0), (0, 0), (R, 0), (2 * R, 0)
SUPER_ROTATION_SYSTEM = (
{
COUNTERCLOCKWISE: ((0, D), (L, D), (2 * R, D), (L, U), (2 * R, 2 * D)),
@@ -393,7 +270,7 @@ class TetroO(Tetromino, metaclass=MetaTetro):
four minoes in a 2×2 square.
"""
- COORDS = (0, 0), (L, 0), (0, U), (L, U)
+ COORDS = (R, 0), (0, 0), (R, U), (0, U)
def rotate(self, direction=1):
""" irrelevant """