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

Merged master and added a few comments

Browse Source
This commit is contained in:
Fan-Wu Yang
2017-09-25 01:44:31 +13:00
parent 12b7d10f24
commit d280c0bdae
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+2 -2
View File
@@ -349,9 +349,8 @@ public class RaceViewController extends Controller {
@Override @Override
public void handle(long now) { public void handle(long now) {
//if sails are out
double sailDir; double sailDir;
//if sails are luffing //if sails are out etc
if (boat.isSailsOut()) { if (boat.isSailsOut()) {
double windDir = visualiserRace.getVisualiserRaceState().getWindDirection().degrees(); double windDir = visualiserRace.getVisualiserRaceState().getWindDirection().degrees();
double windOffset = (360 - windDir + boat.getBearing().degrees()) % 360; double windOffset = (360 - windDir + boat.getBearing().degrees()) % 360;
@@ -366,6 +365,7 @@ public class RaceViewController extends Controller {
sailDir = visualiserRace.getVisualiserRaceState().getWindDirection().degrees(); sailDir = visualiserRace.getVisualiserRaceState().getWindDirection().degrees();
} }
//get new place to move towards
double compA = ((sailCurrent - sailDir) % 360 + 360) % 360;//degrees right double compA = ((sailCurrent - sailDir) % 360 + 360) % 360;//degrees right
if (compA > 180) compA = 360 - compA; if (compA > 180) compA = 360 - compA;
double compB = ((sailDir - sailCurrent) % 360 + 360) % 360;//degrees left double compB = ((sailDir - sailCurrent) % 360 + 360) % 360;//degrees left