diff --git a/src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvents/DisconnectedPlayer.java b/src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvents/DisconnectedPlayer.java index 4e7ad0e..02a7696 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvents/DisconnectedPlayer.java +++ b/src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvents/DisconnectedPlayer.java @@ -19,7 +19,7 @@ import java.util.List; * during totem selection may free a totem for other players. */ public class DisconnectedPlayer extends NetworkEvent { - + //TODO private List availableTotems; diff --git a/src/main/java/it/polimi/ingsw/gc14/View/GUI/FireParticleSystem.java b/src/main/java/it/polimi/ingsw/gc14/View/GUI/FireParticleSystem.java index 36fa456..b78e4eb 100644 --- a/src/main/java/it/polimi/ingsw/gc14/View/GUI/FireParticleSystem.java +++ b/src/main/java/it/polimi/ingsw/gc14/View/GUI/FireParticleSystem.java @@ -11,14 +11,7 @@ import java.util.Iterator; import java.util.List; import java.util.Random; -/** - * Ambient fire particle system for the main game scene. - * - *

Spawns embers, sparks, and dust from the four screen corners and animates - * them toward the center using an {@link AnimationTimer} capped at 30 fps. - * Add the pane returned by {@link #getPane()} to the scene root, then call - * {@link #start()} to begin the animation. - */ +//TODO ALL JAVADOC public class FireParticleSystem { private static final int MAX_PARTICLES = 30; diff --git a/src/main/java/it/polimi/ingsw/gc14/View/GUI/GUI.java b/src/main/java/it/polimi/ingsw/gc14/View/GUI/GUI.java index de43246..84e7bdc 100644 --- a/src/main/java/it/polimi/ingsw/gc14/View/GUI/GUI.java +++ b/src/main/java/it/polimi/ingsw/gc14/View/GUI/GUI.java @@ -33,29 +33,43 @@ import static it.polimi.ingsw.gc14.Model.GamePackage.GameStages.TOTEM_CHOICE; * main game, and leaderboard scenes based on the current game state. */ public class GUI extends Application implements IView { + //TODO private Stage primaryStage; + //TODO private volatile MiniModel miniModel; - + //TODO private FXMLLoader loaderLogin; + //TODO private Scene loginScene; + //TODO private LoginFXMLController controllerLogin; - + //TODO private FXMLLoader loaderTotem; + //TODO private Scene totemScene; + //TODO private TotemFXMLController controllerTotem; - + //TODO private FXMLLoader loaderMain; - private Scene mainScene; - private MainFXMLController controllerMain; + //TODO + private Scene mainScene; + //TODO + private MainFXMLController controllerMain; + //TODO private FXMLLoader loaderLeaderboard; + //TODO private Scene leaderboardScene; + //TODO private LeaderboardFXMLController controllerLeaderboard; - + //TODO private ClientController controller; + //TODO private boolean autoReenterFullscreen = true; + //TODO private boolean isFading = false; + //TODO private MediaPlayer bgMusic; @@ -194,12 +208,12 @@ public class GUI extends Application implements IView { } }); } - + //TODO private void wrapScene(Scene scene) { Parent root = scene.getRoot(); scene.setRoot(new StackPane(root)); } - + //TODO private void fadeToScene(Scene newScene) { Scene currentScene = primaryStage.getScene(); if (currentScene == newScene || isFading) return; diff --git a/src/main/java/it/polimi/ingsw/gc14/View/GUI/LeaderboardFXMLController.java b/src/main/java/it/polimi/ingsw/gc14/View/GUI/LeaderboardFXMLController.java index 0010de4..107d29a 100644 --- a/src/main/java/it/polimi/ingsw/gc14/View/GUI/LeaderboardFXMLController.java +++ b/src/main/java/it/polimi/ingsw/gc14/View/GUI/LeaderboardFXMLController.java @@ -41,14 +41,18 @@ public class LeaderboardFXMLController { @FXML private VBox mainVBox; @FXML private VBox rankingList; // title label removed; outcome text is added dynamically in render() - + //TODO private ClientController controller; - + //TODO private Popup popup; + //TODO private VBox popupContent; - + //TODO private static final Map imageCache = new HashMap<>(); + //TODO private Scene loginScene; + + //TODO private Runnable action; /** Returns a cached {@link Image} for the given classpath {@code path}, loading it on first access. */ diff --git a/src/main/java/it/polimi/ingsw/gc14/View/GUI/LoginFXMLController.java b/src/main/java/it/polimi/ingsw/gc14/View/GUI/LoginFXMLController.java index eb74087..09be773 100644 --- a/src/main/java/it/polimi/ingsw/gc14/View/GUI/LoginFXMLController.java +++ b/src/main/java/it/polimi/ingsw/gc14/View/GUI/LoginFXMLController.java @@ -29,22 +29,33 @@ import java.util.Enumeration; * and initiates the connection to the server. */ public class LoginFXMLController { - + //TODO @FXML private ImageView backgroundImage; + //TODO @FXML private TextField campoNome; + //TODO @FXML private TextField campoNumPlayers; + //TODO @FXML private TextField campoIP; + //TODO @FXML private Button btnAccedi; + //TODO @FXML private Label labelErrore; + //TODO @FXML private VBox formPanel; + //TODO @FXML private StackPane protocolToggle; + //TODO @FXML private Region toggleThumb; + //TODO @FXML private Label labelRMI; + //TODO @FXML private Label labelTCP; - + //TODO private boolean isRMI = true; + //TODO private ClientController controller; - + //TODO private final PseudoClass activeProtocolPseudo = PseudoClass.getPseudoClass("active-protocol"); /** diff --git a/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java b/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java index 2f6ecbc..5d4e833 100644 --- a/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java +++ b/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java @@ -46,26 +46,41 @@ import java.util.*; * the player's hand, and action buttons (skip, details). */ public class MainFXMLController { - + //TODO @FXML private GridPane leftGrid; + //TODO @FXML private ScrollPane playerSide; + //TODO @FXML private HBox mainHBox; + //TODO @FXML private ImageView backgroundImage; + //TODO @FXML private HBox board; + //TODO @FXML private HBox upperList; + //TODO @FXML private HBox lowerList; + //TODO @FXML private HBox myHand; + //TODO @FXML private Button skipBtn; + //TODO @FXML private Button detailsBtn; + //TODO @FXML private Label infoText; + //TODO private final Map foodLabels = new HashMap<>(); + //TODO private final Map prestigeLabels = new HashMap<>(); + //TODO private final Map playerCards = new HashMap<>(); + //TODO private final Map> iconViews = new HashMap<>(); - + //TODO private Popup popup; + //TODO private HBox popupCards; - + //TODO private ClientController controller; /** {@code true} when the last received event was an error response. */ diff --git a/src/main/java/it/polimi/ingsw/gc14/View/GUI/TotemFXMLController.java b/src/main/java/it/polimi/ingsw/gc14/View/GUI/TotemFXMLController.java index 8519e5f..b086573 100644 --- a/src/main/java/it/polimi/ingsw/gc14/View/GUI/TotemFXMLController.java +++ b/src/main/java/it/polimi/ingsw/gc14/View/GUI/TotemFXMLController.java @@ -24,14 +24,20 @@ import java.util.Locale; * other players see a waiting banner. */ public class TotemFXMLController { - + //TODO @FXML private ImageView backgroundImage; + //TODO @FXML private HBox mainHBox; + //TODO @FXML private Label turnBanner; + //TODO @FXML private Button confirmButton; + //TODO private ClientController controller; + //TODO private int selectedIndex = -1; + //TODO private StackPane selectedFrame = null; /** diff --git a/src/main/java/it/polimi/ingsw/gc14/View/TUI/AsciiTable.java b/src/main/java/it/polimi/ingsw/gc14/View/TUI/AsciiTable.java index 6f419a3..041404c 100644 --- a/src/main/java/it/polimi/ingsw/gc14/View/TUI/AsciiTable.java +++ b/src/main/java/it/polimi/ingsw/gc14/View/TUI/AsciiTable.java @@ -21,24 +21,28 @@ import java.util.*; * } */ public class AsciiTable { - + //TODO private final BorderStyle s; + //TODO private final int cols; + //TODO private final List> rows = new ArrayList<>(); + //TODO private final List separators = new ArrayList<>(); - + //TODO public AsciiTable(BorderStyle s, int cols) { this.s = s; this.cols = cols; } - + //TODO public void addRow(String... cells) { rows.add(Arrays.asList(cells)); } + //TODO public void addRow(List cells) { rows.add(cells); } - + //TODO public void addHeader(String... cells) { rows.add(0, Arrays.asList(cells)); separators.add(0); } - + //TODO public void addSeparator() { separators.add(rows.size() - 1); } /** @@ -63,7 +67,7 @@ public class AsciiTable { sb.append(hline(s.bl(), s.mb(), s.br(), maxWidth)); return sb.toString(); } - + //TODO private String hline(String l, String m, String r, int maxWidth) { var sb = new StringBuilder(l); for (int i = 0; i < cols; i++) {