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

Merge remote-tracking branch 'origin/ac35_map_boundary' into ac35_map_boundary

Browse Source
This commit is contained in:
hba56
2017-09-28 12:42:09 +13:00
parent c2de45ce01 e8886d70de
commit 6187b83524
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/shared/model/Constants.java
+1 -1
View File
@@ -28,7 +28,7 @@ public class Constants {
* Frame periods are multiplied by this to get the amount of time a single frame represents.
* E.g., frame period = 20ms, scale = 5, frame represents 20 * 5 = 100ms, and so boats are simulated for 100ms, even though only 20ms actually occurred.
*/
public static final int RaceTimeScale = 2;
public static final int RaceTimeScale = 1;
/**
* The race pre-start time, in milliseconds. 30 seconds.
racevisionGame/src/main/java/shared/model/MarkRoundingSequence.java
+4 -3
View File
@@ -17,8 +17,9 @@ public class MarkRoundingSequence {
/**
* For each leg, mark rounding information.
* Maps between leg number and rounding data.
*/
private Map<Leg, MarkRoundingData> roundingPoints;
private Map<Integer, MarkRoundingData> roundingPoints;
@@ -34,7 +35,7 @@ public class MarkRoundingSequence {
* @return Rounding points for leg.
*/
public MarkRoundingData getRoundingData(Leg leg) {
return roundingPoints.get(leg);
return roundingPoints.get(leg.getLegNumber());
}
@@ -139,7 +140,7 @@ public class MarkRoundingSequence {
roundingData.setRoundCheck2Halfway(roundCheck2Halfway);
this.roundingPoints.put(currentLeg, roundingData);
this.roundingPoints.put(currentLeg.getLegNumber(), roundingData);
//Rounding points: