From 45b2f0b6dbf9fd2dd01c9130fe270a60ad5e3531 Mon Sep 17 00:00:00 2001 From: David Wu Date: Sun, 24 Sep 2017 22:50:12 +1300 Subject: [PATCH] Created more fire instances. #story[1292] --- .../Controllers/RaceViewController.java | 30 +++++++++++++++++-- .../java/visualiser/layout/FireParticle.java | 4 ++- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java index aaf9b79f..76e1ab25 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java @@ -353,12 +353,26 @@ public class RaceViewController extends Controller { viewSubjects.add(boatModel); - + //Create first fire FireParticle fire = new FireParticle(); viewSubjects.add(fire); 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 AnimationTimer trackBoat = new AnimationTimer() { @Override @@ -367,11 +381,21 @@ public class RaceViewController extends Controller { boatModel.setX(gpsConverter.convertGPS(boat.getPosition()).getX()); boatModel.setZ(gpsConverter.convertGPS(boat.getPosition()).getY()); - //Set up fire particles - //fire.setHeading(boat.getBearing().degrees()); + //Fire follows boat + fire.setHeading(boat.getBearing().degrees()); fire.setX(gpsConverter.convertGPS(boat.getPosition()).getX()); 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(); diff --git a/racevisionGame/src/main/java/visualiser/layout/FireParticle.java b/racevisionGame/src/main/java/visualiser/layout/FireParticle.java index c99594d4..9b0a9172 100644 --- a/racevisionGame/src/main/java/visualiser/layout/FireParticle.java +++ b/racevisionGame/src/main/java/visualiser/layout/FireParticle.java @@ -36,11 +36,12 @@ public class FireParticle extends Subject3D { MeshView fireSurface = new MeshView(plane); + fireSurface.setTranslateZ(15); + fireSurface.setTranslateY(10); fireSurface.setMaterial(material); fireSurface.setMouseTransparent(true); fireSurface.toFront(); - System.out.println("Fire created"); return fireSurface; } @@ -53,4 +54,5 @@ public class FireParticle extends Subject3D { this.getMesh().getTransforms().add(rotate); } + }