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

Refactored mock.Event to work with MockRace.

Browse Source 
Fixed the networking imports.
Race now keeps a reference to its Race, Boat, and Regatta data sources.
VisualiserRace can be provided with new Race/Boat/Regatta data sources during runtime. Currently it updates boundary and legs with a new RaceDataSource, and marker boats with a new BoatDataSource.
This commit is contained in:
fjc40
2017-07-06 15:25:00 +12:00
parent 8d36d89570
commit 3a0b81834f
30 changed files with 179 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/network/MessageDecoders/AverageWindDecoder.java
+3 -2
View File
@@ -1,7 +1,8 @@
package network.MessageDecoders;
import seng302.Networking.Messages.AverageWind;
import seng302.Networking.Utils.ByteConverter;
import network.Messages.AverageWind;
import network.Utils.ByteConverter;
import java.util.Arrays;
racevisionGame/src/main/java/network/MessageDecoders/BoatLocationDecoder.java
+6 -2
View File
@@ -1,10 +1,14 @@
package network.MessageDecoders;
import seng302.Networking.Messages.BoatLocation;
import network.Messages.BoatLocation;
import java.util.Arrays;
import static seng302.Networking.Utils.ByteConverter.*;
import static network.Utils.ByteConverter.bytesToInt;
import static network.Utils.ByteConverter.bytesToLong;
import static network.Utils.ByteConverter.bytesToShort;
/**
* Created by hba56 on 21/04/17.
racevisionGame/src/main/java/network/MessageDecoders/CourseWindDecoder.java
+5 -2
View File
@@ -1,11 +1,14 @@
package network.MessageDecoders;
import seng302.Networking.Messages.CourseWind;
import network.Messages.CourseWind;
import java.util.ArrayList;
import java.util.Arrays;
import static seng302.Networking.Utils.ByteConverter.*;
import static network.Utils.ByteConverter.bytesToInt;
import static network.Utils.ByteConverter.bytesToLong;
/**
* Created by hba56 on 23/04/17.
racevisionGame/src/main/java/network/MessageDecoders/MarkRoundingDecoder.java
+3 -2
View File
@@ -1,7 +1,8 @@
package network.MessageDecoders;
import seng302.Networking.Messages.MarkRounding;
import seng302.Networking.Utils.ByteConverter;
import network.Messages.MarkRounding;
import network.Utils.ByteConverter;
import java.util.Arrays;
racevisionGame/src/main/java/network/MessageDecoders/RaceStartStatusDecoder.java
+2 -1
View File
@@ -3,7 +3,8 @@ package network.MessageDecoders;
import java.util.Arrays;
import static seng302.Networking.Utils.ByteConverter.*;
import static network.Utils.ByteConverter.*;
/**
* Created by hba56 on 21/04/17.
racevisionGame/src/main/java/network/MessageDecoders/RaceStatusDecoder.java
+9 -5
View File
@@ -1,11 +1,15 @@
package network.MessageDecoders;
import seng302.Networking.Messages.BoatStatus;
import network.Messages.BoatStatus;
import java.util.ArrayList;
import java.util.Arrays;
import static seng302.Networking.Utils.ByteConverter.*;
import static network.Utils.ByteConverter.bytesToInt;
import static network.Utils.ByteConverter.bytesToLong;
import static network.Utils.ByteConverter.bytesToShort;
/**
* Created by hba56 on 21/04/17.
@@ -24,7 +28,7 @@ public class RaceStatusDecoder {
private long time;
private int race;
private int raceState;
private byte raceState;
private long startTime;
private int raceWindDir;
private short raceWindSpeed;
@@ -47,7 +51,7 @@ public class RaceStatusDecoder {
time = bytesToLong(timeBytes);
race = bytesToInt(raceID);
raceState = bytesToInt(raceStatus);
raceState = raceStatus;
startTime = bytesToLong(expectedStart);
raceWindDir = bytesToInt(raceWind);
raceWindSpeed = bytesToShort(windSpeed);
@@ -87,7 +91,7 @@ public class RaceStatusDecoder {
return race;
}
public int getRaceState() {
public byte getRaceState() {
return raceState;
}
racevisionGame/src/main/java/network/MessageDecoders/XMLMessageDecoder.java
+3 -2
View File
@@ -5,8 +5,9 @@ import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import static seng302.Networking.Utils.ByteConverter.bytesToLong;
import static seng302.Networking.Utils.ByteConverter.bytesToShort;
import static network.Utils.ByteConverter.bytesToLong;
import static network.Utils.ByteConverter.bytesToShort;
/**
* Created by hba56 on 20/04/17.