Merge pull request 'Rapport' (#53) from Rapport into master

Reviewed-on: #53
Reviewed-by: Mat_02 <diletomatteo@gmail.com>

app/src/main/java/school_project/Controller.java

@@ -8,7 +8,8 @@ import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyCombination;
 import javafx.stage.Screen;
 import javafx.stage.Stage;
-import school_project.Menu.MenuAccueil;
+import school_project.Scenes.GameUI;
+import school_project.Scenes.MenuAccueil;
 import school_project.Parsers.FileParserFactory;
 
 import java.io.File;
@@ -55,6 +56,13 @@ public class Controller extends Application {
                 }
             });
         }
+        else if(root instanceof MenuAccueil){
+            scene.setOnKeyPressed(event ->{
+                if(event.getCode()==KeyCode.ESCAPE){
+                    stage.close();
+                }
+            });
+        }
         stage.setScene(scene);
 
         stage.setFullScreen(true);

app/src/main/java/school_project/MapGenerator.java

@@ -93,7 +93,9 @@ public class MapGenerator {
                     }
                 }
             }
-            ret.addPiece(new Piece(shape));
+            Piece piece = new Piece(shape);
+            piece.RotateRight(rand.nextInt(4));
+            ret.addPiece(piece);
         }
 
         //generate pieces

app/src/main/java/school_project/Scenes/GameUI.java

@@ -1,10 +1,14 @@
-package school_project;
+package school_project.Scenes;
 
 import javafx.scene.Group;
 import javafx.scene.input.MouseButton;
 
-import school_project.Menu.ScreenLevelFinish;
+import school_project.Controller;
+import school_project.Map;
+import school_project.Piece;
+import school_project.Scenes.ScreenLevelFinish;
 import school_project.Utils.MatrixShape;
+import school_project.Vec2;
 
 import java.io.FileNotFoundException;
 

app/src/main/java/school_project/Scenes/MenuAccueil.java

@@ -1,4 +1,4 @@
-package school_project.Menu;
+package school_project.Scenes;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
@@ -8,7 +8,6 @@ import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
 import school_project.Controller;
-import school_project.GameUI;
 import school_project.MapGenerator;
 import school_project.Parsers.FileParserFactory;
 
@@ -30,7 +29,6 @@ public class MenuAccueil extends StackPane {
         Label Title = new Label("Welcome to Road to Master");
             SlctDifficulty.setOnAction(event -> {
                 String choosediff = SlctDifficulty.getSelectionModel().getSelectedItem();
-                System.out.println(choosediff);
                 switch (choosediff) {
                     case "Easy":
                         try {

app/src/main/java/school_project/Scenes/MenuLevel.java

@@ -1,4 +1,4 @@
-package school_project.Menu;
+package school_project.Scenes;
 
 import javafx.geometry.HPos;
 import javafx.geometry.Insets;
@@ -7,7 +7,6 @@ import javafx.scene.layout.ColumnConstraints;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.RowConstraints;
 import school_project.Controller;
-import school_project.GameUI;
 import school_project.Parsers.FileParserFactory;
 
 import java.io.File;
@@ -69,7 +68,6 @@ public class MenuLevel extends GridPane {
                 levelButton.setOnAction(event -> {
                     try {
                         String levelName = ((Button)event.getSource()).getText().replace(" ", "") + ".level";
-                        System.out.println(levelName);
                         GameUI level = new GameUI(FileParserFactory.loadMapFromFile(new File(Controller.class.getResource("levels/" + levelName).getFile())));
                         Controller.switchRoot(level);
                     } catch (IOException e) {

app/src/main/java/school_project/Scenes/ScreenLevelFinish.java

@@ -1,4 +1,4 @@
-package school_project.Menu;
+package school_project.Scenes;
 
 
 import javafx.geometry.Insets;
@@ -9,7 +9,6 @@ import javafx.scene.control.Label;
 import javafx.scene.layout.StackPane;
 import javafx.scene.text.Font;
 import school_project.Controller;
-import school_project.GameUI;
 import school_project.Map;
 import java.io.FileNotFoundException;
 

app/src/main/java/school_project/Utils/MatrixShape.java

@@ -8,6 +8,7 @@ import javafx.scene.layout.Pane;
 import javafx.scene.paint.Paint;
 import javafx.scene.shape.Rectangle;
 import school_project.*;
+import school_project.Scenes.GameUI;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;