diff --git a/SuperPangWorld/src/META-INF/MANIFEST.MF b/SuperPangWorld/src/META-INF/MANIFEST.MF index f9ac34c..532ab65 100644 --- a/SuperPangWorld/src/META-INF/MANIFEST.MF +++ b/SuperPangWorld/src/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ Manifest-Version: 1.0 -Main-Class: de.thdeg.greiner.superpangworld.game.Start +Main-Class: de.thdeg.greiner.superpangworld.game.bin.Start diff --git a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/bin/Start.java b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/bin/Start.java index 48fc2e5..5bc1f1e 100644 --- a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/bin/Start.java +++ b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/bin/Start.java @@ -1,6 +1,6 @@ -package de.thdeg.greiner.superpangworld.game; +package de.thdeg.greiner.superpangworld.game.bin; -import de.thdeg.greiner.superpangworld.managers.GameLoopManager; +import de.thdeg.greiner.superpangworld.game.managers.GameLoopManager; /** * Die Startklasse für das Spiel. diff --git a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/GameLoopManager.java b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/GameLoopManager.java index dd2026b..f5b1968 100644 --- a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/GameLoopManager.java +++ b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/GameLoopManager.java @@ -1,9 +1,6 @@ -package de.thdeg.greiner.superpangworld.managers; +package de.thdeg.greiner.superpangworld.game.managers; import de.thdeg.greiner.superpangworld.gameview.GameView; -import de.thdeg.greiner.superpangworld.managers.GameObjectManager; -import de.thdeg.greiner.superpangworld.managers.GamePlayManager; -import de.thdeg.greiner.superpangworld.managers.InputManager; /** This class manages the main game loop of the game. */ public class GameLoopManager { diff --git a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/GameObjectManager.java b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/GameObjectManager.java index e3beefc..27f7834 100644 --- a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/GameObjectManager.java +++ b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/GameObjectManager.java @@ -1,4 +1,4 @@ -package de.thdeg.greiner.superpangworld.managers; +package de.thdeg.greiner.superpangworld.game.managers; import de.thdeg.greiner.superpangworld.gameview.GameView; import de.thdeg.greiner.superpangworld.graphics.immovable.*; @@ -9,7 +9,7 @@ import java.awt.*; /** * The manager handling the display and passive movement of the game objects. */ -public class GameObjectManager { +class GameObjectManager { /** The GameView to display the objects */ private GameView gameView; diff --git a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/GamePlayManager.java b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/GamePlayManager.java index 69e47d3..08894b1 100644 --- a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/GamePlayManager.java +++ b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/GamePlayManager.java @@ -1,4 +1,4 @@ -package de.thdeg.greiner.superpangworld.managers; +package de.thdeg.greiner.superpangworld.game.managers; import de.thdeg.greiner.superpangworld.gameview.GameView; diff --git a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/InputManager.java b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/InputManager.java index 1097271..21c7eaa 100644 --- a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/InputManager.java +++ b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/game/managers/InputManager.java @@ -1,4 +1,4 @@ -package de.thdeg.greiner.superpangworld.managers; +package de.thdeg.greiner.superpangworld.game.managers; import de.thdeg.greiner.superpangworld.gameview.GameView; import de.thdeg.greiner.superpangworld.graphics.moveable.Player; @@ -9,7 +9,7 @@ import java.util.Arrays; /** * The manager which handles the user input and controls the player object. */ -public class InputManager { +class InputManager { /** The gameView, which displays the player object */ private GameView gameView; diff --git a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/base/GameObject.java b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/base/GameObject.java index 9d471a9..b36bba7 100644 --- a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/base/GameObject.java +++ b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/base/GameObject.java @@ -1,12 +1,12 @@ package de.thdeg.greiner.superpangworld.graphics.base; -import de.thdeg.greiner.superpangworld.managers.GamePlayManager; +import de.thdeg.greiner.superpangworld.game.managers.GamePlayManager; import de.thdeg.greiner.superpangworld.gameview.GameView; /** * A basic game object. */ -class GameObject { +public abstract class GameObject { /** The game view to display the game object on. */ protected final GameView gameView; diff --git a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/Background.java b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/Background.java index f7e26ec..b68dcc8 100644 --- a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/Background.java +++ b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/Background.java @@ -1,19 +1,46 @@ -package de.thdeg.greiner.superpangworld.graphics; +package de.thdeg.greiner.superpangworld.graphics.immovable; import de.thdeg.greiner.superpangworld.gameview.GameView; +import de.thdeg.greiner.superpangworld.graphics.base.GameObject; + +import java.util.Random; /** * The background for the game. */ -public class Background extends GameObject{ +public class Background extends GameObject { + private final String pixelArt; + /** * Create a background object. * * @param gameView the gameView */ - protected Background(GameView gameView) { + public Background(GameView gameView) { super(gameView); + this.position.setTo(0,0); + size = 1; + rotation = 0; + + Random r = new Random(); + StringBuilder sb = new StringBuilder(); + for(int h=0;h<450;h++){ + for(int i=0;i<960;i++){ + if(r.nextBoolean()){ + sb.append("y"); + }else{ + sb.append("o"); + } + } + sb.append("\n"); + } + pixelArt = sb.toString(); + } + + @Override + public void addToCanvas() { + gameView.addBlockImageToCanvas(pixelArt,position.x,position.y,size, rotation); } } diff --git a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LevelLabel.java b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LevelLabel.java index bbe95d2..0c9413a 100644 --- a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LevelLabel.java +++ b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LevelLabel.java @@ -1,13 +1,14 @@ -package de.thdeg.greiner.superpangworld.graphics; +package de.thdeg.greiner.superpangworld.graphics.immovable; import de.thdeg.greiner.superpangworld.gameview.GameView; +import de.thdeg.greiner.superpangworld.graphics.base.GameObject; import java.awt.*; /** * The label to display the current level. */ -public class LevelLabel extends GameObject{ +public class LevelLabel extends GameObject { /** The level to display */ private int level; diff --git a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LevelProgressBar.java b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LevelProgressBar.java index f897502..d69b95f 100644 --- a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LevelProgressBar.java +++ b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LevelProgressBar.java @@ -1,11 +1,12 @@ -package de.thdeg.greiner.superpangworld.graphics; +package de.thdeg.greiner.superpangworld.graphics.immovable; import de.thdeg.greiner.superpangworld.gameview.GameView; +import de.thdeg.greiner.superpangworld.graphics.base.GameObject; /** * The progress bar of a level. */ -public class LevelProgressBar extends GameObject{ +public class LevelProgressBar extends GameObject { /** The progress of the level ranging from 0 to 100 */ private int levelProgress; diff --git a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LivesIcon.java b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LivesIcon.java index 7439dbf..e6a01c3 100644 --- a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LivesIcon.java +++ b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/LivesIcon.java @@ -1,17 +1,41 @@ -package de.thdeg.greiner.superpangworld.graphics; +package de.thdeg.greiner.superpangworld.graphics.immovable; import de.thdeg.greiner.superpangworld.gameview.GameView; +import de.thdeg.greiner.superpangworld.graphics.base.GameObject; /** * The icon to display the remaining lives. */ -public class LivesIcon extends GameObject{ +public class LivesIcon extends GameObject { + + private final static String ICON = + " RR RR \n"+ + " RRRR RRRR \n"+ + "RRRRRRRRRRR\n"+ + "RRRRRRRRRRR\n"+ + " RRRRRRRRR \n"+ + " RRRRRRR \n"+ + " RRRRR \n"+ + " RRR \n"+ + " R \n"; + /** - * Create a game object with default values. + * Create lives icon. * * @param gameView the gameView */ - protected LivesIcon(GameView gameView) { + public LivesIcon(GameView gameView) { super(gameView); + rotation = 0; + size = 5; + width = 12; + height = 12; + + position.setTo(50,GameView.HEIGHT-50); + } + + @Override + public void addToCanvas() { + gameView.addBlockImageToCanvas(ICON,position.x,position.y,size,rotation); } } diff --git a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/ScoreLabel.java b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/ScoreLabel.java index 0044269..0e391fc 100644 --- a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/ScoreLabel.java +++ b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/immovable/ScoreLabel.java @@ -1,13 +1,14 @@ -package de.thdeg.greiner.superpangworld.graphics; +package de.thdeg.greiner.superpangworld.graphics.immovable; import de.thdeg.greiner.superpangworld.gameview.GameView; +import de.thdeg.greiner.superpangworld.graphics.base.GameObject; import java.awt.*; /** * The label to display the score. */ -public class ScoreLabel extends GameObject{ +public class ScoreLabel extends GameObject { /** The score to display */ private int score; diff --git a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/moveable/Harpoon.java b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/moveable/Harpoon.java index 7c59688..b9f1972 100644 --- a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/moveable/Harpoon.java +++ b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/moveable/Harpoon.java @@ -1,11 +1,13 @@ -package de.thdeg.greiner.superpangworld.graphics; +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; /** * A harpoon which can be fired upwards by the player. */ -public class Harpoon extends GameObject{ +public class Harpoon extends GameObject { private final static String HARPOON = " B \n"+ @@ -20,7 +22,7 @@ public class Harpoon extends GameObject{ */ public Harpoon(GameView gameView){ super(gameView); - speedInPixel = 10; + speedInPixel = 1; size = 3; width = 11; height = 11; @@ -47,5 +49,8 @@ public class Harpoon extends GameObject{ @Override public void updatePosition(){ getPosition().up(speedInPixel); + if(getPosition().y < 0){ + getPosition().setTo(300,300); + } } } diff --git a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/moveable/HexagonalBubble.java b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/moveable/HexagonalBubble.java index 7be4227..0b2ee12 100644 --- a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/moveable/HexagonalBubble.java +++ b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/moveable/HexagonalBubble.java @@ -1,11 +1,12 @@ -package de.thdeg.greiner.superpangworld.graphics; +package de.thdeg.greiner.superpangworld.graphics.moveable; import de.thdeg.greiner.superpangworld.gameview.GameView; +import de.thdeg.greiner.superpangworld.graphics.base.Bubble; /** * The rare hexagonal bubble. */ -public class HexagonalBubble extends Bubble{ +public class HexagonalBubble extends Bubble { /** * Create a hexagonal bubble with default values. @@ -14,5 +15,19 @@ public class HexagonalBubble extends Bubble{ */ public HexagonalBubble(GameView gameView) { super(gameView); + position.setTo(100,200); + size=0.6; + speedInPixel = 2; + } + + @Override + public void addToCanvas() { + gameView.addImageToCanvas("hexagon.png",position.x,position.y,size,rotation); + } + + @Override + public void updatePosition() { + super.updatePosition(); + rotation = (rotation + 1) % 360; } } diff --git a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/moveable/Player.java b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/moveable/Player.java index 2aa739a..a5c7d11 100644 --- a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/moveable/Player.java +++ b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/moveable/Player.java @@ -1,13 +1,14 @@ -package de.thdeg.greiner.superpangworld.graphics; +package de.thdeg.greiner.superpangworld.graphics.moveable; import de.thdeg.greiner.superpangworld.gameview.GameView; +import de.thdeg.greiner.superpangworld.graphics.base.GameObject; import java.awt.*; /** * The game character controlled by the player. */ -public class Player extends GameObject{ +public class Player extends GameObject { /** Flag, if the player is shooting */ private boolean shooting; @@ -39,7 +40,7 @@ public class Player extends GameObject{ */ public Player(GameView gameView){ super(gameView); - position.setTo(GameView.WIDTH/2, GameView.HEIGHT/2); + position.setTo(GameView.WIDTH/2, GameView.HEIGHT/1.5); shooting = false; size = 3; width = (int) size * 12; diff --git a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/moveable/RoundBubble.java b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/moveable/RoundBubble.java index 6e46eca..6c0427c 100644 --- a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/moveable/RoundBubble.java +++ b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/moveable/RoundBubble.java @@ -1,12 +1,28 @@ -package de.thdeg.greiner.superpangworld.graphics; +package de.thdeg.greiner.superpangworld.graphics.moveable; import de.thdeg.greiner.superpangworld.gameview.GameView; +import de.thdeg.greiner.superpangworld.graphics.base.Bubble; /** * The classic red, round bubble. */ -public class RoundBubble extends Bubble{ +public class RoundBubble extends Bubble { + + /** The pixel art for the bubble */ + private final static String RED_BUBBLE = + " RRRR \n"+ + " RWRRRR \n"+ + " RWRRRRRR \n"+ + " RWRRRRRRRR \n"+ + "RWRRRRRRRRRR\n"+ + "RWRRRRRRRRRR\n"+ + "RWRRRRRRRRWR\n"+ + "RRRRRRRRRWWR\n"+ + " RRRRRRRWWR \n"+ + " RRRRRWWR \n"+ + " RRRWWR \n"+ + " RRRR \n"; /** * Create a round bubble with default values. @@ -16,4 +32,12 @@ public class RoundBubble extends Bubble{ public RoundBubble(GameView gameView) { super(gameView); } + + /** + * Draws the bubble onto the canvas of the {@link GameView}. + */ + @Override + public void addToCanvas(){ + gameView.addBlockImageToCanvas(RED_BUBBLE, getPosition().x, getPosition().y,size, rotation); + } } diff --git a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/moveable/SpecialBubble.java b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/moveable/SpecialBubble.java index 8397f96..044f1e7 100644 --- a/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/moveable/SpecialBubble.java +++ b/SuperPangWorld/src/de/thdeg/greiner/superpangworld/graphics/moveable/SpecialBubble.java @@ -1,11 +1,27 @@ -package de.thdeg.greiner.superpangworld.graphics; +package de.thdeg.greiner.superpangworld.graphics.moveable; import de.thdeg.greiner.superpangworld.gameview.GameView; +import de.thdeg.greiner.superpangworld.graphics.base.Bubble; /** * The green bubble with special abilities. */ -public class SpecialBubble extends Bubble{ +public class SpecialBubble extends Bubble { + + /** The pixel art for the bubble */ + private final static String GREEN_BUBBLE = + " GGGG \n"+ + " GWGGGG \n"+ + " GWGGGGGG \n"+ + " GWGGGGGGGG \n"+ + "GWGGGGGGGGGG\n"+ + "GWGGGGGGGGGG\n"+ + "GWGGGGGGGGWG\n"+ + "GGGGGGGGGWWG\n"+ + " GGGGGGGWWG \n"+ + " GGGGGWWG \n"+ + " GGGWWG \n"+ + " GGGG \n"; /** * Create a special bubble with default values. @@ -14,5 +30,25 @@ public class SpecialBubble extends Bubble{ */ public SpecialBubble(GameView gameView) { super(gameView); + position.setTo(100, 100); + } + + @Override + public void addToCanvas() { + gameView.addBlockImageToCanvas(GREEN_BUBBLE,position.x,position.y,size, rotation); + } + + /** + * Switches the active effect. + */ + private void switchEffect(){ + + } + + /** + * Activates the current effect. + */ + private void activateEffect(){ + } } diff --git a/out/production/SuperPangWorld/META-INF/MANIFEST.MF b/out/production/SuperPangWorld/META-INF/MANIFEST.MF index f9ac34c..532ab65 100644 --- a/out/production/SuperPangWorld/META-INF/MANIFEST.MF +++ b/out/production/SuperPangWorld/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ Manifest-Version: 1.0 -Main-Class: de.thdeg.greiner.superpangworld.game.Start +Main-Class: de.thdeg.greiner.superpangworld.game.bin.Start diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameLoopManager.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameLoopManager.class deleted file mode 100644 index 1e6a855..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameLoopManager.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Canvas.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Canvas.class deleted file mode 100644 index 0b41944..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Canvas.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$EndScreen.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$EndScreen.class deleted file mode 100644 index a5db17b..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$EndScreen.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Frame$1.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Frame$1.class deleted file mode 100644 index 4b8f1dc..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Frame$1.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Frame$2.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Frame$2.class deleted file mode 100644 index d816b8a..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Frame$2.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Frame$3.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Frame$3.class deleted file mode 100644 index cd9e69a..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Frame$3.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Frame$4.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Frame$4.class deleted file mode 100644 index 96abb48..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Frame$4.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Frame.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Frame.class deleted file mode 100644 index 0c802e3..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Frame.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$GameTime.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$GameTime.class deleted file mode 100644 index 87b059a..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$GameTime.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$ImageObject.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$ImageObject.class deleted file mode 100644 index 8432f79..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$ImageObject.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Keyboard.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Keyboard.class deleted file mode 100644 index fc2ebe2..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Keyboard.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Line.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Line.class deleted file mode 100644 index 00cc5ad..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Line.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Mouse.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Mouse.class deleted file mode 100644 index f37e5ea..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Mouse.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Oval.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Oval.class deleted file mode 100644 index f8d9faf..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Oval.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$PaintingPanel.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$PaintingPanel.class deleted file mode 100644 index 49a5a56..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$PaintingPanel.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$PolyLine.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$PolyLine.class deleted file mode 100644 index 4169b49..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$PolyLine.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Polygon.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Polygon.class deleted file mode 100644 index cd498c3..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Polygon.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$PrintObject.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$PrintObject.class deleted file mode 100644 index 6d241ce..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$PrintObject.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Rectangle.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Rectangle.class deleted file mode 100644 index 0801a1d..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Rectangle.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Screen.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Screen.class deleted file mode 100644 index 6b8040f..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Screen.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$SelectionManager.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$SelectionManager.class deleted file mode 100644 index df63002..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$SelectionManager.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$SimpleBox.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$SimpleBox.class deleted file mode 100644 index 9487d9f..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$SimpleBox.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$SimpleStartScreen.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$SimpleStartScreen.class deleted file mode 100644 index adb19a5..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$SimpleStartScreen.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Sound.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Sound.class deleted file mode 100644 index 64cb867..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Sound.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$StartScreenWithChooseBox$SelectionBox.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$StartScreenWithChooseBox$SelectionBox.class deleted file mode 100644 index 068026a..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$StartScreenWithChooseBox$SelectionBox.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$StartScreenWithChooseBox.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$StartScreenWithChooseBox.class deleted file mode 100644 index 5d0ffb5..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$StartScreenWithChooseBox.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$SwingAdapter.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$SwingAdapter.class deleted file mode 100644 index 8f89387..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$SwingAdapter.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Version.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Version.class deleted file mode 100644 index 4ffb4a0..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Version.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Window.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Window.class deleted file mode 100644 index d2a53a0..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView$Window.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView.class deleted file mode 100644 index 4f65a5f..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/GameView.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/Start.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/Start.class deleted file mode 100644 index 149cdae..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/game/Start.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/objects/Bubble.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/objects/Bubble.class deleted file mode 100644 index 972ed19..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/objects/Bubble.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/objects/GameObject.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/objects/GameObject.class deleted file mode 100644 index 0f23bf8..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/objects/GameObject.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/objects/Harpoon.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/objects/Harpoon.class deleted file mode 100644 index d7e3b5e..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/objects/Harpoon.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/objects/LevelLabel.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/objects/LevelLabel.class deleted file mode 100644 index 9679644..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/objects/LevelLabel.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/objects/LevelProgressBar.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/objects/LevelProgressBar.class deleted file mode 100644 index 97bfa78..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/objects/LevelProgressBar.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/objects/Position.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/objects/Position.class deleted file mode 100644 index 0b3ad90..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/objects/Position.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/objects/ScoreLabel.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/objects/ScoreLabel.class deleted file mode 100644 index d018b7e..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/objects/ScoreLabel.class and /dev/null differ diff --git a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/objects/Spielfigur.class b/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/objects/Spielfigur.class deleted file mode 100644 index 62c02c9..0000000 Binary files a/out/production/SuperPangWorld/de/thdeg/greiner/superpangworld/objects/Spielfigur.class and /dev/null differ diff --git a/out/production/SuperPangWorld/resources/Herz.png b/out/production/SuperPangWorld/resources/Herz.png deleted file mode 100644 index dc04122..0000000 Binary files a/out/production/SuperPangWorld/resources/Herz.png and /dev/null differ diff --git a/out/production/SuperPangWorld/resources/Player.png b/out/production/SuperPangWorld/resources/Player.png deleted file mode 100644 index 0f0154c..0000000 Binary files a/out/production/SuperPangWorld/resources/Player.png and /dev/null differ