Adding back lost changes and finishing splitting last controllers.
- renamed fxml and their controllers to match - removed old controllers - finished lobby and lobbyhost controllers #story[1261]
This commit is contained in:
@@ -26,6 +26,7 @@ import javafx.stage.Stage;
|
||||
import javafx.stage.StageStyle;
|
||||
import javafx.stage.WindowEvent;
|
||||
import javafx.util.Duration;
|
||||
import mock.app.Event;
|
||||
import visualiser.gameController.Keys.KeyFactory;
|
||||
|
||||
public class App extends Application {
|
||||
@@ -36,8 +37,9 @@ public class App extends Application {
|
||||
private Label progressText;
|
||||
private static final int SPLASH_WIDTH = 676;
|
||||
private static final int SPLASH_HEIGHT = 227;
|
||||
public static KeyFactory keyFactory = new KeyFactory();
|
||||
public static App app;
|
||||
public static KeyFactory keyFactory;
|
||||
public static App app = new App();
|
||||
public static Event game;
|
||||
|
||||
/**
|
||||
* Entry point for running the programme
|
||||
@@ -50,6 +52,7 @@ public class App extends Application {
|
||||
@Override
|
||||
public void init() {
|
||||
// load the user's personalised key bindings
|
||||
keyFactory = new KeyFactory();
|
||||
keyFactory.load();
|
||||
|
||||
ImageView splash = new ImageView(new Image(
|
||||
@@ -103,11 +106,9 @@ public class App extends Application {
|
||||
}
|
||||
Thread.sleep(100);
|
||||
updateMessage("Burger's done!");
|
||||
|
||||
return addedFilling;
|
||||
}
|
||||
};
|
||||
|
||||
showSplash(
|
||||
stage,
|
||||
boatTask,
|
||||
@@ -120,7 +121,6 @@ public class App extends Application {
|
||||
}
|
||||
);
|
||||
new Thread(boatTask).start();
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -134,7 +134,7 @@ public class App extends Application {
|
||||
public void loadTitleScreen() throws Exception {
|
||||
stage = new Stage();
|
||||
FXMLLoader loader = new FXMLLoader(getClass().getResource
|
||||
("/visualiser/scenes/titleScreen.fxml"));
|
||||
("/visualiser/scenes/title.fxml"));
|
||||
Parent root = loader.load();
|
||||
stage.setResizable(false);
|
||||
Scene scene = new Scene(root);
|
||||
|
||||
Reference in New Issue
Block a user