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

Trying to get laylines to display on proper respective sides of the gate

Browse Source 
Having a great time here, Not quite working. There was an issue where the laylines are crossed and I think its tied to the fact that sometimes the two seperate points of the gate mark appear to have the same x y coordinate so the line function doesnt work? idk

tags: #story[956] #pair[wmu16]
This commit is contained in:
William Muir
2017-05-25 00:22:15 +12:00
parent 3cbbdb070f
commit ffe70a8313
3 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/controllers/RaceViewController.java
+13 -3
View File
@@ -22,6 +22,7 @@ import javafx.stage.Stage;
import javafx.stage.StageStyle;
import javafx.util.Duration;
import javafx.util.StringConverter;
import seng302.GeometryUtils;
import seng302.controllers.annotations.Annotation;
import seng302.controllers.annotations.ImportantAnnotationController;
import seng302.controllers.annotations.ImportantAnnotationDelegate;
@@ -213,7 +214,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
if (legNumber == 0) {
System.out.println("PreStart");
return null;
} else if (legNumber == markSequence.size() - 2) {
} else if (legNumber == markSequence.size() - 1) {
System.out.println("Finishing");
return null;
}
@@ -329,8 +330,17 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
Double resultingAngle = angleAndSpeed.keySet().iterator().next();
mg.addLayLine(markPoint1, 180 - resultingAngle, StreamParser.getWindDirection());
mg.addLayLine(markPoint2, 180 - resultingAngle, StreamParser.getWindDirection());
Point2D boatCurrentPos = new Point2D(bg.getLayoutX(), bg.getLayoutY());
Point2D gateMidPoint = markPoint1.midpoint(markPoint2);
Integer lineFuncResult = GeometryUtils.lineFunction(boatCurrentPos, gateMidPoint, markPoint2);
if (lineFuncResult == 1) {
mg.addRightLayline(markPoint2, 180 - resultingAngle, StreamParser.getWindDirection());
mg.addLeftLayline(markPoint1, 180 - resultingAngle, StreamParser.getWindDirection());
} else if (lineFuncResult == -1) {
mg.addRightLayline(markPoint1, 180 - resultingAngle, StreamParser.getWindDirection());
mg.addLeftLayline(markPoint2, 180 - resultingAngle, StreamParser.getWindDirection());
}
}
}