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

Created more fire instances. #story[1292]

Browse Source
This commit is contained in:
David Wu
2017-09-24 22:50:12 +13:00
parent 1070842ada
commit 45b2f0b6db
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+27 -3
View File
@@ -353,12 +353,26 @@ public class RaceViewController extends Controller {
viewSubjects.add(boatModel); viewSubjects.add(boatModel);
//Create first fire
FireParticle fire = new FireParticle(); FireParticle fire = new FireParticle();
viewSubjects.add(fire); viewSubjects.add(fire);
fire.rotateView((double) -90, fire.getPosition().getX(), fire.getPosition().getY(), fire.getPosition().getZ(), Rotate.X_AXIS); fire.rotateView((double) -90, fire.getPosition().getX(), fire.getPosition().getY(), fire.getPosition().getZ(), Rotate.X_AXIS);
//Create second fire
FireParticle fireSecond = new FireParticle();
viewSubjects.add(fireSecond);
fireSecond.rotateView((double) -90, fireSecond.getPosition().getX(), fireSecond.getPosition().getY(), fireSecond.getPosition().getZ(), Rotate.X_AXIS);
fireSecond.rotateView((double) 60, fireSecond.getPosition().getX(), fireSecond.getPosition().getY(), fireSecond.getPosition().getZ(), Rotate.Y_AXIS);
//Create third fire
FireParticle fireThird = new FireParticle();
viewSubjects.add(fireThird);
fireThird.rotateView((double) -90, fireThird.getPosition().getX(), fireThird.getPosition().getY(), fireThird.getPosition().getZ(), Rotate.X_AXIS);
fireThird.rotateView((double) 120, fireThird.getPosition().getX(), fireThird.getPosition().getY(), fireThird.getPosition().getZ(), Rotate.Y_AXIS);
// Track this boat's movement with the new subject // Track this boat's movement with the new subject
AnimationTimer trackBoat = new AnimationTimer() { AnimationTimer trackBoat = new AnimationTimer() {
@Override @Override
@@ -367,11 +381,21 @@ public class RaceViewController extends Controller {
boatModel.setX(gpsConverter.convertGPS(boat.getPosition()).getX()); boatModel.setX(gpsConverter.convertGPS(boat.getPosition()).getX());
boatModel.setZ(gpsConverter.convertGPS(boat.getPosition()).getY()); boatModel.setZ(gpsConverter.convertGPS(boat.getPosition()).getY());
//Set up fire particles //Fire follows boat
//fire.setHeading(boat.getBearing().degrees()); fire.setHeading(boat.getBearing().degrees());
fire.setX(gpsConverter.convertGPS(boat.getPosition()).getX()); fire.setX(gpsConverter.convertGPS(boat.getPosition()).getX());
fire.setZ(gpsConverter.convertGPS(boat.getPosition()).getY()); fire.setZ(gpsConverter.convertGPS(boat.getPosition()).getY());
fireSecond.setHeading(boat.getBearing().degrees());
fireSecond.setX(gpsConverter.convertGPS(boat.getPosition()).getX());
fireSecond.setZ(gpsConverter.convertGPS(boat.getPosition()).getY());
fireThird.setHeading(boat.getBearing().degrees());
fireThird.setX(gpsConverter.convertGPS(boat.getPosition()).getX());
fireThird.setZ(gpsConverter.convertGPS(boat.getPosition()).getY());
} }
}; };
trackBoat.start(); trackBoat.start();
racevisionGame/src/main/java/visualiser/layout/FireParticle.java
+3 -1
View File
@@ -36,11 +36,12 @@ public class FireParticle extends Subject3D {
MeshView fireSurface = new MeshView(plane); MeshView fireSurface = new MeshView(plane);
fireSurface.setTranslateZ(15);
fireSurface.setTranslateY(10);
fireSurface.setMaterial(material); fireSurface.setMaterial(material);
fireSurface.setMouseTransparent(true); fireSurface.setMouseTransparent(true);
fireSurface.toFront(); fireSurface.toFront();
System.out.println("Fire created");
return fireSurface; return fireSurface;
} }
@@ -53,4 +54,5 @@ public class FireParticle extends Subject3D {
this.getMesh().getTransforms().add(rotate); this.getMesh().getTransforms().add(rotate);
} }
} }