From c08cbb01d64e21b786fa8ad966a4220009edfd20 Mon Sep 17 00:00:00 2001 From: Fan-Wu Yang Date: Thu, 28 Sep 2017 11:39:06 +1300 Subject: [PATCH] removed println messages --- .../Controllers/RaceViewController.java | 3 --- .../java/visualiser/layout/SeagullFlock.java | 2 -- .../main/java/visualiser/layout/SeagullMesh.java | 16 +++++++--------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java index 2df80850..df9a605e 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java @@ -751,7 +751,6 @@ public class RaceViewController extends Controller { chosenMark = mark1; } else { boolean rounding = port; - System.out.println(direction); switch (direction) { case 2: rounding = !port; @@ -822,7 +821,6 @@ public class RaceViewController extends Controller { double angle = gpsConverter.getAngle(gpsConverter.convertGPS(start.getMark1().getPosition()), gpsConverter.convertGPS(end.getMark1Position())); angle = (Math.toDegrees(angle) % 360 + 360) % 360; - System.out.println(angle); int dir = 0; //0 = top 1 = right 2 = down 3 = down if (angle < 315){ if (angle > 45){ @@ -1328,7 +1326,6 @@ public class RaceViewController extends Controller { public void addToFlock(){ Annotation3D newSeagull = new Annotation3D(new SeagullMesh()); newSeagull.setY(-15); - System.out.println(newSeagull.getY()); newSeagull.setX(67); newSeagull.setZ(43); newSeagull.setXRot(0); diff --git a/racevisionGame/src/main/java/visualiser/layout/SeagullFlock.java b/racevisionGame/src/main/java/visualiser/layout/SeagullFlock.java index acc88a43..647082b7 100644 --- a/racevisionGame/src/main/java/visualiser/layout/SeagullFlock.java +++ b/racevisionGame/src/main/java/visualiser/layout/SeagullFlock.java @@ -58,7 +58,6 @@ public class SeagullFlock{ public void handle(long now) { for (int i = 0; i < seagulls.size(); i++){ Subject3D seagull = seagulls.get(i); - System.out.println(seagull.getY()); seagull.getMesh().setTranslateY(zPos); seagull.setHeading(heading); @@ -84,7 +83,6 @@ public class SeagullFlock{ public void addToFlock(){ if (seagulls.size() < 3) { Annotation3D newSeagull = new Annotation3D(new SeagullMesh()); - System.out.println("After Create " + newSeagull.getY()); newSeagull.setXRot(0); seagulls.add(newSeagull); // seagulls.add(new Annotation3D(new Sphere(5))); diff --git a/racevisionGame/src/main/java/visualiser/layout/SeagullMesh.java b/racevisionGame/src/main/java/visualiser/layout/SeagullMesh.java index 12d48e87..cffd5913 100644 --- a/racevisionGame/src/main/java/visualiser/layout/SeagullMesh.java +++ b/racevisionGame/src/main/java/visualiser/layout/SeagullMesh.java @@ -19,15 +19,13 @@ public class SeagullMesh extends MeshView{ public SeagullMesh() { setMesh(Assets3D.seagull[0].getMesh()); - setTranslateY(10); - System.out.println("On create " + getTranslateY()); -// PhongMaterial white = new PhongMaterial(Color.WHITE); -// setMaterial(white); -// Random rand = new Random(); -// flapPeriod = rand.nextInt(9); -// flapPeriod = 60 * (11 + flapPeriod); -// flapStrength = rand.nextInt(3) + 2; - //scheduledFlap.start(); + PhongMaterial white = new PhongMaterial(Color.WHITE); + setMaterial(white); + Random rand = new Random(); + flapPeriod = rand.nextInt(9); + flapPeriod = 60 * (11 + flapPeriod); + flapStrength = rand.nextInt(3) + 2; + scheduledFlap.start(); } private AnimationTimer flap = new AnimationTimer() {