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

Arrows now rendered in correct orientation but rounding arc sometimes inverted.

Browse Source 
#implement #story[1118]
This commit is contained in:
Calum
2017-08-16 20:29:56 +12:00
parent 21e6819f16
commit 86a7c2565c
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/GameClient.java
+3 -3
View File
@@ -263,20 +263,20 @@ public class GameClient {
if (allXMLReceived()) { if (allXMLReceived()) {
ClientYacht yacht = allBoatsMap.get(roundingData.getBoatId()); ClientYacht yacht = allBoatsMap.get(roundingData.getBoatId());
int placing = 1; int placing = 1;
int originalPlacing = yacht.getPlacing(); // int originalPlacing = yacht.getPlacing();
for (ClientYacht otherYacht : allBoatsMap.values()) { for (ClientYacht otherYacht : allBoatsMap.values()) {
if (otherYacht != yacht && yacht.getLegNumber() + 1 <= otherYacht.getLegNumber()) { if (otherYacht != yacht && yacht.getLegNumber() + 1 <= otherYacht.getLegNumber()) {
placing++; placing++;
} }
} }
if (placing != originalPlacing) { // if (placing != originalPlacing) {
yacht.setPlacing(placing); yacht.setPlacing(placing);
for (ClientYacht otherYacht : allBoatsMap.values()) { for (ClientYacht otherYacht : allBoatsMap.values()) {
if (otherYacht.getPlacing() < placing) { if (otherYacht.getPlacing() < placing) {
otherYacht.setPlacing(otherYacht.getPlacing() + 1); otherYacht.setPlacing(otherYacht.getPlacing() + 1);
} }
} }
} // }
yacht.roundMark( yacht.roundMark(
courseData.getCompoundMarks().get(roundingData.getMarkId()), courseData.getCompoundMarks().get(roundingData.getMarkId()),
roundingData.getTimeStamp(), roundingData.getTimeStamp(),
src/main/java/seng302/visualiser/GameView.java
+5 -4
View File
@@ -765,10 +765,11 @@ public class GameView extends Pane {
for (Mark mark : compoundMark.getMarks()) { for (Mark mark : compoundMark.getMarks()) {
markerObjects.get(mark).showNextExitArrow(); markerObjects.get(mark).showNextExitArrow();
} }
CompoundMark nextMark = course.get(legNumber); if (legNumber < course.size()) {
System.out.println("nextMark = " + nextMark); CompoundMark nextMark = course.get(legNumber);
for (Mark mark : nextMark.getMarks()) { for (Mark mark : nextMark.getMarks()) {
markerObjects.get(mark).showNextEnterArrow(); markerObjects.get(mark).showNextEnterArrow();
}
} }
if (legNumber - 2 >= 0) { if (legNumber - 2 >= 0) {
CompoundMark lastMark = course.get(Math.max(0, legNumber - 2)); CompoundMark lastMark = course.get(Math.max(0, legNumber - 2));