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

Boat on start screen now follows infinite loop

Browse Source 
- Removed non-resizable property on TitleController

#story[1301]
This commit is contained in:
Connor Taylor-Brown
2017-09-27 22:37:15 +13:00
parent 4f229ad01c
commit 315bb64bb3
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
+11 -1
View File
@@ -79,16 +79,26 @@ public class TitleController extends Controller {
StlMeshImporter importer = new StlMeshImporter(); StlMeshImporter importer = new StlMeshImporter();
importer.read(asset); importer.read(asset);
Subject3D boat = new Subject3D(new MeshView(importer.getImport()), 0); Subject3D boat = new Subject3D(new MeshView(importer.getImport()), 0);
double radius = 100;
boat.setX(0);
boat.setZ(radius);
boat.setScale(0.1); boat.setScale(0.1);
subjects.add(boat); subjects.add(boat);
view3D.trackSubject(boat, -45); view3D.trackSubject(boat, -45);
view3DContainer.add(view3D, 0, 0); view3DContainer.add(view3D, 0, 0);
AnimationTimer loop = new AnimationTimer() { AnimationTimer loop = new AnimationTimer() {
double angle = -90;
double offset = 0.05;
@Override @Override
public void handle(long now) { public void handle(long now) {
boat.setZ(boat.getPosition().getZ() + 0.05); boat.setX(radius * Math.cos(angle * Math.PI/180));
boat.setZ(radius * Math.sin(angle * Math.PI/180));
boat.setHeading(-angle);
angle += offset;
} }
}; };
loop.start(); loop.start();
racevisionGame/src/main/java/visualiser/app/App.java
-1
View File
@@ -132,7 +132,6 @@ public class App extends Application {
FXMLLoader loader = new FXMLLoader(getClass().getResource FXMLLoader loader = new FXMLLoader(getClass().getResource
("/visualiser/scenes/title.fxml")); ("/visualiser/scenes/title.fxml"));
Parent root = loader.load(); Parent root = loader.load();
stage.setResizable(false);
Scene scene = new Scene(root); Scene scene = new Scene(root);
stage.setTitle("The Boat Game - Burgers & Boats"); stage.setTitle("The Boat Game - Burgers & Boats");
stage.getIcons().add(new Image(getClass().getClassLoader().getResourceAsStream("images/SailIcon.png"))); stage.getIcons().add(new Image(getClass().getClassLoader().getResourceAsStream("images/SailIcon.png")));