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

Fixed merge issues

Browse Source
This commit is contained in:
Fan-Wu Yang
2017-09-28 16:47:13 +13:00
parent d4c355fcb5
commit 9c4a949166
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
+11 -9
View File
@@ -55,6 +55,7 @@ public class TitleController extends Controller {
private SeaSurface seaSurface;
private Subject3D boat;
private AmbientLight ambientLight;
private Subject3D sailsSubject;
private ObservableList<Subject3D> 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"));