fjc40
19984772c0
Also got client-server handshake working. Multiple clients can connect and control their own boat. The client's boat has a larger black triangle drawn around it. Probably needs tidying up. Added isClientBoat boolean to VisualiserBoat. WindGenerator is now an interface, implemented by ConstantWindGenerator (useful for testing) and RandomWindGenerator. Added ConstantWindGeneratorTest. RandomWindGenerator was formerly WindGenerator. The WindGenerator is passed in to MockRace. CommandFactory throws a CommandConstructionException if it cannot create a command. MessageSerialiser and MessageDeserialiser correctly terminate on error. Readded VisualiserInput's switch statement in the main loop, pending a refactor. Removed the sleep statement from LobbyController - it was blocking javaFX thread. Lobby.fxml: moved buttons and text input into grid panes, so they don't break when you resize screen. Added some test object creation functions in several test classes (MockRaceTest.createMockRace(), BoatXMLReaderTest.createBoatDataSource(), etc...). #story[1095]
55 lines
1.2 KiB
Java
55 lines
1.2 KiB
Java
package mock.model;
|
|
|
|
|
|
import shared.model.Bearing;
|
|
import shared.model.Wind;
|
|
|
|
import java.util.Random;
|
|
|
|
/**
|
|
* This class generates Wind objects for use in a MockRace.
|
|
* Initialised with a baseline wind speed and direction, and keeps it constant.
|
|
*/
|
|
public class ConstantWindGenerator implements WindGenerator {
|
|
|
|
/**
|
|
* The bearing the wind direction starts at.
|
|
*/
|
|
private Bearing windBaselineBearing;
|
|
|
|
|
|
/**
|
|
* The speed the wind starts at, in knots.
|
|
*/
|
|
private double windBaselineSpeed;
|
|
|
|
|
|
|
|
/**
|
|
* Creates a constant wind generator, with a baseline wind speed and direction.
|
|
* @param windBaselineBearing Baseline wind direction.
|
|
* @param windBaselineSpeed Baseline wind speed, in knots.
|
|
*/
|
|
public ConstantWindGenerator(Bearing windBaselineBearing, double windBaselineSpeed) {
|
|
|
|
this.windBaselineBearing = windBaselineBearing;
|
|
this.windBaselineSpeed = windBaselineSpeed;
|
|
|
|
}
|
|
|
|
|
|
@Override
|
|
public Wind generateBaselineWind() {
|
|
return new Wind(windBaselineBearing, windBaselineSpeed);
|
|
}
|
|
|
|
|
|
@Override
|
|
public Wind generateNextWind(Wind currentWind) {
|
|
|
|
return generateBaselineWind();
|
|
|
|
}
|
|
|
|
}
|