michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactored the 2D and 3D game view class setups. Made scaling more logical.

Browse Source 
#refactor #story[1275]
This commit is contained in:
Calum
2017-09-26 00:55:28 +13:00
parent b3981b19e0
commit 51747e2d13
11 changed files with 498 additions and 931 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/controllers/LobbyController.java
+7 -7
View File
@@ -29,7 +29,7 @@ import seng302.model.mark.CompoundMark;
import seng302.model.mark.Corner;
import seng302.model.stream.xml.parser.RaceXMLData;
import seng302.utilities.Sounds;
import seng302.visualiser.GameView;
import seng302.visualiser.MapPreview;
import seng302.visualiser.controllers.cells.PlayerCell;
import seng302.visualiser.controllers.dialogs.BoatCustomizeController;
@@ -60,7 +60,7 @@ public class LobbyController implements Initializable {
public Color playersColor;
private Map<Integer, ClientYacht> playerBoats;
private Double mapWidth = INITIAL_MAP_WIDTH, mapHeight = INITIAL_MAP_HEIGHT;
private GameView gameView;
private MapPreview mapPreview;
@Override
public void initialize(URL location, ResourceBundle resources) {
@@ -146,20 +146,20 @@ public class LobbyController implements Initializable {
List<CompoundMark> marks = new ArrayList<>(raceData.getCompoundMarks().values());
List<Corner> corners = raceData.getMarkSequence();
gameView = new GameView(marks, corners, border);
mapPreview = new MapPreview(marks, corners, border);
serverMap.getChildren().clear();
serverMap.getChildren().add(gameView);
serverMap.getChildren().add(mapPreview.getAssets());
gameView.setSize(mapWidth, mapHeight);
mapPreview.setSize(mapWidth, mapHeight);
serverMap.widthProperty().addListener((observable, oldValue, newValue) -> {
mapWidth = newValue.doubleValue();
gameView.setSize(mapWidth, mapHeight);
mapPreview.setSize(mapWidth, mapHeight);
});
//
serverMap.heightProperty().addListener((observable, oldValue, newValue) -> {
mapHeight = newValue.doubleValue();
gameView.setSize(mapWidth, mapHeight);
mapPreview.setSize(mapWidth, mapHeight);
});
}