OOP-Projects-Java

commit 6138f400d734a434eb149ad765ba1bced9864a09
parent 5c835ceae0233601d3aeac3b47f989a237535473
Author: William Lindholm <william_lindholm@outlook.com>
Date:   Wed, 22 Mar 2023 01:08:44 +0100

Created gridlines

Diffstat:
M
OOP2023_a22willi_a21liltr_assignment4/src/game/Board.java
 | 
27
+++++++++++++++++++--------

1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/OOP2023_a22willi_a21liltr_assignment4/src/game/Board.java b/OOP2023_a22willi_a21liltr_assignment4/src/game/Board.java
@@ -16,7 +16,7 @@ import blocks.Poly;
 
 public class Board extends JPanel {
 	// size of window
-	private final Dimension size = new Dimension(495, 790);
+	private final Dimension size = new Dimension(490, 788);
 
 	private final Color backgroundColor = Color.DARK_GRAY;
 
@@ -105,7 +105,7 @@ public class Board extends JPanel {
 				int realX = position[0] + j;
 				int realY = position[1] + i;
 				if (shape[i][j] == 1) {
-					
+
 					// check X direction
 					if (realX + x >= grid.length || realX + x < 0) {
 						return false;
@@ -114,7 +114,6 @@ public class Board extends JPanel {
 						return false;
 					}
 
-
 					// check y direction
 					if (realY + y >= grid[0].length - 1) {
 						return false;
@@ -207,6 +206,9 @@ public class Board extends JPanel {
 	public void draw(Graphics g) {
 		clearBoard(g);
 
+		// generate grid lines
+		drawGrid(g);
+
 		// show score
 		drawScore(g);
 
@@ -256,11 +258,9 @@ public class Board extends JPanel {
 		if (getFallingPoly() != null) {
 			Poly poly = getFallingPoly();
 			int[][] shape = poly.getShape();
-			g.drawLine(poly.getPos()[0] * tileSize + (shape[0].length * tileSize) - 1,
-					poly.getPos()[1] * tileSize + shape.length * tileSize,
-					poly.getPos()[0] * tileSize + (shape[0].length * tileSize) - 1, size.height - tileSize * 2);
-			g.drawLine(poly.getPos()[0] * tileSize, poly.getPos()[1] * tileSize + shape.length * tileSize,
-					poly.getPos()[0] * tileSize, size.height - tileSize * 2);
+			g.drawLine(poly.getPos()[0] * tileSize + (shape[0].length * tileSize), 0,
+					poly.getPos()[0] * tileSize + (shape[0].length * tileSize), size.height);
+			g.drawLine(poly.getPos()[0] * tileSize, 0, poly.getPos()[0] * tileSize, size.height);
 		}
 	}
 
@@ -271,4 +271,15 @@ public class Board extends JPanel {
 		g.setFont(new Font("Helvetica", Font.PLAIN, tileSize));
 		g.drawString(scoreText, tileSize, g.getFontMetrics().getHeight());
 	}
+
+	private void drawGrid(Graphics g) {
+		g.setColor(Color.gray);
+
+		for (int x = 0; x < grid.length; x++) {
+			for (int y = 0; y < grid[0].length; y++) {
+				g.drawLine(x * tileSize, 0, x * tileSize, grid[0].length * tileSize);
+				g.drawLine(0, y * tileSize, grid[1].length * tileSize, y * tileSize);
+			}
+		}
+	}
 }