From 55713f14a192d9e91f95e8fa1b99283ee6546ffc Mon Sep 17 00:00:00 2001 From: Joseph Gardner Date: Thu, 14 Sep 2017 16:37:58 +1200 Subject: [PATCH] Merge branch 'master' into storyD-3D # 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 --- .../src/main/java/visualiser/layout/Boundary3D.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/racevisionGame/src/main/java/visualiser/layout/Boundary3D.java b/racevisionGame/src/main/java/visualiser/layout/Boundary3D.java index 6af7918b..bfbf7dcf 100644 --- a/racevisionGame/src/main/java/visualiser/layout/Boundary3D.java +++ b/racevisionGame/src/main/java/visualiser/layout/Boundary3D.java @@ -62,12 +62,12 @@ public class Boundary3D { 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.setZ(graphCoord1.getY()); 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.setZ(avgCoord.getY()); double angle = 90 + Math.toDegrees(GPSConverter.getAngle(graphCoord2, graphCoord1));