From 9c4a949166d85c6edf4fae9672228a1b15a214c0 Mon Sep 17 00:00:00 2001 From: Fan-Wu Yang Date: Thu, 28 Sep 2017 16:47:13 +1300 Subject: [PATCH] Fixed merge issues --- .../Controllers/TitleController.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java b/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java index 481fec5a..e26e445a 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java @@ -55,6 +55,7 @@ public class TitleController extends Controller { private SeaSurface seaSurface; private Subject3D boat; private AmbientLight ambientLight; + private Subject3D sailsSubject; private ObservableList subjects = FXCollections.observableArrayList(); public void initialize() { @@ -83,6 +84,14 @@ public class TitleController extends Controller { view3D.setPitch(5); view3D.setItems(subjects); +// URL asset = RaceViewController.class.getClassLoader().getResource("assets/V1.2 Complete Boat.stl"); +// StlMeshImporter importer = new StlMeshImporter(); +// importer.read(asset); +// Subject3D boat = new Subject3D(new MeshView(importer.getImport()), 0); + + Shape3D mesh = Assets3D.getBoat(); + boat = new Subject3D(mesh, 0); + skyBox = new SkyBox(750,200,250,0,250); subjects.addAll(skyBox.getSkyBoxPlanes()); @@ -91,14 +100,6 @@ public class TitleController extends Controller { seaSurface.setZ(250); subjects.add(seaSurface); -// URL asset = RaceViewController.class.getClassLoader().getResource("assets/V1.2 Complete Boat.stl"); -// StlMeshImporter importer = new StlMeshImporter(); -// importer.read(asset); -// Subject3D boat = new Subject3D(new MeshView(importer.getImport()), 0); - - Shape3D mesh = Assets3D.getBoat(); - Subject3D boat = new Subject3D(mesh, 0); - double radius = 100; boat.setX(0); boat.setZ(radius); @@ -110,7 +111,7 @@ public class TitleController extends Controller { //add sail Material whiteSail = new PhongMaterial(Color.WHITE); Sails3D sails3D = new Sails3D(); - Subject3D sailsSubject = new Subject3D(sails3D, 0); + sailsSubject = new Subject3D(sails3D, 0); sails3D.setMouseTransparent(true); sails3D.setMaterial(whiteSail); sailsSubject.setXRot(0d); @@ -209,6 +210,7 @@ public class TitleController extends Controller { skyBox = newSkyBox; seaSurface.getMesh().toFront(); boat.getMesh().toFront(); + sailsSubject.getMesh().toFront(); if (App.dayMode) { ambientLight.setColor(Color.web("#CCCCFF"));