fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed a constant to be using the one in the constants file (prepartory start time) and temporarily made it so that the race can start in 3 seconds. #story[1261]

Browse Source
This commit is contained in:
Fan-Wu Yang
2017-09-07 19:30:51 +12:00
parent e3e61e5b28
commit 18a689b110
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/mock/app/Event.java
+1 -1
View File
@@ -180,7 +180,7 @@ public class Event {
public static String setRaceXMLAtCurrentTimeToNow(String raceXML) {
//The start time is current time + 4 minutes. prestart is 3 minutes, and we add another minute.
long millisecondsToAdd = Constants.RacePreStartTime + (1 * 60 * 1000);
long millisecondsToAdd = Constants.RacePreStartTime + Constants.RacePreparatoryTime;
long secondsToAdd = millisecondsToAdd / 1000;
//Scale the time using our time scalar.
secondsToAdd = secondsToAdd / Constants.RaceTimeScale;
racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
+1 -1
View File
@@ -187,7 +187,7 @@ public class RaceXMLCreator {
public static void setRaceXMLAtCurrentTimeToNow(XMLRace raceXML) {
//The start time is current time + 4 minutes. prestart is 3 minutes, and we add another minute.
long millisecondsToAdd = Constants.RacePreStartTime + (1 * 60 * 1000);
long millisecondsToAdd = Constants.RacePreStartTime + Constants.RacePreparatoryTime;
long secondsToAdd = millisecondsToAdd / 1000;
//Scale the time using our time scalar.
secondsToAdd = secondsToAdd / Constants.RaceTimeScale;
racevisionGame/src/main/java/shared/model/Constants.java
+5 -2
View File
@@ -38,13 +38,16 @@ public class Constants {
/**
* The race pre-start time, in milliseconds. 3 minutes (30 seconds for development).
*/
public static final long RacePreStartTime = 30 * 1000;
// public static final long RacePreStartTime = 30 * 1000;
public static final long RacePreStartTime = 1000;
/**
* The race preparatory time, in milliseconds. 1 minute.
*/
public static final long RacePreparatoryTime = 60 * 1000;
// public static final long RacePreparatoryTime = 60 * 1000;
public static final long RacePreparatoryTime = 3 * 1000;
racevisionGame/src/main/java/visualiser/layout/View3D.java
+1
View File
@@ -87,6 +87,7 @@ public class View3D extends Pane {
yaw = new Rotate(0, Rotate.Y_AXIS);
pitch = new Rotate(0, Rotate.X_AXIS);
camera.getTransforms().addAll(pivot, yaw, pitch, distance);
//camera.setTranslateZ(-1000);
this.camera = camera;
return camera;