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

fixed boat collisions. Increased boat collision radius 15 -> 50

Browse Source
This commit is contained in:
Joseph
2017-09-28 01:29:58 +13:00
parent 75f8231bc5
commit e434af0728
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/mock/model/MockRace.java
+1 -3
View File
@@ -109,8 +109,6 @@ public class MockRace extends RaceState {
colliderRegistry.addCollider(mark.getMark1()); colliderRegistry.addCollider(mark.getMark1());
if(mark.getMark2() != null) colliderRegistry.addCollider(mark.getMark2()); if(mark.getMark2() != null) colliderRegistry.addCollider(mark.getMark2());
} }
this.colliderRegistry.addAllColliders(boats);
} }
@@ -133,9 +131,9 @@ public class MockRace extends RaceState {
this.boats.add(mockBoat); this.boats.add(mockBoat);
this.activeObserverCommands.put(boat.getSourceID(), new ActiveObserverCommand()); this.activeObserverCommands.put(boat.getSourceID(), new ActiveObserverCommand());
this.colliderRegistry.addCollider(mockBoat);
getRaceDataSource().incrementSequenceNumber(); getRaceDataSource().incrementSequenceNumber();
} }
/** /**
racevisionGame/src/main/java/shared/model/Boat.java
+1 -1
View File
@@ -418,7 +418,7 @@ public class Boat extends Collider {
@Override @Override
public boolean rayCast(Boat boat) { public boolean rayCast(Boat boat) {
if(boat != this) { if(boat != this) {
return rayCast(boat, 15); return rayCast(boat, 50);
} else return false; } else return false;
} }