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

Course layout for a type M2 course has been made. #story[1193]

Browse Source
This commit is contained in:
Joseph Gardner
2017-09-08 13:27:30 +12:00
parent d3ddff8bf1
commit 3157ac88b5
3 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/mock/app/Event.java
+4 -2
View File
@@ -91,7 +91,9 @@ public class Event {
break;
case 2: raceXMLFile = "mock/mockXML/iMapLayout.xml";
break;
default:raceXMLFile = "mock/mockXML/raceTest.xml";
case 3: raceXMLFile = "mock/mockXML/mMapLayout.xml";
break;
default: raceXMLFile = "mock/mockXML/raceTest.xml";
}
String boatsXMLFile = "mock/mockXML/boatTest.xml";
@@ -208,7 +210,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/visualiser/Controllers/HostController.java
+2 -1
View File
@@ -62,8 +62,9 @@ public class HostController extends Controller {
Image ac35Map = new Image(getClass().getClassLoader().getResourceAsStream("images/AC35_Racecourse_MAP.png"));
Image oMap = new Image(getClass().getClassLoader().getResourceAsStream("images/oMapLayout.png"));
Image iMap = new Image(getClass().getClassLoader().getResourceAsStream("images/iMapLayout.png"));
Image mMap = new Image(getClass().getClassLoader().getResourceAsStream("images/iMapLayout.png"));
listOfMaps = new ArrayList(Arrays.asList(ac35Map, oMap, iMap));
listOfMaps = new ArrayList(Arrays.asList(ac35Map, oMap, iMap, mMap));
mapImage.setImage(listOfMaps.get(currentMapIndex));
}