From 2382585c15132597635d455ed8374a2c60a9e15a Mon Sep 17 00:00:00 2001 From: Fan-Wu Yang Date: Wed, 6 Sep 2017 16:58:27 +1200 Subject: [PATCH] Fixed Javadoc and also made some variables private #story[1187] --- .../model/wind/ShiftingWindGenerator.java | 24 +++++++++---------- .../Controllers/MainController.java | 1 + 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java b/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java index d36a843b..efba7c79 100644 --- a/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java +++ b/racevisionGame/src/main/java/mock/model/wind/ShiftingWindGenerator.java @@ -9,18 +9,18 @@ import java.util.Random; * Created by jjg64 on 28/08/17. */ public class ShiftingWindGenerator implements WindGenerator { - Bearing baselineBearing; - double baseLineSpeed; - double windSpeedVariance = 5; - double bearingVariance = 5; // In degrees - double oscillationVariance = 0.25; - double oscillationPeriod = 1e3 * 60 * 1; // In milliseconds - - double timeOfLastOscillationReset = 0; - double timeOfLastChange = 0; - double timeSinceLastShift = 0; // Back / veer - - boolean anticlockwise = false; + private Bearing baselineBearing; + private double baseLineSpeed; + private double windSpeedVariance = 5; + private double bearingVariance = 5; // In degrees + private double oscillationVariance = 0.25; + private double oscillationPeriod = 1e3 * 60 * 1; // In milliseconds + + private double timeOfLastOscillationReset = 0; + private double timeOfLastChange = 0; + private double timeSinceLastShift = 0; // Back / veer + + private boolean anticlockwise = false; public ShiftingWindGenerator(Bearing baselineBearing, double baseLineSpeed) { this.baselineBearing = baselineBearing; diff --git a/racevisionGame/src/main/java/visualiser/Controllers/MainController.java b/racevisionGame/src/main/java/visualiser/Controllers/MainController.java index 57d18830..5098bc26 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/MainController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/MainController.java @@ -40,6 +40,7 @@ public class MainController extends Controller { * Transitions from the StartController screen (displays pre-race information) to the RaceController (displays the actual race). * @param visualiserRace The object modelling the race. * @param controllerClient Socket Client that manipulates the controller. + * @param isHost if the client is the host of a race or not. */ public void beginRace(VisualiserRaceEvent visualiserRace, ControllerClient controllerClient, Boolean isHost) { raceController.startRace(visualiserRace, controllerClient, isHost);