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

Merge branch 'master' into storyD-3D

Browse Source 
# Conflicts:
#	.gitignore
#	racevisionGame/src/main/java/mock/model/RaceServer.java
#	racevisionGame/src/main/java/mock/model/collider/Collider.java
#	racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
#	racevisionGame/src/main/java/shared/model/Boat.java
#	racevisionGame/src/main/java/shared/model/Mark.java
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
#	racevisionGame/src/main/java/visualiser/Controllers/MainController.java
#	racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
#	racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
#	racevisionGame/src/main/java/visualiser/layout/Plane3D.java
#	racevisionGame/src/main/java/visualiser/layout/SeaSurface.java
#	racevisionGame/src/main/java/visualiser/layout/View3D.java
#	racevisionGame/src/main/java/visualiser/utils/PerlinNoiseGenerator.java
#	racevisionGame/src/main/resources/visualiser/scenes/title.fxml
This commit is contained in:
Joseph Gardner
2017-09-14 16:37:58 +12:00
parent 7bea2fee73
commit 55713f14a1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/layout/Boundary3D.java
+2 -2
View File
@@ -62,12 +62,12 @@ public class Boundary3D {
double c = Math.sqrt(a * a + b * b); double c = Math.sqrt(a * a + b * b);
Subject3D bound1 = new Subject3D(new Sphere(thickness * 2),0); Subject3D bound1 = new Annotation3D(new Sphere(thickness * 2));
bound1.setX(graphCoord1.getX()); bound1.setX(graphCoord1.getX());
bound1.setZ(graphCoord1.getY()); bound1.setZ(graphCoord1.getY());
boundaryNodes.add(bound1); boundaryNodes.add(bound1);
Subject3D connector = new Subject3D(new Box(c, thickness, thickness),0); Subject3D connector = new Annotation3D(new Box(c, thickness, thickness));
connector.setX(avgCoord.getX()); connector.setX(avgCoord.getX());
connector.setZ(avgCoord.getY()); connector.setZ(avgCoord.getY());
double angle = 90 + Math.toDegrees(GPSConverter.getAngle(graphCoord2, graphCoord1)); double angle = 90 + Math.toDegrees(GPSConverter.getAngle(graphCoord2, graphCoord1));