Aufgaben 7

SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/GameObjectManager.java

@@ -3,6 +3,7 @@ package de.thdeg.greiner.superpangworld.game.managers;
 import de.thdeg.greiner.superpangworld.gameview.GameView;
 import de.thdeg.greiner.superpangworld.graphics.base.Bubble;
 import de.thdeg.greiner.superpangworld.graphics.base.GameObject;
+import de.thdeg.greiner.superpangworld.graphics.base.MovingGameObject;
 import de.thdeg.greiner.superpangworld.graphics.immovable.*;
 import de.thdeg.greiner.superpangworld.graphics.moveable.*;
 
@@ -65,8 +66,7 @@ class GameObjectManager {
         gameObjects.add(player);
 
         gameObjects.forEach(gameObject ->{
-            gameObject.updatePosition();
+            gameObject.update();
-            gameObject.updateStatus();
             gameObject.addToCanvas();
         });
     }

SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/GamePlayManager.java

@@ -18,7 +18,7 @@ public class GamePlayManager {
     private GameView gameView;
     /** The manager, which handles the game objects */
     private GameObjectManager gameObjectManager;
-    /** Flag, if the gameobjects were already deleted once */
+    /** Flag, if the game objects were already deleted once */
     private boolean listHasBeenDeleted;
     /** Generator for random values */
     private Random random;

SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/base/Bubble.java

@@ -5,7 +5,7 @@ import de.thdeg.greiner.superpangworld.gameview.GameView;
 /**
  * A Bubble, which moves around on the screen and can be shot by the player.
  */
-public class Bubble extends GameObject {
+public abstract class Bubble extends GameObject implements MovingGameObject{
 
     /** Flag, if the bubble flies from left to right */
     private boolean flyFromLeftToRight;

SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/base/GameObject.java

@@ -35,25 +35,24 @@ public abstract class GameObject {
         position = new Position(0,0);
     }
 
-    /**
-     * Update the position of the game object.
-     */
-    public void updatePosition(){
-
-    }
-
     /**
      * Add the game object to the canvas.
      */
-    public void addToCanvas(){
+    public abstract void addToCanvas();
-
-    }
 
     /**
      * Updates the game object's status.
      */
-    public void updateStatus(){
+    protected abstract void updateStatus();
 
+    /**
+     * Update the status and the position is applicable.
+     */
+    public void update(){
+        if(this instanceof MovingGameObject){
+            ((MovingGameObject)this).updatePosition();
+        }
+        updateStatus();
     }
 
     /**

SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/base/MovingGameObject.java

@@ -0,0 +1,13 @@
+package de.thdeg.greiner.superpangworld.graphics.base;
+
+/**
+ * The interface for moving game objects.
+ */
+public interface MovingGameObject {
+
+    /**
+     * Update the position of a game object.
+     */
+    public void updatePosition();
+
+}

SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/Background.java

@@ -43,4 +43,9 @@ public class Background extends GameObject {
     public void addToCanvas() {
         gameView.addBlockImageToCanvas(pixelArt,position.x,position.y,size, rotation);
     }
+
+    @Override
+    public void updateStatus() {
+
+    }
 }

SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LevelLabel.java

@@ -35,8 +35,8 @@ public class LevelLabel extends GameObject {
     }
 
     @Override
-    public void updatePosition() {
+    public void updateStatus() {
-        super.updatePosition();
+
     }
 
     @Override

SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LevelProgressBar.java

@@ -40,8 +40,8 @@ public class LevelProgressBar extends GameObject {
     }
 
     @Override
-    public void updatePosition() {
+    public void updateStatus() {
-        super.updatePosition();
+
     }
 
     @Override

SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LivesIcon.java

@@ -38,4 +38,9 @@ public class LivesIcon extends GameObject {
     public void addToCanvas() {
         gameView.addBlockImageToCanvas(ICON,position.x,position.y,size,rotation);
     }
+
+    @Override
+    public void updateStatus() {
+
+    }
 }

SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/ScoreLabel.java

@@ -33,7 +33,7 @@ public class ScoreLabel extends GameObject {
     }
 
     @Override
-    public void updatePosition() {
+    public void updateStatus() {
-        super.updatePosition();
+
     }
 }

SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/moveable/Harpoon.java

@@ -3,11 +3,12 @@ package de.thdeg.greiner.superpangworld.graphics.moveable;
 import de.thdeg.greiner.superpangworld.gameview.GameView;
 import de.thdeg.greiner.superpangworld.graphics.base.Bubble;
 import de.thdeg.greiner.superpangworld.graphics.base.GameObject;
+import de.thdeg.greiner.superpangworld.graphics.base.MovingGameObject;
 
 /**
  * A harpoon which can be fired upwards by the player.
  */
-public class Harpoon extends GameObject {
+public class Harpoon extends GameObject implements MovingGameObject {
 
     private final static String HARPOON =
                     "    B    \n"+

SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/moveable/HexagonalBubble.java

@@ -30,6 +30,11 @@ public class HexagonalBubble extends Bubble {
         gameView.addImageToCanvas("hexagon.png",position.x,position.y,size,rotation);
     }
 
+    @Override
+    public void updateStatus() {
+
+    }
+
     @Override
     public void updatePosition() {
         super.updatePosition();

SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/moveable/Player.java

@@ -2,6 +2,7 @@ package de.thdeg.greiner.superpangworld.graphics.moveable;
 
 import de.thdeg.greiner.superpangworld.gameview.GameView;
 import de.thdeg.greiner.superpangworld.graphics.base.GameObject;
+import de.thdeg.greiner.superpangworld.graphics.base.MovingGameObject;
 
 import java.awt.*;
 
@@ -48,11 +49,6 @@ public class Player extends GameObject {
         speedInPixel = 5;
     }
 
-    @Override
-    public void updatePosition(){
-
-    }
-
     @Override
     public void addToCanvas(){
         if(SHOW_X) {
@@ -63,6 +59,11 @@ public class Player extends GameObject {
         shooting = false;
     }
 
+    @Override
+    public void updateStatus() {
+
+    }
+
     /** Moves the character to the left */
     public void left(){
         position.left(speedInPixel);

SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/moveable/RoundBubble.java

@@ -45,4 +45,9 @@ public class RoundBubble extends Bubble {
     public void addToCanvas(){
         gameView.addBlockImageToCanvas(RED_BUBBLE, getPosition().x, getPosition().y,size, rotation);
     }
+
+    @Override
+    public void updateStatus() {
+
+    }
 }

SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/moveable/SpecialBubble.java

@@ -42,6 +42,11 @@ public class SpecialBubble extends Bubble {
         gameView.addBlockImageToCanvas(GREEN_BUBBLE,position.x,position.y,size, rotation);
     }
 
+    @Override
+    public void updateStatus() {
+
+    }
+
     /**
      * Switches the active effect.
      */