From 9aa09f8fbd4fe676c6b4eecaefc7ca9a6a553dff Mon Sep 17 00:00:00 2001 From: Anthony Debucquoy Date: Wed, 10 May 2023 22:55:42 +0200 Subject: [PATCH 1/4] Method to add a piece to a map with it's position --- app/src/main/java/school_project/Map.java | 29 +++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/app/src/main/java/school_project/Map.java b/app/src/main/java/school_project/Map.java index 2beea88..5782721 100644 --- a/app/src/main/java/school_project/Map.java +++ b/app/src/main/java/school_project/Map.java @@ -28,6 +28,35 @@ public class Map extends Shape{ this.addPiece(p); } + /** + * try to place a piece on the map, return true if succeed and false if it failed + * @param piece the piece to place + * @param pos the position to place the piece in matrix position + * @return true if the piece can and is placed and false if it can't and won't not be palced + */ + public boolean placePiece(Piece piece, Vec2 pos){ + + if(!pieces.contains(piece)) + return false; + + // In the map limits + if ( pos.x + piece.height > height + || pos.y+piece.width > width + || pos.x < 0 + || pos.y < 0) + return false; + + for (int x = pos.x; x < pos.x + piece.height; x++) { + for (int y = pos.y; y < pos.y + piece.width; y++) { + if (!getShape()[x][y] && piece.getShape()[x - pos.x][y - pos.y]) { + return false; + } + } + } + piece.setPosition(pos); + return true; + } + /** * Return a matrix with all used space on the map to see if a piece can fit in a space * -- 2.46.0 From 4f821b44bcdafc33b6c015c092dffcff8e488ea1 Mon Sep 17 00:00:00 2001 From: Anthony Debucquoy Date: Wed, 10 May 2023 22:59:43 +0200 Subject: [PATCH 2/4] When a piece is placed at a position, check if this space is placable and place it there. --- app/src/main/java/school_project/GameUI.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/school_project/GameUI.java b/app/src/main/java/school_project/GameUI.java index 139109a..9b7491f 100644 --- a/app/src/main/java/school_project/GameUI.java +++ b/app/src/main/java/school_project/GameUI.java @@ -53,9 +53,20 @@ public class GameUI extends Group{ _piece.setLayoutX(event.getSceneX() - piece_pos_click.x); _piece.setLayoutY(event.getSceneY() - piece_pos_click.y); }); + _piece.setOnMouseReleased(event -> { + if(event.getSceneX() > grid.getLayoutX() && event.getSceneX() < grid.getLayoutX() + grid.boundary_size.x + && event.getSceneY() > grid.getLayoutY() && event.getSceneY() < grid.getLayoutY() + grid.boundary_size.y ) + { + // Inverted because screen is x →; y ↓ and matrix is x ↓; y → + Vec2 piece_position_in_grid = new Vec2( + (int) (_piece.getLayoutY() + (SEGMENT_SIZE+SPACE_SIZE)/2 - grid.getLayoutY())/(SEGMENT_SIZE+SPACE_SIZE), + (int) (_piece.getLayoutX() + (SEGMENT_SIZE+SPACE_SIZE)/2 - grid.getLayoutX())/(SEGMENT_SIZE+SPACE_SIZE) + ); + System.out.println(level.placePiece(p, piece_position_in_grid) + piece_position_in_grid.toString()); + } + }); getChildren().add(_piece); } - } -} +} \ No newline at end of file -- 2.46.0 From 334e0ad99be85941cfb5f39c0902cb82df8d5c86 Mon Sep 17 00:00:00 2001 From: Anthony Debucquoy Date: Thu, 11 May 2023 11:34:50 +0200 Subject: [PATCH 3/4] Piece overlap detection there is 3 addition: - `ArrayList getOccupation()` to get a list of all spot occupied by a piece - Fixing a bug to rotate right where width and height where inverted - Check if a piece is overlapping another when placing and refusing the placement if so --- app/src/main/java/school_project/Map.java | 14 +++++++++++++- app/src/main/java/school_project/Piece.java | 16 ++++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/school_project/Map.java b/app/src/main/java/school_project/Map.java index 5782721..f9f5be0 100644 --- a/app/src/main/java/school_project/Map.java +++ b/app/src/main/java/school_project/Map.java @@ -46,13 +46,25 @@ public class Map extends Shape{ || pos.y < 0) return false; + ArrayList occupation = new ArrayList<>(); + for(Piece p: pieces){ + if(p.getPosition() == null || p == piece) + continue; + for (Vec2 o : p.getOccupation()) { + occupation.add(o); + } + } + System.out.println(occupation); + for (int x = pos.x; x < pos.x + piece.height; x++) { for (int y = pos.y; y < pos.y + piece.width; y++) { - if (!getShape()[x][y] && piece.getShape()[x - pos.x][y - pos.y]) { + if ((!getShape()[x][y] || occupation.contains(new Vec2(x, y))) && piece.getShape()[x - pos.x][y - pos.y]) { return false; } } } + + piece.setPosition(pos); return true; } diff --git a/app/src/main/java/school_project/Piece.java b/app/src/main/java/school_project/Piece.java index 29ee035..21143d1 100644 --- a/app/src/main/java/school_project/Piece.java +++ b/app/src/main/java/school_project/Piece.java @@ -3,6 +3,7 @@ package school_project; import javafx.scene.paint.Color; import javafx.scene.paint.Paint; +import java.util.ArrayList; import java.util.Random; /** @@ -39,6 +40,17 @@ public class Piece extends Shape{ this.Position = position; } + public ArrayList getOccupation(){ + ArrayList ret = new ArrayList<>(); + for (int x = 0; x < height; x++) { + for (int y = 0; y < width; y++) { + if(getShape()[x][y]){ + ret.add(new Vec2(getPosition().x + x, getPosition().y + y)); + } + } + } + return ret; + } /** * set the map the piece is into the the map argument @@ -55,8 +67,6 @@ public class Piece extends Shape{ */ public void RotateRight(int times){ while(times > 0) { - height = matrix.length; - width = matrix[0].length; boolean[][] temp_matrix = new boolean[width][height]; for (int i = 0; i < width; i++) { for (int j = 0; j < height; j++) { @@ -65,6 +75,8 @@ public class Piece extends Shape{ } times--; matrix = temp_matrix; + height = matrix.length; + width = matrix[0].length; } } -- 2.46.0 From 0f1ecc753b0e4b3a2b8b958e960d5cc5987f11bb Mon Sep 17 00:00:00 2001 From: Anthony Debucquoy Date: Thu, 11 May 2023 11:47:16 +0200 Subject: [PATCH 4/4] leaving debug printing and reseting piece position if not placed --- app/src/main/java/school_project/Map.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/school_project/Map.java b/app/src/main/java/school_project/Map.java index f9f5be0..26dacd9 100644 --- a/app/src/main/java/school_project/Map.java +++ b/app/src/main/java/school_project/Map.java @@ -39,6 +39,7 @@ public class Map extends Shape{ if(!pieces.contains(piece)) return false; + piece.setPosition(null); // In the map limits if ( pos.x + piece.height > height || pos.y+piece.width > width @@ -54,7 +55,6 @@ public class Map extends Shape{ occupation.add(o); } } - System.out.println(occupation); for (int x = pos.x; x < pos.x + piece.height; x++) { for (int y = pos.y; y < pos.y + piece.width; y++) { @@ -64,7 +64,6 @@ public class Map extends Shape{ } } - piece.setPosition(pos); return true; } -- 2.46.0