From 9daa9af2e9e96b5c4ceb8cd587956d1e93ddb7d3 Mon Sep 17 00:00:00 2001
From: David96 <david@hameipe.de>
Date: Mon, 4 Jan 2021 19:45:13 +0100
Subject: [PATCH] Add some background color animation depending on level

---
 GameScreen.java          |  43 ++++++++++++++-
 LinearColorAnimator.java | 115 +++++++++++++++++++++++++++++++++++++++
 Rectangle.java           |   5 ++
 World.java               |  18 +++++-
 build/FlappyTurtle.jar   | Bin 14353 -> 16553 bytes
 5 files changed, 176 insertions(+), 5 deletions(-)
 create mode 100644 LinearColorAnimator.java

diff --git a/GameScreen.java b/GameScreen.java
index 0ca6fe0..570f40a 100644
--- a/GameScreen.java
+++ b/GameScreen.java
@@ -1,17 +1,24 @@
+import java.awt.Color;
 import java.util.List;
 import java.util.ArrayList;
 
-class GameScreen
+class GameScreen implements LinearColorAnimator.AnimationListener
 {
+    private final static int LEVEL_TIME = 10;
+
     private final List<Drawable> _drawables;
     private final Bird _bird;
     private final World _world;
+    private final LinearColorAnimator _backgroundAnimator;
     private double _totalTime;
     private int _try;
+    private int _level;
 
     public GameScreen()
     {
         _drawables = new ArrayList<Drawable>();
+        _backgroundAnimator = new LinearColorAnimator(Color.BLACK, Color.WHITE, 1, this);
+        _backgroundAnimator.start();
         _bird = new Bird(this);
         _world = new World(this);
         _totalTime = 0;
@@ -25,10 +32,24 @@ class GameScreen
     {
         _bird.update(elapsed);
         _world.update(elapsed);
+        _backgroundAnimator.update(elapsed);
         _totalTime += elapsed;
         System.out.print("\r" + _try + " - Time survived: " + (int)(_totalTime * 1e-3) + "s, " +
                 "speed: " + (int)_world.getSpeed() + "px/s");
 
+        if (_totalTime / (LEVEL_TIME * 1e3) > _level + 1)
+        {
+            ++_level;
+            // Would be nice to add some more levels with different colors
+            if (_level == 1)
+            {
+                _world.setObstacleColor("grau");
+                _backgroundAnimator.setStart(Color.WHITE);
+                _backgroundAnimator.setEnd(Color.BLACK);
+                _backgroundAnimator.start();
+            }
+        }
+
         Rectangle birdRect = _bird.getRect();
         if (_world.checkCollision(_bird.getRect())
                 || birdRect.getY() + birdRect.getHeight() > TurtleWelt.HEIGHT
@@ -36,16 +57,32 @@ class GameScreen
         {
             System.out.print("\n");
             ++_try;
-            _totalTime = 0;
+            _totalTime = _level = 0;
             _bird.reset();
             _world.reset();
+
+            // If the background is currently not white, smoothly animate it back
+            if (_backgroundAnimator.getCurrentColor().getRGB() != Color.WHITE.getRGB())
+            {
+                _backgroundAnimator.setStart(_backgroundAnimator.getCurrentColor());
+                _backgroundAnimator.setEnd(Color.WHITE);
+                _backgroundAnimator.start();
+            }
         }
     }
 
+    public void onAnimationFinished()
+    {
+        if (_backgroundAnimator.getEnd().getRGB() == Color.BLACK.getRGB())
+        {
+            _world.setObstacleColor("weiss");
+        }
+    }
 
     public void draw(Turtle turtle, double elapsed)
     {
-        TurtleWelt.globaleWelt.bildschirmEinfaerben(255, 255, 255);
+        Color bg = _backgroundAnimator.getCurrentColor();
+        TurtleWelt.globaleWelt.bildschirmEinfaerben(bg.getRed(), bg.getGreen(), bg.getBlue());
         for (Drawable d : _drawables)
         {
             d.draw(turtle, elapsed);
diff --git a/LinearColorAnimator.java b/LinearColorAnimator.java
new file mode 100644
index 0000000..a7ce786
--- /dev/null
+++ b/LinearColorAnimator.java
@@ -0,0 +1,115 @@
+import java.awt.Color;
+
+class LinearColorAnimator
+{
+    private Color _start, _end;
+    private final AnimationListener _listener;
+    private int _duration;
+    private double _elapsed;
+    private boolean _started;
+    private boolean _finished;
+
+    /*
+     * @param duration Duration in seconds
+     */
+    public LinearColorAnimator(Color start, Color end, int duration, AnimationListener listener)
+    {
+        _start = start;
+        _end = end;
+        _duration = duration;
+        _listener = listener;
+    }
+
+    /*
+     * @param elapsed Elapsed time since last call in ms
+     */
+    public void update(double elapsed)
+    {
+        if (_started)
+        {
+            _elapsed += elapsed * 1e-3;
+
+            if (_elapsed > _duration)
+            {
+                _started = false;
+                _finished = true;
+                if (_listener != null)
+                {
+                    _listener.onAnimationFinished();
+                }
+            }
+        }
+    }
+
+    public void start()
+    {
+        _started = true;
+        _finished = false;
+        _elapsed = 0;
+    }
+
+    public void reset()
+    {
+        _started = _finished = false;
+        _elapsed = 0;
+    }
+
+    public void setStart(Color c)
+    {
+        _start = c;
+    }
+
+    public void setEnd(Color c)
+    {
+        _end = c;
+    }
+
+    public void setDuration(int duration)
+    {
+        _duration = duration;
+    }
+
+    public boolean hasStarted()
+    {
+        return _started;
+    }
+
+    public boolean hasFinished()
+    {
+        return _finished;
+    }
+
+    public Color getStart()
+    {
+        return _start;
+    }
+
+    public Color getEnd()
+    {
+        return _end;
+    }
+
+    public Color getCurrentColor()
+    {
+        if (_finished)
+        {
+            return _end;
+        }
+        if (!_started)
+        {
+            return _start;
+        }
+        int diffR = _end.getRed() - _start.getRed();
+        int diffG = _end.getGreen() - _start.getGreen();
+        int diffB = _end.getBlue() - _start.getBlue();
+        double elapsedRatio = _elapsed / _duration;
+        return new Color((int)(_start.getRed() + diffR * elapsedRatio),
+                         (int)(_start.getGreen() + diffG * elapsedRatio),
+                         (int)(_start.getBlue() + diffB * elapsedRatio));
+    }
+
+    interface AnimationListener
+    {
+        public abstract void onAnimationFinished();
+    }
+}
diff --git a/Rectangle.java b/Rectangle.java
index 61bf1e7..df51fd5 100644
--- a/Rectangle.java
+++ b/Rectangle.java
@@ -86,4 +86,9 @@ class Rectangle implements Drawable {
         _x = x;
         _y = y;
     }
+
+    public void setColor(String c)
+    {
+        _color = c;
+    }
 }
diff --git a/World.java b/World.java
index 4c7411c..2318bec 100644
--- a/World.java
+++ b/World.java
@@ -8,6 +8,7 @@ class World implements Drawable
     private static final int ACCELERATION = 2;
 
     private final ArrayList<Rectangle> _obstacles;
+    private String _obstacleColor;
     private double _speed;
     private final Random _random;
 
@@ -22,15 +23,28 @@ class World implements Drawable
     public void reset()
     {
         _obstacles.clear();
+        _obstacleColor = "schwarz";
         createObstacle(TurtleWelt.WIDTH);
         _speed = START_SPEED;
     }
 
+    public void setObstacleColor(String c)
+    {
+        for (Drawable d : _obstacles)
+        {
+            if (d instanceof Rectangle)
+            {
+                ((Rectangle)d).setColor(c);
+            }
+        }
+        _obstacleColor = c;
+    }
+
     private void createObstacle(int x)
     {
         int gap = _random.nextInt(TurtleWelt.HEIGHT - 200) + 50;
-        _obstacles.add(new Rectangle(x, 0, 30, gap, "black", false));
-        _obstacles.add(new Rectangle(x, gap + 100, 30, TurtleWelt.HEIGHT, "black", false));
+        _obstacles.add(new Rectangle(x, 0, 30, gap, _obstacleColor, false));
+        _obstacles.add(new Rectangle(x, gap + 100, 30, TurtleWelt.HEIGHT, _obstacleColor, false));
     }
 
     public void update(double elapsed)
diff --git a/build/FlappyTurtle.jar b/build/FlappyTurtle.jar
index 76a3f913282605f4c8abbc1b64989484fd2097b5..1c15ed4ec1264e1eb925fce1a24fd32a48c2d679 100644
GIT binary patch
delta 6555
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
URZt)Qo+NyDoFBZhi2t_!A5Uw}+yDRo

delta 4368
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
JN!b(Y{{X#k$MpaJ