Cleaner code
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing

This commit is contained in:
Debucquoy Anthony 2023-05-04 23:24:18 +02:00
parent 507437298b
commit ef0ddae011
Signed by: tonitch
GPG Key ID: A78D6421F083D42E
2 changed files with 32 additions and 34 deletions

View File

@ -1,39 +1,43 @@
package school_project;
import javafx.application.Application;
import javafx.geometry.HPos;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.Parent;
import javafx.scene.Scene;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.control.Menu;
import javafx.scene.layout.BorderPane;
import javafx.scene.layout.ColumnConstraints;
import javafx.scene.layout.GridPane;
import javafx.scene.paint.Color;
import javafx.scene.text.Font;
import javafx.scene.input.KeyCombination;
import javafx.stage.Screen;
import javafx.stage.Stage;
import school_project.Menu.MenuAcceuil;
import school_project.Menu.MenuLevelDay1;
import school_project.Menu.MenuLevelDay2;
import school_project.Parsers.FileParserFactory;
import java.io.File;
import java.io.IOException;
public class Controller extends Application {
private Stage stage;
Parent root;
public static Vec2 screen_size;
public void start(Stage primaryStage) {
//set up the page
root = new MenuAcceuil();
public void start(Stage primaryStage) throws IOException {
stage = primaryStage;
stage.setTitle("ROAD TO MASTER YOU");
stage.setScene(new Scene(root));
stage.show();
screen_size = new Vec2(
(int) Screen.getPrimary().getBounds().getWidth(),
(int) Screen.getPrimary().getBounds().getHeight()
);
stage.setTitle("ROAD TO MASTER YOU");
// Full Screen mode
stage.setFullScreen(true);
stage.setFullScreenExitHint("");
primaryStage.setFullScreenExitKeyCombination(KeyCombination.NO_MATCH);
root = new GameUI(FileParserFactory.loadMapFromFile(new File(getClass().getResource("level11.level").getFile())));
Scene scene = new Scene(root, screen_size.x, screen_size.y);
stage.setScene(scene);
stage.show();
}
@ -44,6 +48,4 @@ public class Controller extends Application {
public static void main(String[] args) {
launch(args);
}
}
}

View File

@ -1,13 +1,7 @@
package school_project;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.Group;
import javafx.scene.input.MouseButton;
import javafx.scene.layout.BorderPane;
import javafx.scene.layout.HBox;
import javafx.scene.paint.Color;
import javafx.stage.Screen;
import school_project.Utils.MatrixShape;
import java.io.FileNotFoundException;
@ -19,10 +13,13 @@ public class GameUI extends Group{
super();
MatrixShape grid = new MatrixShape(level);
grid.setLayoutX(Screen.getPrimary().getBounds().getWidth()/2 - grid.boundary_size.x/2);
grid.setLayoutY(Screen.getPrimary().getBounds().getHeight()/2 - grid.boundary_size.y/2);
Group pieces = new Group();
//center the grid
grid.setLayoutX((Controller.screen_size.x - grid.boundary_size.x) >> 1);
grid.setLayoutY((Controller.screen_size.y - grid.boundary_size.y) >> 1);
getChildren().add(grid);
for (Piece p : level.getPieces()) {
MatrixShape _piece = new MatrixShape(p);
_piece.setOnMouseClicked(event -> {
@ -35,9 +32,8 @@ public class GameUI extends Group{
_piece.setLayoutX(event.getSceneX());
_piece.setLayoutY(event.getSceneY());
});
pieces.getChildren().add(_piece);
getChildren().add(_piece);
}
getChildren().addAll(grid, pieces);
}
}