Changed GameView and TrainAnimationViewDay so that the Game doesn't display the rooms, that way I could change the lobby into its boarderpane layout again and just add the gameview to the very front
This commit is contained in:
parent
0e6be2ee29
commit
da2e4049ff
@ -1,6 +1,7 @@
|
|||||||
package ch.unibas.dmi.dbis.cs108.multiplayer.client.gui;
|
package ch.unibas.dmi.dbis.cs108.multiplayer.client.gui;
|
||||||
|
|
||||||
import ch.unibas.dmi.dbis.cs108.BudaLogConfig;
|
import ch.unibas.dmi.dbis.cs108.BudaLogConfig;
|
||||||
|
import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.game.GameController;
|
||||||
import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.lounge.LoungeSceneViewController;
|
import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.lounge.LoungeSceneViewController;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
import java.util.ResourceBundle;
|
import java.util.ResourceBundle;
|
||||||
@ -20,9 +21,21 @@ public class TrainAnimationDayController implements Initializable {
|
|||||||
public static final BudaLogConfig l = new BudaLogConfig(LOGGER);
|
public static final BudaLogConfig l = new BudaLogConfig(LOGGER);
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
public ImageView wagonWallImageView;
|
private ImageView wagonWallImageView;
|
||||||
@FXML
|
@FXML
|
||||||
public ImageView foreGroundAnimationImageView1;
|
private ImageView foreGroundAnimationImageView1;
|
||||||
|
@FXML
|
||||||
|
private ImageView room0ImageView;
|
||||||
|
@FXML
|
||||||
|
private ImageView room1ImageView;
|
||||||
|
@FXML
|
||||||
|
private ImageView room2ImageView;
|
||||||
|
@FXML
|
||||||
|
private ImageView room3ImageView;
|
||||||
|
@FXML
|
||||||
|
private ImageView room4ImageView;
|
||||||
|
@FXML
|
||||||
|
private ImageView room5ImageView;
|
||||||
@FXML
|
@FXML
|
||||||
private ImageView backGroundAnimationImageView;
|
private ImageView backGroundAnimationImageView;
|
||||||
@FXML
|
@FXML
|
||||||
@ -54,11 +67,31 @@ public class TrainAnimationDayController implements Initializable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void updateSprites(){
|
public void updateSprites(){
|
||||||
|
Platform.runLater(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
try{
|
||||||
shadowTrain.setImage(Sprites.getShadow());
|
shadowTrain.setImage(Sprites.getShadow());
|
||||||
wagonBGImageView.setImage(Sprites.getSecondWagon());
|
wagonBGImageView.setImage(Sprites.getSecondWagon());
|
||||||
wagonFloorImageView.setImage(Sprites.getEmptyWagon());
|
wagonFloorImageView.setImage(Sprites.getEmptyWagon());
|
||||||
wagonFullImageView.setImage(Sprites.getFullWagon());
|
wagonFullImageView.setImage(Sprites.getFullWagon());
|
||||||
lokiImageView.setImage(Sprites.getLoki());
|
lokiImageView.setImage(Sprites.getLoki());
|
||||||
|
if(GameController.getGameStateModel().getDayClone()) {
|
||||||
|
Sprites.updateDayRoomSprites(GameController.getGameStateModel().getPassengerTrainClone()[1], GameController.getGameStateModel().getKickedOff());
|
||||||
|
} else {
|
||||||
|
Sprites.updateNightRoomSprites(GameController.getGameStateModel().getPassengerTrainClone()[1], GameController.getGameStateModel().getKickedOff());
|
||||||
|
}
|
||||||
|
room0ImageView.setImage(Sprites.getARoom(0));
|
||||||
|
room1ImageView.setImage(Sprites.getARoom(1));
|
||||||
|
room2ImageView.setImage(Sprites.getARoom(2));
|
||||||
|
room3ImageView.setImage(Sprites.getARoom(3));
|
||||||
|
room4ImageView.setImage(Sprites.getARoom(4));
|
||||||
|
room5ImageView.setImage(Sprites.getARoom(5));
|
||||||
|
} catch (Exception e) {
|
||||||
|
LOGGER.info(e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public ChatApp getChatApp() {
|
public ChatApp getChatApp() {
|
||||||
@ -81,6 +114,133 @@ public class TrainAnimationDayController implements Initializable {
|
|||||||
return wagonFullImageView;
|
return wagonFullImageView;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void moveRoom0Up() {
|
||||||
|
Platform.runLater(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
room0ImageView.setY(-20);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void moveRoom0Down() {
|
||||||
|
Platform.runLater(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
room0ImageView.setY(0);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void moveRoom1Up() {
|
||||||
|
Platform.runLater(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
room1ImageView.setY(-20);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void moveRoom1Down() {
|
||||||
|
Platform.runLater(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
room1ImageView.setY(0);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void moveRoom2Up() {
|
||||||
|
Platform.runLater(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
room2ImageView.setY(-20);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void moveRoom2Down() {
|
||||||
|
Platform.runLater(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
room2ImageView.setY(0);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void moveRoom3Up() {
|
||||||
|
Platform.runLater(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
room3ImageView.setY(-20);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void moveRoom3Down() {
|
||||||
|
Platform.runLater(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
room3ImageView.setY(0);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void moveRoom4Up() {
|
||||||
|
Platform.runLater(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
room4ImageView.setY(-20);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void moveRoom4Down() {
|
||||||
|
Platform.runLater(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
room4ImageView.setY(0);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void moveRoom5Up() {
|
||||||
|
Platform.runLater(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
room5ImageView.setY(-20);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void moveRoom5Down() {
|
||||||
|
Platform.runLater(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
room5ImageView.setY(0);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void showFullWagon() {
|
||||||
|
Platform.runLater(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
wagonFullImageView.setVisible(true);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void dontShowFullWagon() {
|
||||||
|
Platform.runLater(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
wagonFullImageView.setVisible(false);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void initialize(URL location, ResourceBundle resources) {
|
public void initialize(URL location, ResourceBundle resources) {
|
||||||
LoungeSceneViewController.setTrainAnimationDayController(this);
|
LoungeSceneViewController.setTrainAnimationDayController(this);
|
||||||
@ -101,61 +261,4 @@ public class TrainAnimationDayController implements Initializable {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public void showFullWagon() {
|
|
||||||
Platform.runLater(new Runnable() {
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
wagonFullImageView.setVisible(true);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public void dontShowFullWagon() {
|
|
||||||
Platform.runLater(new Runnable() {
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
wagonFullImageView.setVisible(false);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adds the gameView to the existing LobbyView
|
|
||||||
*/
|
|
||||||
public void addGameView(ChatApp c) {
|
|
||||||
Platform.runLater(new Runnable() {
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
try {
|
|
||||||
TrainAnimationDayController controller = new TrainAnimationDayController();
|
|
||||||
LOGGER.debug(gamePane);
|
|
||||||
LOGGER.debug(loki);
|
|
||||||
LOGGER.debug(cApp);
|
|
||||||
gameAnchorPane.getChildren().add(c.game);
|
|
||||||
wagonFullImageView.setVisible(false);
|
|
||||||
} catch (Exception e) {
|
|
||||||
LOGGER.debug("Not yet initialized");
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Removes the GameView again - needed when a game is over or a lobby is left
|
|
||||||
*/
|
|
||||||
public void removeGameView(ChatApp c) {
|
|
||||||
Platform.runLater(new Runnable() {
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
try {
|
|
||||||
gameAnchorPane.getChildren().clear();
|
|
||||||
wagonFullImageView.setVisible(true);
|
|
||||||
} catch (Exception e) {
|
|
||||||
LOGGER.debug("Not yet initialized");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -7,6 +7,7 @@ import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.GameStateModel;
|
|||||||
import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.Sprites;
|
import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.Sprites;
|
||||||
import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.SpritesDay;
|
import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.SpritesDay;
|
||||||
import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.TrainAnimationDayController;
|
import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.TrainAnimationDayController;
|
||||||
|
import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.lounge.LoungeSceneViewController;
|
||||||
import ch.unibas.dmi.dbis.cs108.multiplayer.helpers.GuiParameters;
|
import ch.unibas.dmi.dbis.cs108.multiplayer.helpers.GuiParameters;
|
||||||
import ch.unibas.dmi.dbis.cs108.BudaLogConfig;
|
import ch.unibas.dmi.dbis.cs108.BudaLogConfig;
|
||||||
import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.ClientModel;
|
import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.ClientModel;
|
||||||
@ -138,12 +139,12 @@ public class GameController implements Initializable {
|
|||||||
} else {
|
} else {
|
||||||
Sprites.updateNightRoomSprites(gameStateModel.getPassengerTrainClone()[1], gameStateModel.getKickedOff());
|
Sprites.updateNightRoomSprites(gameStateModel.getPassengerTrainClone()[1], gameStateModel.getKickedOff());
|
||||||
}
|
}
|
||||||
room0ImageView.setImage(Sprites.getARoom(0));
|
/*room0ImageView.setImage(Sprites.getARoom(0));
|
||||||
room1ImageView.setImage(Sprites.getARoom(1));
|
room1ImageView.setImage(Sprites.getARoom(1));
|
||||||
room2ImageView.setImage(Sprites.getARoom(2));
|
room2ImageView.setImage(Sprites.getARoom(2));
|
||||||
room3ImageView.setImage(Sprites.getARoom(3));
|
room3ImageView.setImage(Sprites.getARoom(3));
|
||||||
room4ImageView.setImage(Sprites.getARoom(4));
|
room4ImageView.setImage(Sprites.getARoom(4));
|
||||||
room5ImageView.setImage(Sprites.getARoom(5));
|
room5ImageView.setImage(Sprites.getARoom(5));*/
|
||||||
trainAnimation.updateSprites();
|
trainAnimation.updateSprites();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LOGGER.info(e.getMessage());
|
LOGGER.info(e.getMessage());
|
||||||
@ -160,6 +161,7 @@ public class GameController implements Initializable {
|
|||||||
return chatAreaGame;
|
return chatAreaGame;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void setVoteButtonVisibilityDay(GameStateModel g){
|
public void setVoteButtonVisibilityDay(GameStateModel g){
|
||||||
Platform.runLater(new Runnable() {
|
Platform.runLater(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
@ -236,21 +238,11 @@ public class GameController implements Initializable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void moveRoom0Up() {
|
public void moveRoom0Up() {
|
||||||
Platform.runLater(new Runnable() {
|
LoungeSceneViewController.getTrainAnimationDayController().moveRoom0Up();
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
room0ImageView.setY(-20);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void moveRoom0Down() {
|
public void moveRoom0Down() {
|
||||||
Platform.runLater(new Runnable() {
|
LoungeSceneViewController.getTrainAnimationDayController().moveRoom0Down();
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
room0ImageView.setY(0);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -261,21 +253,11 @@ public class GameController implements Initializable {
|
|||||||
.sendMsgToServer(Protocol.votedFor + "$" + client.getClient().getPosition() + "$" + 1);
|
.sendMsgToServer(Protocol.votedFor + "$" + client.getClient().getPosition() + "$" + 1);
|
||||||
}
|
}
|
||||||
public void moveRoom1Up() {
|
public void moveRoom1Up() {
|
||||||
Platform.runLater(new Runnable() {
|
LoungeSceneViewController.getTrainAnimationDayController().moveRoom1Up();
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
room1ImageView.setY(-20);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void moveRoom1Down() {
|
public void moveRoom1Down() {
|
||||||
Platform.runLater(new Runnable() {
|
LoungeSceneViewController.getTrainAnimationDayController().moveRoom1Down();
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
room1ImageView.setY(0);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -287,21 +269,11 @@ public class GameController implements Initializable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void moveRoom2Up() {
|
public void moveRoom2Up() {
|
||||||
Platform.runLater(new Runnable() {
|
LoungeSceneViewController.getTrainAnimationDayController().moveRoom2Up();
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
room2ImageView.setY(-20);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void moveRoom2Down() {
|
public void moveRoom2Down() {
|
||||||
Platform.runLater(new Runnable() {
|
LoungeSceneViewController.getTrainAnimationDayController().moveRoom2Down();
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
room2ImageView.setY(0);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -312,21 +284,11 @@ public class GameController implements Initializable {
|
|||||||
.sendMsgToServer(Protocol.votedFor + "$" + client.getClient().getPosition() + "$" + 3);
|
.sendMsgToServer(Protocol.votedFor + "$" + client.getClient().getPosition() + "$" + 3);
|
||||||
}
|
}
|
||||||
public void moveRoom3Up() {
|
public void moveRoom3Up() {
|
||||||
Platform.runLater(new Runnable() {
|
LoungeSceneViewController.getTrainAnimationDayController().moveRoom3Up();
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
room3ImageView.setY(-20);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void moveRoom3Down() {
|
public void moveRoom3Down() {
|
||||||
Platform.runLater(new Runnable() {
|
LoungeSceneViewController.getTrainAnimationDayController().moveRoom3Down();
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
room3ImageView.setY(0);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -337,21 +299,11 @@ public class GameController implements Initializable {
|
|||||||
.sendMsgToServer(Protocol.votedFor + "$" + client.getClient().getPosition() + "$" + 4);
|
.sendMsgToServer(Protocol.votedFor + "$" + client.getClient().getPosition() + "$" + 4);
|
||||||
}
|
}
|
||||||
public void moveRoom4Up() {
|
public void moveRoom4Up() {
|
||||||
Platform.runLater(new Runnable() {
|
LoungeSceneViewController.getTrainAnimationDayController().moveRoom4Up();
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
room4ImageView.setY(-20);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void moveRoom4Down() {
|
public void moveRoom4Down() {
|
||||||
Platform.runLater(new Runnable() {
|
LoungeSceneViewController.getTrainAnimationDayController().moveRoom4Down();
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
room4ImageView.setY(0);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -362,21 +314,11 @@ public class GameController implements Initializable {
|
|||||||
.sendMsgToServer(Protocol.votedFor + "$" + client.getClient().getPosition() + "$" + 5);
|
.sendMsgToServer(Protocol.votedFor + "$" + client.getClient().getPosition() + "$" + 5);
|
||||||
}
|
}
|
||||||
public void moveRoom5Up() {
|
public void moveRoom5Up() {
|
||||||
Platform.runLater(new Runnable() {
|
LoungeSceneViewController.getTrainAnimationDayController().moveRoom5Up();
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
room5ImageView.setY(-20);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void moveRoom5Down() {
|
public void moveRoom5Down() {
|
||||||
Platform.runLater(new Runnable() {
|
LoungeSceneViewController.getTrainAnimationDayController().moveRoom5Down();
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
room5ImageView.setY(0);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -423,6 +365,7 @@ public class GameController implements Initializable {
|
|||||||
Text notification = new Text(System.lineSeparator() + msg);
|
Text notification = new Text(System.lineSeparator() + msg);
|
||||||
notification.setFill(Color.BLACK);
|
notification.setFill(Color.BLACK);
|
||||||
notification.setStyle("-fx-font: 50 arial;");
|
notification.setStyle("-fx-font: 50 arial;");
|
||||||
|
try {
|
||||||
Platform.runLater(new Runnable() {
|
Platform.runLater(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
@ -433,6 +376,9 @@ public class GameController implements Initializable {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
} catch (Exception e) {
|
||||||
|
LOGGER.warn(e.getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
//TODO: Wait for a certain time, then clear all again
|
//TODO: Wait for a certain time, then clear all again
|
||||||
}
|
}
|
||||||
@ -709,6 +655,7 @@ public class GameController implements Initializable {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void initialize(URL location, ResourceBundle resources) {
|
public void initialize(URL location, ResourceBundle resources) {
|
||||||
|
noiseButton.toFront();
|
||||||
ChatApp.setGameController(this);
|
ChatApp.setGameController(this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -49,7 +49,9 @@ public class LoungeSceneViewController implements Initializable {
|
|||||||
public static final BudaLogConfig l = new BudaLogConfig(LOGGER);
|
public static final BudaLogConfig l = new BudaLogConfig(LOGGER);
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
public AnchorPane buttonPane;
|
private AnchorPane buttonPane;
|
||||||
|
@FXML
|
||||||
|
private AnchorPane buttonLobbyPane;
|
||||||
@FXML
|
@FXML
|
||||||
private AnchorPane backGroundAnimationPane;
|
private AnchorPane backGroundAnimationPane;
|
||||||
|
|
||||||
@ -264,10 +266,9 @@ public class LoungeSceneViewController implements Initializable {
|
|||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
try {
|
try {
|
||||||
LOGGER.debug(" in addGameView()" + chatApp);
|
LOGGER.debug(" in GameView()" + chatApp);
|
||||||
newGameButton.setVisible(false);
|
buttonLobbyPane.setVisible(false);
|
||||||
startGame.setVisible(false);
|
gameDisplayAnchorPane.getChildren().add(chatApp.game);
|
||||||
trainAnimationDayController.addGameView(chatApp);
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LOGGER.debug("Not yet initialized");
|
LOGGER.debug("Not yet initialized");
|
||||||
}
|
}
|
||||||
@ -283,9 +284,8 @@ public class LoungeSceneViewController implements Initializable {
|
|||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
try {
|
try {
|
||||||
newGameButton.setVisible(true);
|
buttonLobbyPane.setVisible(true);
|
||||||
startGame.setVisible(true);
|
gameDisplayAnchorPane.getChildren().clear();
|
||||||
trainAnimationDayController.removeGameView(chatApp);
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LOGGER.debug("Not yet initialized");
|
LOGGER.debug("Not yet initialized");
|
||||||
}
|
}
|
||||||
@ -316,7 +316,7 @@ public class LoungeSceneViewController implements Initializable {
|
|||||||
public void run() {
|
public void run() {
|
||||||
try {
|
try {
|
||||||
LOGGER.debug("in addBackgroundDay() run()");
|
LOGGER.debug("in addBackgroundDay() run()");
|
||||||
gameDisplayAnchorPane.getChildren().add(chatApp.backgroundDay);
|
backGroundAnimationPane.getChildren().add(chatApp.backgroundDay);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
@ -402,7 +402,6 @@ public class LoungeSceneViewController implements Initializable {
|
|||||||
*/
|
*/
|
||||||
public void startGame() {
|
public void startGame() {
|
||||||
client.getClient().sendMsgToServer(Protocol.startANewGame);
|
client.getClient().sendMsgToServer(Protocol.startANewGame);
|
||||||
//addGameView();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -26,6 +26,36 @@
|
|||||||
<Image url="@game/Day/Empty_Wagon.png" />
|
<Image url="@game/Day/Empty_Wagon.png" />
|
||||||
</image>
|
</image>
|
||||||
</ImageView>
|
</ImageView>
|
||||||
|
<ImageView fx:id="room0ImageView" fitHeight="843.75" fitWidth="1500.0" pickOnBounds="true" preserveRatio="true">
|
||||||
|
<image>
|
||||||
|
<Image url="@game/Day/Room1.png" />
|
||||||
|
</image>
|
||||||
|
</ImageView>
|
||||||
|
<ImageView fx:id="room1ImageView" fitHeight="843.75" fitWidth="1500.0" pickOnBounds="true" preserveRatio="true">
|
||||||
|
<image>
|
||||||
|
<Image url="@game/Day/Room2.png" />
|
||||||
|
</image>
|
||||||
|
</ImageView>
|
||||||
|
<ImageView fx:id="room2ImageView" fitHeight="843.75" fitWidth="1500.0" pickOnBounds="true" preserveRatio="true">
|
||||||
|
<image>
|
||||||
|
<Image url="@game/Day/Room3.png" />
|
||||||
|
</image>
|
||||||
|
</ImageView>
|
||||||
|
<ImageView fx:id="room3ImageView" fitHeight="843.75" fitWidth="1500.0" pickOnBounds="true" preserveRatio="true">
|
||||||
|
<image>
|
||||||
|
<Image url="@game/Day/Room4.png" />
|
||||||
|
</image>
|
||||||
|
</ImageView>
|
||||||
|
<ImageView fx:id="room4ImageView" fitHeight="843.75" fitWidth="1500.0" pickOnBounds="true" preserveRatio="true">
|
||||||
|
<image>
|
||||||
|
<Image url="@game/Day/Room5.png" />
|
||||||
|
</image>
|
||||||
|
</ImageView>
|
||||||
|
<ImageView fx:id="room5ImageView" fitHeight="843.75" fitWidth="1500.0" pickOnBounds="true" preserveRatio="true">
|
||||||
|
<image>
|
||||||
|
<Image url="@game/Day/Room6.png" />
|
||||||
|
</image>
|
||||||
|
</ImageView>
|
||||||
<AnchorPane fx:id="gameAnchorPane" pickOnBounds="false" />
|
<AnchorPane fx:id="gameAnchorPane" pickOnBounds="false" />
|
||||||
<ImageView fx:id="wagonWallImageView" fitHeight="843.75" fitWidth="1500.0" mouseTransparent="true" preserveRatio="true">
|
<ImageView fx:id="wagonWallImageView" fitHeight="843.75" fitWidth="1500.0" mouseTransparent="true" preserveRatio="true">
|
||||||
<image>
|
<image>
|
||||||
|
|||||||
@ -11,32 +11,32 @@
|
|||||||
|
|
||||||
<AnchorPane id="BG" fx:id="gameBG" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" pickOnBounds="false" prefHeight="843.75" prefWidth="1500.0" styleClass="theme" stylesheets="@GameDay.css" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.game.GameController">
|
<AnchorPane id="BG" fx:id="gameBG" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" pickOnBounds="false" prefHeight="843.75" prefWidth="1500.0" styleClass="theme" stylesheets="@GameDay.css" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.game.GameController">
|
||||||
<children>
|
<children>
|
||||||
<ImageView fx:id="room0ImageView" fitHeight="843.75" fitWidth="1500.0" preserveRatio="true">
|
<ImageView fx:id="room0ImageView" fitHeight="843.75" fitWidth="1500.0" opacity="0.0" preserveRatio="true">
|
||||||
<image>
|
<image>
|
||||||
<Image url="@Day/Room1.png" />
|
<Image url="@Day/Room1.png" />
|
||||||
</image>
|
</image>
|
||||||
</ImageView>
|
</ImageView>
|
||||||
<ImageView fx:id="room1ImageView" fitHeight="843.75" fitWidth="1500.0" preserveRatio="true">
|
<ImageView fx:id="room1ImageView" fitHeight="843.75" fitWidth="1500.0" opacity="0.0" preserveRatio="true">
|
||||||
<image>
|
<image>
|
||||||
<Image url="@Day/Room2.png" />
|
<Image url="@Day/Room2.png" />
|
||||||
</image>
|
</image>
|
||||||
</ImageView>
|
</ImageView>
|
||||||
<ImageView fx:id="room2ImageView" fitHeight="843.75" fitWidth="1500.0" preserveRatio="true">
|
<ImageView fx:id="room2ImageView" fitHeight="843.75" fitWidth="1500.0" opacity="0.0" preserveRatio="true">
|
||||||
<image>
|
<image>
|
||||||
<Image url="@Day/Room3.png" />
|
<Image url="@Day/Room3.png" />
|
||||||
</image>
|
</image>
|
||||||
</ImageView>
|
</ImageView>
|
||||||
<ImageView fx:id="room3ImageView" fitHeight="843.75" fitWidth="1500.0" preserveRatio="true">
|
<ImageView fx:id="room3ImageView" fitHeight="843.75" fitWidth="1500.0" opacity="0.0" preserveRatio="true">
|
||||||
<image>
|
<image>
|
||||||
<Image url="@Day/Room4.png" />
|
<Image url="@Day/Room4.png" />
|
||||||
</image>
|
</image>
|
||||||
</ImageView>
|
</ImageView>
|
||||||
<ImageView fx:id="room4ImageView" fitHeight="843.75" fitWidth="1500.0" preserveRatio="true">
|
<ImageView fx:id="room4ImageView" fitHeight="843.75" fitWidth="1500.0" opacity="0.0" preserveRatio="true">
|
||||||
<image>
|
<image>
|
||||||
<Image url="@Day/Room5.png" />
|
<Image url="@Day/Room5.png" />
|
||||||
</image>
|
</image>
|
||||||
</ImageView>
|
</ImageView>
|
||||||
<ImageView fx:id="room5ImageView" fitHeight="843.75" fitWidth="1500.0" preserveRatio="true">
|
<ImageView fx:id="room5ImageView" fitHeight="843.75" fitWidth="1500.0" opacity="0.0" preserveRatio="true">
|
||||||
<image>
|
<image>
|
||||||
<Image url="@Day/Room6.png" />
|
<Image url="@Day/Room6.png" />
|
||||||
</image>
|
</image>
|
||||||
|
|||||||
@ -10,14 +10,13 @@
|
|||||||
|
|
||||||
<AnchorPane fx:id="backGroundAnchorPane" pickOnBounds="false" stylesheets="@loungStyle.css" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.lounge.LoungeSceneViewController">
|
<AnchorPane fx:id="backGroundAnchorPane" pickOnBounds="false" stylesheets="@loungStyle.css" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.lounge.LoungeSceneViewController">
|
||||||
<children>
|
<children>
|
||||||
|
<AnchorPane fx:id="backGroundAnimationPane" maxHeight="843.75" maxWidth="1500.0" />
|
||||||
<BorderPane fx:id="LoungeSceneBorderPane" layoutX="860.0" layoutY="440.0" pickOnBounds="false" stylesheets="@boarderPane.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
|
<BorderPane fx:id="LoungeSceneBorderPane" layoutX="860.0" layoutY="440.0" pickOnBounds="false" stylesheets="@boarderPane.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
|
||||||
<right>
|
<right>
|
||||||
<ListView fx:id="LobbyListView" opacity="0.0" pickOnBounds="false" BorderPane.alignment="CENTER" />
|
<ListView fx:id="LobbyListView" opacity="0.0" pickOnBounds="false" BorderPane.alignment="CENTER" />
|
||||||
</right>
|
</right>
|
||||||
</BorderPane>
|
<top>
|
||||||
<AnchorPane fx:id="backGroundAnimationPane" maxHeight="843.75" maxWidth="1500.0" />
|
<ToolBar fx:id="NTtBToolBar" pickOnBounds="false" prefHeight="30.0" BorderPane.alignment="CENTER">
|
||||||
<AnchorPane fx:id="gameDisplayAnchorPane" maxHeight="843.75" maxWidth="1500.0" pickOnBounds="false" />
|
|
||||||
<ToolBar fx:id="NTtBToolBar" pickOnBounds="false" prefHeight="30.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
|
|
||||||
<items>
|
<items>
|
||||||
<Button fx:id="highScoreButton" mnemonicParsing="false" onAction="#sendHIghScore" pickOnBounds="false" text="High Score" />
|
<Button fx:id="highScoreButton" mnemonicParsing="false" onAction="#sendHIghScore" pickOnBounds="false" text="High Score" />
|
||||||
<Button fx:id="lobbyPrintButton" mnemonicParsing="false" onAction="#sendLilstle" pickOnBounds="false" text="Lobby List" />
|
<Button fx:id="lobbyPrintButton" mnemonicParsing="false" onAction="#sendLilstle" pickOnBounds="false" text="Lobby List" />
|
||||||
@ -26,7 +25,9 @@
|
|||||||
<Button fx:id="ChangeNameButton" mnemonicParsing="false" pickOnBounds="false" text="Change Name" />
|
<Button fx:id="ChangeNameButton" mnemonicParsing="false" pickOnBounds="false" text="Change Name" />
|
||||||
</items>
|
</items>
|
||||||
</ToolBar>
|
</ToolBar>
|
||||||
<AnchorPane prefHeight="316.0" prefWidth="181.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="35.0">
|
</top>
|
||||||
|
<left>
|
||||||
|
<AnchorPane prefHeight="316.0" prefWidth="181.0" BorderPane.alignment="CENTER">
|
||||||
<children>
|
<children>
|
||||||
<Label layoutX="59.0" layoutY="200.0" pickOnBounds="false" text="High Score:" />
|
<Label layoutX="59.0" layoutY="200.0" pickOnBounds="false" text="High Score:" />
|
||||||
<TextFlow fx:id="highScore" layoutX="62.0" layoutY="232.0" pickOnBounds="false" prefHeight="167.0" prefWidth="181.0" AnchorPane.bottomAnchor="1.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="232.0" />
|
<TextFlow fx:id="highScore" layoutX="62.0" layoutY="232.0" pickOnBounds="false" prefHeight="167.0" prefWidth="181.0" AnchorPane.bottomAnchor="1.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="232.0" />
|
||||||
@ -34,13 +35,20 @@
|
|||||||
<TextFlow fx:id="lobbyPrint" layoutX="5.0" layoutY="23.0" pickOnBounds="false" prefHeight="178.0" prefWidth="171.0" />
|
<TextFlow fx:id="lobbyPrint" layoutX="5.0" layoutY="23.0" pickOnBounds="false" prefHeight="178.0" prefWidth="171.0" />
|
||||||
</children>
|
</children>
|
||||||
</AnchorPane>
|
</AnchorPane>
|
||||||
<AnchorPane pickOnBounds="false" prefHeight="122.0" prefWidth="85.0" AnchorPane.bottomAnchor="200.0" AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="35.0">
|
</left>
|
||||||
|
<center>
|
||||||
|
<AnchorPane fx:id="buttonLobbyPane" pickOnBounds="false" prefHeight="122.0" prefWidth="85.0" BorderPane.alignment="CENTER">
|
||||||
<children>
|
<children>
|
||||||
<Button fx:id="newGameButton" layoutX="9.0" layoutY="109.0" mnemonicParsing="false" pickOnBounds="false" text="New Lobby" AnchorPane.rightAnchor="0.0" />
|
<Button fx:id="newGameButton" layoutX="9.0" layoutY="109.0" mnemonicParsing="false" pickOnBounds="false" text="New Lobby" AnchorPane.leftAnchor="9.0" />
|
||||||
<AnchorPane fx:id="gameAnchorPane" pickOnBounds="false" />
|
<AnchorPane fx:id="gameAnchorPane" pickOnBounds="false" />
|
||||||
<Button fx:id="startGame" alignment="BASELINE_CENTER" layoutX="9.0" layoutY="140.0" mnemonicParsing="false" onAction="#startGame" pickOnBounds="false" text="Start Game" />
|
<Button fx:id="startGame" alignment="BASELINE_CENTER" layoutX="9.0" layoutY="140.0" mnemonicParsing="false" onAction="#startGame" pickOnBounds="false" text="Start Game" />
|
||||||
</children>
|
</children>
|
||||||
</AnchorPane>
|
</AnchorPane>
|
||||||
<AnchorPane fx:id="ChatArea" pickOnBounds="false" prefHeight="83.0" prefWidth="578.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" />
|
</center>
|
||||||
|
<bottom>
|
||||||
|
<AnchorPane fx:id="ChatArea" pickOnBounds="false" prefHeight="83.0" prefWidth="578.0" BorderPane.alignment="CENTER" />
|
||||||
|
</bottom>
|
||||||
|
</BorderPane>
|
||||||
|
<AnchorPane fx:id="gameDisplayAnchorPane" maxHeight="843.75" maxWidth="1500.0" pickOnBounds="false" />
|
||||||
</children>
|
</children>
|
||||||
</AnchorPane>
|
</AnchorPane>
|
||||||
|
|||||||
Reference in New Issue
Block a user