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

Added toggle for fps #story[463]

Browse Source
This commit is contained in:
Peter
2017-03-27 16:45:02 +13:00
parent 65ac864bf2
commit 6fc55bb82c
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/controllers/CanvasController.java
+10 -1
View File
@@ -45,7 +45,7 @@ public class CanvasController {
@FXML @FXML
private BoatPositionController teamPositionsController; private BoatPositionController teamPositionsController;
@FXML @FXML
private CheckBox toggleAnnotation; private CheckBox toggleAnnotation, toggleFps;
private Race race; private Race race;
private GraphicsContext gc; private GraphicsContext gc;
@@ -61,6 +61,7 @@ public class CanvasController {
private final int SCALE = 16000; private final int SCALE = 16000;
private boolean annotationCheck = true; private boolean annotationCheck = true;
private boolean displayFps = true;
///test ///test
private HashSet<Integer> headingTest = new HashSet<>(); private HashSet<Integer> headingTest = new HashSet<>();
@@ -149,6 +150,12 @@ public class CanvasController {
annotationCheck = !annotationCheck; annotationCheck = !annotationCheck;
} }
}); });
toggleFps.selectedProperty().addListener(new ChangeListener<Boolean>() {
@Override
public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
displayFps = !displayFps;
}
});
//set wind direction!!!!!!! can't find another place to put my code --haoming //set wind direction!!!!!!! can't find another place to put my code --haoming
double windDirection = new ConfigParser("/config.xml").getWindDirection(); double windDirection = new ConfigParser("/config.xml").getWindDirection();
@@ -267,11 +274,13 @@ public class CanvasController {
} }
private void drawFps(int fps){ private void drawFps(int fps){
if (displayFps){
gc.setFill(Color.BLACK); gc.setFill(Color.BLACK);
gc.setFont(new Font(14)); gc.setFont(new Font(14));
gc.setLineWidth(3); gc.setLineWidth(3);
gc.fillText(fps + " FPS", 5, 20); gc.fillText(fps + " FPS", 5, 20);
} }
}
/** /**
* Draws all the boats. * Draws all the boats.
src/main/resources/RaceView.fxml
+3 -2
View File
@@ -25,7 +25,7 @@
<AnchorPane prefHeight="200.0" prefWidth="200.0" GridPane.rowSpan="3"> <AnchorPane prefHeight="200.0" prefWidth="200.0" GridPane.rowSpan="3">
<children> <children>
<Label layoutX="11.0" layoutY="259.0" text="Team Position" /> <Label layoutX="11.0" layoutY="259.0" text="Team Position" />
<Label layoutX="13.0" layoutY="432.0" text="Annotation toggle" /> <Label layoutX="13.0" layoutY="432.0" text="Settings" />
<Label layoutX="11.0" layoutY="14.0" text="Timer" /> <Label layoutX="11.0" layoutY="14.0" text="Timer" />
<Label layoutX="11.0" layoutY="88.0" text="Wind direction" /> <Label layoutX="11.0" layoutY="88.0" text="Wind direction" />
<Circle fx:id="windBackgroundCircle" blendMode="DARKEN" fill="#76baf8" layoutX="110.0" layoutY="166.0" radius="35.0" stroke="#686868" strokeType="INSIDE" strokeWidth="3.0" /> <Circle fx:id="windBackgroundCircle" blendMode="DARKEN" fill="#76baf8" layoutX="110.0" layoutY="166.0" radius="35.0" stroke="#686868" strokeType="INSIDE" strokeWidth="3.0" />
@@ -45,7 +45,8 @@
<fx:include fx:id="teamPositions" source="TeamPositions.fxml" /> <fx:include fx:id="teamPositions" source="TeamPositions.fxml" />
</children> </children>
</AnchorPane> </AnchorPane>
<CheckBox fx:id="toggleAnnotation" layoutX="27.0" layoutY="462.0" mnemonicParsing="false" text="Toggle annotation" /> <CheckBox fx:id="toggleAnnotation" layoutX="27.0" layoutY="462.0" mnemonicParsing="false" selected="true" text="Show annotations" />
<CheckBox fx:id="toggleFps" layoutX="27.0" layoutY="488.0" mnemonicParsing="false" prefHeight="18.0" prefWidth="143.0" selected="true" text="Show FPS" />
</children> </children>
</AnchorPane> </AnchorPane>
<AnchorPane fx:id="contentAnchorPane" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="960.0" prefWidth="1280.0" GridPane.columnIndex="1" GridPane.rowSpan="3"> <AnchorPane fx:id="contentAnchorPane" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="960.0" prefWidth="1280.0" GridPane.columnIndex="1" GridPane.rowSpan="3">