From 287cfd77d0ec9822e2beb28b4a567ea00c92f934 Mon Sep 17 00:00:00 2001 From: Haoming Yin Date: Wed, 27 Sep 2017 22:45:56 +1300 Subject: [PATCH] Fix: smoothing wind rotation - added animation for wind rotation - enlarged wind image's background to centre the compass #story[1273] --- .../controllers/RaceViewController.java | 11 ++++++++- src/main/resources/images/wind-180.png | Bin 26171 -> 27571 bytes src/main/resources/views/SplashScreen.fxml | 21 +++++++++--------- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/main/java/seng302/visualiser/controllers/RaceViewController.java b/src/main/java/seng302/visualiser/controllers/RaceViewController.java index bb7b6657..917e0bf6 100644 --- a/src/main/java/seng302/visualiser/controllers/RaceViewController.java +++ b/src/main/java/seng302/visualiser/controllers/RaceViewController.java @@ -9,6 +9,7 @@ import java.util.Map; import java.util.Timer; import java.util.TimerTask; import java.util.concurrent.TimeUnit; +import javafx.animation.RotateTransition; import javafx.animation.Timeline; import javafx.application.Platform; import javafx.beans.property.ReadOnlyBooleanProperty; @@ -47,6 +48,7 @@ import javafx.scene.shape.Polyline; import javafx.scene.text.Text; import javafx.stage.Stage; import javafx.stage.StageStyle; +import javafx.util.Duration; import seng302.model.ClientYacht; import seng302.model.RaceState; import seng302.model.mark.CompoundMark; @@ -608,9 +610,16 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel * Updates the wind direction arrow and text as from info from the StreamParser * @param direction the from north angle of the wind. */ + private double preDir = 0; private void updateWindDirection(double direction) { windDirectionLabel.setText(String.format("%.1f°", direction)); - windImageView.setRotate(direction); + RotateTransition rt = new RotateTransition(Duration.millis(300), windImageView); + rt.setByAngle(direction - preDir); + rt.setCycleCount(5); + rt.setAutoReverse(true); + rt.play(); + preDir = direction; +// windImageView.setRotate(direction); } /** diff --git a/src/main/resources/images/wind-180.png b/src/main/resources/images/wind-180.png index 0eb77ef38427e9f3611f5c6fb2ee3153ef358128..4bc6f05e395937285a8ceaf35cf9858740532c4f 100644 GIT binary patch delta 12534 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 CMECvx delta 11446 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 diff --git a/src/main/resources/views/SplashScreen.fxml b/src/main/resources/views/SplashScreen.fxml index 31449b7e..93525dff 100644 --- a/src/main/resources/views/SplashScreen.fxml +++ b/src/main/resources/views/SplashScreen.fxml @@ -1,16 +1,13 @@ - - - - - - + + + + + + + - - - - @@ -29,4 +26,8 @@ + + + +