Merge branch 'menu'
This commit is contained in:
@ -1,6 +1,3 @@
|
||||
/*
|
||||
* This Java source file was generated by the Gradle 'init' task.
|
||||
*/
|
||||
package school_project;
|
||||
|
||||
import javafx.application.Application;
|
||||
@ -10,14 +7,13 @@ import javafx.scene.Scene;
|
||||
import javafx.scene.input.KeyCombination;
|
||||
import javafx.stage.Screen;
|
||||
import javafx.stage.Stage;
|
||||
import school_project.Parsers.FileParserFactory;
|
||||
import school_project.Menu.MenuAcceuil;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
|
||||
|
||||
public class Controller extends Application {
|
||||
private Stage stage;
|
||||
private static Stage stage;
|
||||
Parent root;
|
||||
public static Vec2 screen_size;
|
||||
|
||||
@ -36,14 +32,20 @@ public class Controller extends Application {
|
||||
stage.setFullScreenExitHint("");
|
||||
primaryStage.setFullScreenExitKeyCombination(KeyCombination.NO_MATCH);
|
||||
|
||||
root = new GameUI(FileParserFactory.loadMapFromFile(new File(getClass().getResource("level11.level").getFile())));
|
||||
root = new MenuAcceuil();
|
||||
|
||||
Scene scene = new Scene(root, screen_size.x, screen_size.y);
|
||||
stage.setScene(scene);
|
||||
switchRoot(root);
|
||||
stage.show();
|
||||
}
|
||||
|
||||
|
||||
public static void switchRoot(Parent root){
|
||||
Scene scene = new Scene(root);
|
||||
stage.setScene(scene);
|
||||
}
|
||||
public static void main(String[] args) {
|
||||
launch();
|
||||
launch();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user