Scaled down marks and boats to make 3rd person view more realistic
- Added boat and mark annotations to support selection at large camera distance - Reduced collision radius to 15 m - Fixed event startup and XML files as race was crashing on start #story[1296]
This commit is contained in:
@@ -81,7 +81,7 @@ public class Event {
|
||||
*/
|
||||
public Event(boolean singlePlayer) throws EventConstructionException {
|
||||
|
||||
String raceXMLFile = "mock/mockXML/raceTest.xml";
|
||||
String raceXMLFile = "mock/mockXML/raceThreePlayers.xml";
|
||||
String boatsXMLFile = "mock/mockXML/boatTest.xml";
|
||||
String regattaXMLFile = "mock/mockXML/regattaTest.xml";
|
||||
|
||||
@@ -180,7 +180,7 @@ public class Event {
|
||||
public static String setRaceXMLAtCurrentTimeToNow(String raceXML) {
|
||||
|
||||
//The start time is current time + 4 minutes. prestart is 3 minutes, and we add another minute.
|
||||
long millisecondsToAdd = Constants.RacePreStartTime + 1 * 60 * 10000;
|
||||
long millisecondsToAdd = Constants.RacePreStartTime + 1 * 60 * 1000;
|
||||
long secondsToAdd = millisecondsToAdd / 1000;
|
||||
//Scale the time using our time scalar.
|
||||
secondsToAdd = secondsToAdd / Constants.RaceTimeScale;
|
||||
|
||||
@@ -42,11 +42,14 @@ public class SourceIdAllocator {
|
||||
}
|
||||
|
||||
List<Integer> allocatedIDs = mockRace.getRaceDataSource().getParticipants();
|
||||
System.out.println(allocatedIDs);
|
||||
List<Integer> allIDs = new ArrayList<>(mockRace.getBoatDataSource().getBoats().keySet());
|
||||
System.out.println(allIDs);
|
||||
|
||||
//Get list of unallocated ids.
|
||||
List<Integer> unallocatedIDs = new ArrayList<>(allIDs);
|
||||
unallocatedIDs.removeAll(allocatedIDs);
|
||||
System.out.println(unallocatedIDs.isEmpty());
|
||||
|
||||
|
||||
if (!unallocatedIDs.isEmpty()) {
|
||||
|
||||
Reference in New Issue
Block a user