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

- Fixed Merge Errors

Browse Source 
#tags [1276]
This commit is contained in:
alistairjmcintyre
2017-09-27 22:25:32 +13:00
parent 810dde6a21
commit a08a38c985
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/GameView3D.java
+8 -5
View File
@@ -2,7 +2,6 @@ package seng302.visualiser;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -25,7 +24,11 @@ import javafx.scene.transform.Scale;
import javafx.scene.transform.Translate; import javafx.scene.transform.Translate;
import org.fxyz3d.scene.Skybox; import org.fxyz3d.scene.Skybox;
import seng302.gameServer.messages.RoundingSide; import seng302.gameServer.messages.RoundingSide;
import seng302.model.*; import seng302.model.ClientYacht;
import seng302.model.GameKeyBind;
import seng302.model.KeyAction;
import seng302.model.Limit;
import seng302.model.ScaledPoint;
import seng302.model.mark.CompoundMark; import seng302.model.mark.CompoundMark;
import seng302.model.mark.Corner; import seng302.model.mark.Corner;
import seng302.model.mark.Mark; import seng302.model.mark.Mark;
@@ -352,10 +355,10 @@ public class GameView3D extends GameView{
List<Mark> marks = course.get(playerYacht.getLegNumber()).getMarks(); List<Mark> marks = course.get(playerYacht.getLegNumber()).getMarks();
Point2D midPoint = new Point2D(0, 0); Point2D midPoint = new Point2D(0, 0);
if (marks.size() == 1) { if (marks.size() == 1) {
midPoint = findScaledXY(marks.get(0)); midPoint = scaledPoint.findScaledXY(marks.get(0));
} else if (marks.size() == 2) { } else if (marks.size() == 2) {
midPoint = (findScaledXY(marks.get(0))) midPoint = (scaledPoint.findScaledXY(marks.get(0)))
.midpoint(findScaledXY(marks.get(1))); .midpoint(scaledPoint.findScaledXY(marks.get(1)));
} }
if (midPoint != null) { if (midPoint != null) {