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

Refactoring view for game development

Browse Source 
#story[987]
This commit is contained in:
Calum
2017-07-18 14:00:24 +12:00
parent fcb1e5e593
commit d9f5f7a137
7 changed files with 78 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/controllers/CanvasController.java → src/main/java/seng302/controllers/GameViewController.java
+52 -103
View File
@@ -7,13 +7,12 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.PriorityBlockingQueue; import java.util.concurrent.PriorityBlockingQueue;
import javafx.animation.AnimationTimer; import javafx.animation.AnimationTimer;
import javafx.beans.property.SimpleDoubleProperty; import javafx.collections.ObservableList;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader; import javafx.fxml.FXMLLoader;
import javafx.geometry.Point2D; import javafx.geometry.Point2D;
import javafx.scene.Group; import javafx.scene.Group;
import javafx.scene.canvas.Canvas; import javafx.scene.Node;
import javafx.scene.canvas.GraphicsContext;
import javafx.scene.image.ImageView; import javafx.scene.image.ImageView;
import javafx.scene.layout.AnchorPane; import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.GridPane; import javafx.scene.layout.GridPane;
@@ -43,22 +42,20 @@ import seng302.utilities.GeoUtility;
* Created by ptg19 on 15/03/17. * Created by ptg19 on 15/03/17.
* Modified by Haoming Yin (hyi25) on 20/3/2017. * Modified by Haoming Yin (hyi25) on 20/3/2017.
*/ */
public class CanvasController { public class GameViewController {
@FXML @FXML
private AnchorPane canvasPane; private AnchorPane mainPane;
private RaceViewController raceViewController; private RaceViewController raceViewController;
private ResizableCanvas canvas; private ObservableList<Node> gameObjects;
private Group group;
private GraphicsContext gc;
private ImageView mapImage; private ImageView mapImage;
private final int BUFFER_SIZE = 50; private int BUFFER_SIZE = 50;
private final int PANEL_WIDTH = 1260; // it should be 1280 but, minors 40 to cancel the bias. private int panelWidth = 1260; // it should be 1280 but, minors 40 to cancel the bias.
private final int PANEL_HEIGHT = 960; private int panelHeight = 960;
private final int CANVAS_WIDTH = 720; private double canvasWidth = 720;
private final int CANVAS_HEIGHT = 720; private double canvasHeight = 720;
private boolean horizontalInversion = false; private boolean horizontalInversion = false;
private double distanceScaleFactor; private double distanceScaleFactor;
@@ -83,48 +80,43 @@ public class CanvasController {
private int frameTimeIndex = 0; private int frameTimeIndex = 0;
private boolean arrayFilled = false; private boolean arrayFilled = false;
public AnimationTimer timer; AnimationTimer timer;
private enum ScaleDirection { private enum ScaleDirection {
HORIZONTAL, HORIZONTAL,
VERTICAL VERTICAL
} }
public void setup(RaceViewController raceViewController) { void setup(RaceViewController raceViewController) {
this.raceViewController = raceViewController; this.raceViewController = raceViewController;
} }
public void initialize() { public void initialize() {
raceViewController = new RaceViewController(); raceViewController = new RaceViewController();
canvas = new ResizableCanvas(); gameObjects = mainPane.getChildren();
group = new Group();
// create image view for map, bind panel size to image // create image view for map, bind panel size to image
mapImage = new ImageView(); mapImage = new ImageView();
canvasPane.getChildren().add(mapImage); mainPane.getChildren().add(mapImage);
mapImage.fitWidthProperty().bind(canvasPane.widthProperty()); mapImage.fitWidthProperty().bind(mainPane.widthProperty());
mapImage.fitHeightProperty().bind(canvasPane.heightProperty()); mapImage.fitHeightProperty().bind(mainPane.heightProperty());
canvasPane.getChildren().add(canvas);
canvasPane.getChildren().add(group);
// Bind canvas size to stack pane size.
canvas.widthProperty().bind(new SimpleDoubleProperty(CANVAS_WIDTH));
canvas.heightProperty().bind(new SimpleDoubleProperty(CANVAS_HEIGHT));
} }
public void initializeCanvas() { void initializeCanvas() {
gc = canvas.getGraphicsContext2D();
gc.setGlobalAlpha(0.5);
fitMarksToCanvas(); fitMarksToCanvas();
drawGoogleMap(); drawGoogleMap();
FPSdisplay.setLayoutX(5); FPSdisplay.setLayoutX(5);
FPSdisplay.setLayoutY(20); FPSdisplay.setLayoutY(20);
FPSdisplay.setStrokeWidth(2); FPSdisplay.setStrokeWidth(2);
group.getChildren().add(FPSdisplay); gameObjects.add(FPSdisplay);
group.getChildren().add(raceBorder); gameObjects.add(raceBorder);
initializeMarks(); initializeMarks();
initializeBoats(); initializeBoats();
mainPane.widthProperty().addListener(resize -> {
canvasWidth = mainPane.getWidth();
canvasHeight = mainPane.getHeight();
fitMarksToCanvas();
});
timer = new AnimationTimer() { timer = new AnimationTimer() {
private long lastTime = 0; private long lastTime = 0;
@@ -171,15 +163,13 @@ public class CanvasController {
private void switchToFinishScreen() { private void switchToFinishScreen() {
try { try {
// canvas view -> anchor pane -> grid pane -> main view // canvas view -> anchor pane -> grid pane -> main view
GridPane gridPane = (GridPane) canvasPane.getParent().getParent(); GridPane gridPane = (GridPane) mainPane.getParent().getParent();
AnchorPane contentPane = (AnchorPane) gridPane.getParent(); AnchorPane contentPane = (AnchorPane) gridPane.getParent();
contentPane.getChildren().removeAll(); contentPane.getChildren().removeAll();
contentPane.getChildren().clear(); contentPane.getChildren().clear();
contentPane.getStylesheets().add(getClass().getResource("/css/master.css").toString()); contentPane.getStylesheets().add(getClass().getResource("/css/master.css").toString());
contentPane.getChildren().addAll( contentPane.getChildren().addAll(
(Pane) FXMLLoader.load(getClass().getResource("/views/FinishScreenView.fxml"))); (Pane) FXMLLoader.load(getClass().getResource("/views/FinishScreenView.fxml")));
} catch (javafx.fxml.LoadException e) {
e.printStackTrace();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
@@ -206,10 +196,10 @@ public class CanvasController {
// distance from origin corner to bottom right corner of the panel // distance from origin corner to bottom right corner of the panel
double distanceFromOriginToBottomRight = Math.sqrt( double distanceFromOriginToBottomRight = Math.sqrt(
Math.pow(PANEL_HEIGHT * metersPerPixelY, 2) + Math Math.pow(panelHeight * metersPerPixelY, 2) + Math
.pow(PANEL_WIDTH * metersPerPixelX, 2)); .pow(panelWidth * metersPerPixelX, 2));
double bearingFromOriginToBottomRight = Math double bearingFromOriginToBottomRight = Math
.toDegrees(Math.atan2(PANEL_WIDTH, -PANEL_HEIGHT)); .toDegrees(Math.atan2(panelWidth, -panelHeight));
GeoPoint bottomRightPos = GeoUtility GeoPoint bottomRightPos = GeoUtility
.getGeoCoordinate(originPos, bearingFromOriginToBottomRight, .getGeoCoordinate(originPos, bearingFromOriginToBottomRight,
distanceFromOriginToBottomRight); distanceFromOriginToBottomRight);
@@ -288,7 +278,7 @@ public class CanvasController {
} }
} }
void updateMarkGroup (long raceId, MarkGroup markGroup) { private void updateMarkGroup (long raceId, MarkGroup markGroup) {
PriorityBlockingQueue<BoatPositionPacket> movementQueue = StreamParser.markLocations.get(raceId); PriorityBlockingQueue<BoatPositionPacket> movementQueue = StreamParser.markLocations.get(raceId);
if (movementQueue.size() > 0){ if (movementQueue.size() > 0){
try { try {
@@ -327,10 +317,10 @@ public class CanvasController {
annotations.getChildren().add(boatGroup.getAnnotations()); annotations.getChildren().add(boatGroup.getAnnotations());
} }
} }
group.getChildren().addAll(trails); gameObjects.addAll(trails);
group.getChildren().addAll(wakes); gameObjects.addAll(wakes);
group.getChildren().addAll(annotations); gameObjects.addAll(annotations);
group.getChildren().addAll(boatGroups); gameObjects.addAll(boatGroups);
} }
private void initializeMarks() { private void initializeMarks() {
@@ -349,40 +339,7 @@ public class CanvasController {
markGroups.add(markGroup); markGroups.add(markGroup);
} }
} }
group.getChildren().addAll(markGroups); gameObjects.addAll(markGroups);
}
class ResizableCanvas extends Canvas {
ResizableCanvas() {
// Redraw canvas when size changes.
widthProperty().addListener(evt -> draw());
heightProperty().addListener(evt -> draw());
}
private void draw() {
double width = getWidth();
double height = getHeight();
GraphicsContext gc = getGraphicsContext2D();
gc.clearRect(0, 0, width, height);
}
@Override
public boolean isResizable() {
return true;
}
@Override
public double prefWidth(double height) {
return getWidth();
}
@Override
public double prefHeight(double width) {
return getHeight();
}
} }
private void drawFps(int fps){ private void drawFps(int fps){
@@ -452,21 +409,21 @@ public class CanvasController {
referencePointX = BUFFER_SIZE + distanceScaleFactor * Math.sin(referenceAngle) * Mark.calculateDistance(referencePoint, minLonPoint); referencePointX = BUFFER_SIZE + distanceScaleFactor * Math.sin(referenceAngle) * Mark.calculateDistance(referencePoint, minLonPoint);
referenceAngle = Math.abs(Mark.calculateHeadingRad(referencePoint, maxLatPoint)); referenceAngle = Math.abs(Mark.calculateHeadingRad(referencePoint, maxLatPoint));
referencePointY = CANVAS_HEIGHT - (BUFFER_SIZE + BUFFER_SIZE); referencePointY = canvasHeight - (BUFFER_SIZE + BUFFER_SIZE);
referencePointY -= distanceScaleFactor * Math.cos(referenceAngle) * Mark.calculateDistance(referencePoint, maxLatPoint); referencePointY -= distanceScaleFactor * Math.cos(referenceAngle) * Mark.calculateDistance(referencePoint, maxLatPoint);
referencePointY = referencePointY / 2; referencePointY = referencePointY / 2;
referencePointY += BUFFER_SIZE; referencePointY += BUFFER_SIZE;
referencePointY += distanceScaleFactor * Math.cos(referenceAngle) * Mark.calculateDistance(referencePoint, maxLatPoint); referencePointY += distanceScaleFactor * Math.cos(referenceAngle) * Mark.calculateDistance(referencePoint, maxLatPoint);
} else { } else {
referencePointY = CANVAS_HEIGHT - BUFFER_SIZE; referencePointY = canvasHeight - BUFFER_SIZE;
referenceAngle = Math.abs(Mark.calculateHeadingRad(referencePoint, minLonPoint)); referenceAngle = Math.abs(Mark.calculateHeadingRad(referencePoint, minLonPoint));
referencePointX = BUFFER_SIZE; referencePointX = BUFFER_SIZE;
referencePointX += distanceScaleFactor * Math.sin(referenceAngle) * Mark.calculateDistance(referencePoint, minLonPoint); referencePointX += distanceScaleFactor * Math.sin(referenceAngle) * Mark.calculateDistance(referencePoint, minLonPoint);
referencePointX += ((CANVAS_WIDTH - (BUFFER_SIZE + BUFFER_SIZE)) - (minLonToMaxLon * distanceScaleFactor)) / 2; referencePointX += ((canvasWidth - (BUFFER_SIZE + BUFFER_SIZE)) - (minLonToMaxLon * distanceScaleFactor)) / 2;
} }
if(horizontalInversion) { if(horizontalInversion) {
referencePointX = CANVAS_WIDTH - BUFFER_SIZE - (referencePointX - BUFFER_SIZE); referencePointX = canvasWidth - BUFFER_SIZE - (referencePointX - BUFFER_SIZE);
} }
} }
@@ -490,10 +447,10 @@ public class CanvasController {
double horiDistance = double horiDistance =
Math.cos(horiAngle) * Mark.calculateDistance(minLonPoint, maxLonPoint); Math.cos(horiAngle) * Mark.calculateDistance(minLonPoint, maxLonPoint);
double vertScale = (CANVAS_HEIGHT - (BUFFER_SIZE + BUFFER_SIZE)) / vertDistance; double vertScale = (canvasHeight - (BUFFER_SIZE + BUFFER_SIZE)) / vertDistance;
if ((horiDistance * vertScale) > (CANVAS_WIDTH - (BUFFER_SIZE + BUFFER_SIZE))) { if ((horiDistance * vertScale) > (canvasWidth - (BUFFER_SIZE + BUFFER_SIZE))) {
distanceScaleFactor = (CANVAS_WIDTH - (BUFFER_SIZE + BUFFER_SIZE)) / horiDistance; distanceScaleFactor = (canvasWidth - (BUFFER_SIZE + BUFFER_SIZE)) / horiDistance;
scaleDirection = ScaleDirection.HORIZONTAL; scaleDirection = ScaleDirection.HORIZONTAL;
} else { } else {
distanceScaleFactor = vertScale; distanceScaleFactor = vertScale;
@@ -509,8 +466,8 @@ public class CanvasController {
public Point2D findScaledXY (double unscaledLat, double unscaledLon) { public Point2D findScaledXY (double unscaledLat, double unscaledLon) {
double distanceFromReference; double distanceFromReference;
double angleFromReference; double angleFromReference;
int xAxisLocation = (int) referencePointX; double xAxisLocation = referencePointX;
int yAxisLocation = (int) referencePointY; double yAxisLocation = referencePointY;
angleFromReference = Mark angleFromReference = Mark
.calculateHeadingRad(minLatPoint.getLatitude(), minLatPoint.getLongitude(), unscaledLat, .calculateHeadingRad(minLatPoint.getLatitude(), minLatPoint.getLongitude(), unscaledLat,
@@ -519,31 +476,23 @@ public class CanvasController {
.calculateDistance(minLatPoint.getLatitude(), minLatPoint.getLongitude(), unscaledLat, .calculateDistance(minLatPoint.getLatitude(), minLatPoint.getLongitude(), unscaledLat,
unscaledLon); unscaledLon);
if (angleFromReference >= 0 && angleFromReference <= Math.PI / 2) { if (angleFromReference >= 0 && angleFromReference <= Math.PI / 2) {
xAxisLocation += (int) Math xAxisLocation += Math.round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference);
.round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference); yAxisLocation -= Math.round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference);
yAxisLocation -= (int) Math
.round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference);
} else if (angleFromReference >= 0) { } else if (angleFromReference >= 0) {
angleFromReference = angleFromReference - Math.PI / 2; angleFromReference = angleFromReference - Math.PI / 2;
xAxisLocation += (int) Math xAxisLocation += Math.round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference);
.round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference); yAxisLocation += Math.round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference);
yAxisLocation += (int) Math
.round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference);
} else if (angleFromReference < 0 && angleFromReference >= -Math.PI / 2) { } else if (angleFromReference < 0 && angleFromReference >= -Math.PI / 2) {
angleFromReference = Math.abs(angleFromReference); angleFromReference = Math.abs(angleFromReference);
xAxisLocation -= (int) Math xAxisLocation -= Math.round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference);
.round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference); yAxisLocation -= Math.round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference);
yAxisLocation -= (int) Math
.round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference);
} else { } else {
angleFromReference = Math.abs(angleFromReference) - Math.PI / 2; angleFromReference = Math.abs(angleFromReference) - Math.PI / 2;
xAxisLocation -= (int) Math xAxisLocation -= Math.round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference);
.round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference); yAxisLocation += Math.round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference);
yAxisLocation += (int) Math
.round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference);
} }
if(horizontalInversion) { if(horizontalInversion) {
xAxisLocation = CANVAS_WIDTH - BUFFER_SIZE - (xAxisLocation - BUFFER_SIZE); xAxisLocation = canvasWidth - BUFFER_SIZE - (xAxisLocation - BUFFER_SIZE);
} }
return new Point2D(xAxisLocation, yAxisLocation); return new Point2D(xAxisLocation, yAxisLocation);
} }
src/main/java/seng302/controllers/RaceViewController.java
+14 -12
View File
@@ -72,7 +72,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
@FXML @FXML
private ComboBox boatSelectionComboBox; private ComboBox boatSelectionComboBox;
@FXML @FXML
private CanvasController includedCanvasController; private GameViewController gameViewController;
private static ArrayList<Yacht> startingBoats = new ArrayList<>(); private static ArrayList<Yacht> startingBoats = new ArrayList<>();
private boolean displayFps; private boolean displayFps;
@@ -95,13 +95,13 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
sparklineYAxis.setTickMarkVisible(false); sparklineYAxis.setTickMarkVisible(false);
startingBoats = new ArrayList<>(StreamParser.getBoats().values()); startingBoats = new ArrayList<>(StreamParser.getBoats().values());
includedCanvasController.setup(this); gameViewController.setup(this);
includedCanvasController.initializeCanvas(); gameViewController.initializeCanvas();
initializeUpdateTimer(); initializeUpdateTimer();
initialiseFPSCheckBox(); initialiseFPSCheckBox();
initialiseAnnotationSlider(); initialiseAnnotationSlider();
initialiseBoatSelectionComboBox(); initialiseBoatSelectionComboBox();
includedCanvasController.timer.start(); gameViewController.timer.start();
selectAnnotationBtn.setOnAction(event -> loadSelectAnnotationView()); selectAnnotationBtn.setOnAction(event -> loadSelectAnnotationView());
} }
@@ -416,13 +416,13 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
// Can only calc leg direction if there is a next mark and it is a gate mark // Can only calc leg direction if there is a next mark and it is a gate mark
if (nextMark != null) { if (nextMark != null) {
if (nextMark instanceof GateMark) { if (nextMark instanceof GateMark) {
if (bg.isUpwindLeg(includedCanvasController, nextMark)) { if (bg.isUpwindLeg(gameViewController, nextMark)) {
isUpwind = true; isUpwind = true;
} else { } else {
isUpwind = false; isUpwind = false;
} }
for(MarkGroup mg : includedCanvasController.getMarkGroups()) { for(MarkGroup mg : gameViewController.getMarkGroups()) {
mg.removeLaylines(); mg.removeLaylines();
@@ -430,8 +430,10 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
SingleMark singleMark1 = ((GateMark) nextMark).getSingleMark1(); SingleMark singleMark1 = ((GateMark) nextMark).getSingleMark1();
SingleMark singleMark2 = ((GateMark) nextMark).getSingleMark2(); SingleMark singleMark2 = ((GateMark) nextMark).getSingleMark2();
Point2D markPoint1 = includedCanvasController.findScaledXY(singleMark1.getLatitude(), singleMark1.getLongitude()); Point2D markPoint1 = gameViewController
Point2D markPoint2 = includedCanvasController.findScaledXY(singleMark2.getLatitude(), singleMark2.getLongitude()); .findScaledXY(singleMark1.getLatitude(), singleMark1.getLongitude());
Point2D markPoint2 = gameViewController
.findScaledXY(singleMark2.getLatitude(), singleMark2.getLongitude());
HashMap<Double, Double> angleAndSpeed; HashMap<Double, Double> angleAndSpeed;
if (isUpwind) { if (isUpwind) {
angleAndSpeed = PolarTable.getOptimalUpwindVMG(StreamParser.getWindSpeed()); angleAndSpeed = PolarTable.getOptimalUpwindVMG(StreamParser.getWindSpeed());
@@ -575,13 +577,13 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
switch (annotationLevel) { switch (annotationLevel) {
// No Annotations // No Annotations
case 0: case 0:
for (BoatGroup bg : includedCanvasController.getBoatGroups()) { for (BoatGroup bg : gameViewController.getBoatGroups()) {
bg.setVisibility(false, false, false, false, false, false); bg.setVisibility(false, false, false, false, false, false);
} }
break; break;
// Important Annotations // Important Annotations
case 1: case 1:
for (BoatGroup bg : includedCanvasController.getBoatGroups()) { for (BoatGroup bg : gameViewController.getBoatGroups()) {
bg.setVisibility( bg.setVisibility(
importantAnnotations.getAnnotationState(Annotation.NAME), importantAnnotations.getAnnotationState(Annotation.NAME),
importantAnnotations.getAnnotationState(Annotation.SPEED), importantAnnotations.getAnnotationState(Annotation.SPEED),
@@ -594,7 +596,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
break; break;
// All Annotations // All Annotations
case 2: case 2:
for (BoatGroup bg : includedCanvasController.getBoatGroups()) { for (BoatGroup bg : gameViewController.getBoatGroups()) {
bg.setVisibility(true, true, true, true, true, true); bg.setVisibility(true, true, true, true, true, true);
} }
break; break;
@@ -608,7 +610,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
* @param yacht The yacht for which we want to view all annotations * @param yacht The yacht for which we want to view all annotations
*/ */
private void setSelectedBoat(Yacht yacht) { private void setSelectedBoat(Yacht yacht) {
for (BoatGroup bg : includedCanvasController.getBoatGroups()) { for (BoatGroup bg : gameViewController.getBoatGroups()) {
//We need to iterate over all race groups to get the matching boat group belonging to this boat if we //We need to iterate over all race groups to get the matching boat group belonging to this boat if we
//are to toggle its annotations, there is no other backwards knowledge of a yacht to its boatgroup. //are to toggle its annotations, there is no other backwards knowledge of a yacht to its boatgroup.
if (bg.getBoat().getHullID().equals(yacht.getHullID())) { if (bg.getBoat().getHullID().equals(yacht.getHullID())) {
src/main/java/seng302/fxObjects/BoatGroup.java
+2 -2
View File
@@ -11,7 +11,7 @@ import javafx.scene.shape.Polygon;
import javafx.scene.transform.Rotate; import javafx.scene.transform.Rotate;
import seng302.models.Yacht; import seng302.models.Yacht;
import seng302.utilities.GeometryUtils; import seng302.utilities.GeometryUtils;
import seng302.controllers.CanvasController; import seng302.controllers.GameViewController;
import seng302.models.mark.GateMark; import seng302.models.mark.GateMark;
import seng302.models.mark.Mark; import seng302.models.mark.Mark;
import seng302.models.mark.SingleMark; import seng302.models.mark.SingleMark;
@@ -236,7 +236,7 @@ public class BoatGroup extends Group {
* going up wind, if they are on different sides of the gate, then the boat is going downwind * going up wind, if they are on different sides of the gate, then the boat is going downwind
* @param canvasController * @param canvasController
*/ */
public Boolean isUpwindLeg(CanvasController canvasController, Mark nextMark) { public Boolean isUpwindLeg(GameViewController canvasController, Mark nextMark) {
Double windAngle = StreamParser.getWindDirection(); Double windAngle = StreamParser.getWindDirection();
GateMark thisGateMark = (GateMark) nextMark; GateMark thisGateMark = (GateMark) nextMark;
src/main/resources/views/CanvasView.fxml
-7
View File
@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import java.lang.*?>
<?import javafx.scene.layout.*?>
<AnchorPane fx:id="canvasPane" maxHeight="960.0" maxWidth="1280.0" prefHeight="960.0" prefWidth="1280.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.controllers.CanvasController" />
src/main/resources/views/GameView.fxml
+7
View File
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import java.lang.*?>
<?import javafx.scene.layout.*?>
<AnchorPane fx:id="mainPane" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.controllers.GameViewController" />
src/main/resources/views/MainView.fxml
-5
View File
@@ -1,10 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.text.*?>
<?import javafx.scene.canvas.*?>
<?import java.lang.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<AnchorPane fx:id="contentPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.controllers.Controller" /> <AnchorPane fx:id="contentPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.controllers.Controller" />
src/main/resources/views/RaceView.fxml
+3 -3
View File
@@ -7,7 +7,7 @@
<?import javafx.scene.shape.*?> <?import javafx.scene.shape.*?>
<?import javafx.scene.text.*?> <?import javafx.scene.text.*?>
<GridPane maxHeight="960.0" maxWidth="1530.0" prefHeight="960.0" prefWidth="1530.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.controllers.RaceViewController"> <GridPane prefHeight="960.0" prefWidth="1530.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.controllers.RaceViewController">
<columnConstraints> <columnConstraints>
<ColumnConstraints maxWidth="246.0" minWidth="246.0" prefWidth="246.0" /> <ColumnConstraints maxWidth="246.0" minWidth="246.0" prefWidth="246.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="1034.0" /> <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="1034.0" />
@@ -61,9 +61,9 @@
</LineChart> </LineChart>
</children> </children>
</AnchorPane> </AnchorPane>
<AnchorPane fx:id="contentAnchorPane" maxHeight="960.0" maxWidth="1280.0" prefHeight="960.0" prefWidth="1280.0" style="-fx-background-color: skyblue;" GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowSpan="2147483647" GridPane.valignment="TOP"> <AnchorPane fx:id="contentAnchorPane" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" style="-fx-background-color: skyblue;" GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowSpan="2147483647" GridPane.valignment="TOP">
<children> <children>
<fx:include fx:id="includedCanvas" source="CanvasView.fxml" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" /> <fx:include fx:id="gameView" source="GameView.fxml" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
</children></AnchorPane> </children></AnchorPane>
</children> </children>
</GridPane> </GridPane>