Fix for empty object array

# Conflicts:
#	model/objects/DifficultyButton.java

audio/Song.java

@@ -165,4 +165,15 @@ public class Song implements Comparable<Song>{
 		}
 		return timesPlayed;
 	}
+	
+	public int getHighestScore()
+	{
+		int highest = 0;
+		for(SongInstance s : songs)
+		{
+			if(s.getHighestScore() > highest)
+				highest = s.getHighestScore();
+		}
+		return highest;
+	}
 }

audio/SongInstance.java

@@ -7,6 +7,7 @@ public class SongInstance {
 
 	private String difficulty;
 	private int timesPlayed;
+	private int highestScore;
 	
 	private List<ObjectInstance> objects;
 	private List<ButtonInstance> buttons;
@@ -15,6 +16,7 @@ public class SongInstance {
 	{
 		this.difficulty = difficulty;
 		this.timesPlayed = 0;
+		this.highestScore = 0;
 		
 		objects = new ArrayList<ObjectInstance>();
 		buttons = new ArrayList<ButtonInstance>();
@@ -65,6 +67,8 @@ public class SongInstance {
 	
 	public long getEndTime()
 	{
+		if(objects.size() == 0)
+			return 0;
 		return objects.get(objects.size()-1).getTime();
 	}
 	
@@ -94,6 +98,14 @@ public class SongInstance {
 		this.timesPlayed = timesPlayed;
 	}
 	
+	public int getHighestScore() {
+		return highestScore;
+	}
+
+	public void setHighestScore(int highestScore) {
+		this.highestScore = highestScore;
+	}
+	
 	public void played()
 	{
 		timesPlayed++;

audio/sorting/SortAUTHOR.java

@@ -0,0 +1,14 @@
+package audio.sorting;
+
+import java.util.Comparator;
+
+import audio.Song;
+
+public class SortAUTHOR implements Comparator<Song> {
+
+	@Override
+	public int compare(Song s1, Song s2) {
+		return s1.getAuthor().compareTo(s2.getAuthor());
+	}
+
+}

audio/sorting/SortSCORE.java

@@ -0,0 +1,18 @@
+package audio.sorting;
+
+import java.util.Comparator;
+
+import audio.Song;
+
+public class SortSCORE implements Comparator<Song> {
+
+	public int compare(Song s1, Song s2) {
+		if(s1.getHighestScore() < s2.getHighestScore())
+			return 1;
+		else if(s1.getHighestScore() > s2.getHighestScore())
+			return -1;
+		else
+			return s1.getTitle().compareTo(s2.getTitle());
+	}
+
+}

control/GameStateManager.java

@@ -4,8 +4,7 @@ import java.awt.Color;
 import java.util.ArrayList;
 import java.util.List;
 
-import model.SongHandler;
+import model.gameState.EndState;
-import model.gameState.GameOverState;
 import model.gameState.GameState;
 import model.gameState.HelpState;
 import model.gameState.MenuState;
@@ -32,7 +31,7 @@ public class GameStateManager {
 		MENU_STATE,
 		HELP_STATE,
 		PLAY_STATE,
-		GAMEOVER_STATE,
+		END_STATE,
 		PRE_GAME_STATE
 	}
 	
@@ -42,13 +41,13 @@ public class GameStateManager {
 		gamestates.add(new MenuState(this, sh, sql));
 		gamestates.add(new HelpState(this, sh, sql));
 		gamestates.add(new PlayState(this, sh, sql));
-		gamestates.add(new GameOverState(this, sh, sql));
+		gamestates.add(new EndState(this, sh, sql));
 		gamestates.add(new PreGameState(this,sh, sql));
 		setState(State.TITLE_STATE);
 	}
 	
 	public void setState(State st)	{
-		if (st.ordinal() > 0 && !(currentState instanceof TitleState))
+		if (st.ordinal() > 0 && ( !(currentState instanceof TitleState) || !(currentState instanceof EndState) ))
 			currentState.stopAudio();
 
 		currentState = gamestates.get(st.ordinal());

control/NetworkHandler.java

@@ -17,6 +17,7 @@ public class NetworkHandler implements Runnable{
 
 	private String 	host;
 	private int 	port;
+	private long fistpressed;
 
 	private boolean running;
 	private Thread  t;
@@ -111,7 +112,7 @@ public class NetworkHandler implements Runnable{
 			}
 			
 			if(control[7] == 0 && control[8] == 0){
-				if(JoystickHandler.j.getPos() != Position.UP_LEFT)
+				if(JoystickHandler.j.getPos() != Position.UP_LEFT )
 				{
 					JoystickHandler.j.setPosition(Position.UP_LEFT);
 					jth.onJoystickMoved(JoystickHandler.j);
@@ -140,10 +141,18 @@ public class NetworkHandler implements Runnable{
 			}
 			
 			else if(control[7] == 0){
-				if(JoystickHandler.j.getPos() != Position.UP)
+				if(JoystickHandler.j.getPos() != Position.UP || JoystickHandler.REPEAT)
 				{
-					JoystickHandler.j.setPosition(Position.UP);
+					if(JoystickHandler.j.getPos() != Position.UP)
-					jth.onJoystickMoved(JoystickHandler.j);
+					{
+						fistpressed = System.currentTimeMillis();	
+						JoystickHandler.j.setPosition(Position.UP);
+						jth.onJoystickMoved(JoystickHandler.j);
+					}
+					if((fistpressed + 500) < System.currentTimeMillis()){
+						JoystickHandler.j.setPosition(Position.UP);
+						jth.onJoystickMoved(JoystickHandler.j);
+					}
 				}
 			}
 			else if(control[8] == 0){
@@ -161,13 +170,21 @@ public class NetworkHandler implements Runnable{
 				}
 			}
 			else if(control[10] == 0){
-				if(JoystickHandler.j.getPos() != Position.DOWN)
+				if(JoystickHandler.j.getPos() != Position.DOWN || JoystickHandler.REPEAT)
 				{
-					JoystickHandler.j.setPosition(Position.DOWN);
+					if(JoystickHandler.j.getPos() != Position.DOWN){
-					jth.onJoystickMoved(JoystickHandler.j);
+						fistpressed = System.currentTimeMillis();
+						JoystickHandler.j.setPosition(Position.DOWN);
+						jth.onJoystickMoved(JoystickHandler.j);
+					}
+					if((fistpressed + 500) < System.currentTimeMillis()){
+						JoystickHandler.j.setPosition(Position.DOWN);
+						jth.onJoystickMoved(JoystickHandler.j);
+					}
 				}
 			}else {
 				if(JoystickHandler.j.getPos() != Position.CENTER){
+					fistpressed = 0;
 					JoystickHandler.j.setPosition(Position.CENTER);
 					jth.onJoystickMoved(JoystickHandler.j);
 				}

control/SongHandler.java

@@ -1,4 +1,4 @@
-package model;
+package control;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -39,7 +39,7 @@ public class SongHandler {
 		
 		p = new AudioPlayer();
 		
-		if(Window.ON_RASP)
+		if(Window.ON_ARCADE)
 			dir = new File(System.getProperty( "user.home" ) + "/ColorStrike/Songs/");
 		else
 			dir = new File(System.getProperty( "user.home" ) + "/Documents/songs/");

control/button/Button.java

@@ -25,7 +25,7 @@ public class Button {
 	
 	private void setLed()
 	{
-		if(Window.ON_RASP)
+		if(Window.ON_ARCADE)
 		{
 			ntw.setLed(ledID, color.getGreen(), color.getRed(), color.getBlue());
 			ntw.show();

control/button/ButtonHandler.java

@@ -7,15 +7,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import main.Window;
-
+import model.GameModel;
-import com.pi4j.io.gpio.GpioController;
-import com.pi4j.io.gpio.GpioFactory;
-import com.pi4j.io.gpio.GpioPinDigitalInput;
-import com.pi4j.io.gpio.PinState;
-import com.pi4j.io.gpio.RaspiPin;
-import com.pi4j.io.gpio.event.GpioPinDigitalStateChangeEvent;
-import com.pi4j.io.gpio.event.GpioPinListenerDigital;
-
 import control.NetworkHandler;
 
 public class ButtonHandler implements KeyListener{
@@ -31,38 +23,6 @@ public class ButtonHandler implements KeyListener{
 		listeners = new ArrayList<ButtonListener>();
 		buttons = new ArrayList<Button>();
 		
-//		if (Window.ON_RASP)
-//			addGpioListeners();
-		
-	}
-	
-	private void addGpioListeners(){
-		ArrayList<GpioPinDigitalInput> inputpins = new ArrayList<GpioPinDigitalInput>();
-        final GpioController gpio = GpioFactory.getInstance();
-        
-        inputpins.add(gpio.provisionDigitalInputPin(RaspiPin.GPIO_02, "1")); //button 1 to 6 + start button
-        inputpins.add(gpio.provisionDigitalInputPin(RaspiPin.GPIO_03, "2"));
-        inputpins.add(gpio.provisionDigitalInputPin(RaspiPin.GPIO_13, "3"));
-        inputpins.add(gpio.provisionDigitalInputPin(RaspiPin.GPIO_14, "4"));
-        inputpins.add(gpio.provisionDigitalInputPin(RaspiPin.GPIO_00, "5"));
-        inputpins.add(gpio.provisionDigitalInputPin(RaspiPin.GPIO_12, "6"));
-        inputpins.add(gpio.provisionDigitalInputPin(RaspiPin.GPIO_06, "0"));
-
-        
-        for(GpioPinDigitalInput p:inputpins){
-        	  p.addListener(new GpioPinListenerDigital() {
-                  @Override
-                  public void handleGpioPinDigitalStateChangeEvent(GpioPinDigitalStateChangeEvent e) {
-                	  if(e.getState() == PinState.HIGH){
-                		  buttonRelease(buttons.get(Integer.parseInt(e.getPin().getName())));
-                		  System.out.println(e.getPin().getName() + " Released");
-                	  }else{
-                		  buttonPress(buttons.get(Integer.parseInt(e.getPin().getName())));
-                		  System.out.println(e.getPin().getName() + " Pressed");
-                	  }
-                  }                  
-              });
-        }
 	}
 
 	public void addButtonListener(ButtonListener toAdd) {
@@ -70,7 +30,7 @@ public class ButtonHandler implements KeyListener{
 	}
 	
 	public void buttonPress(Button b) {
-		if(Window.ON_RASP)
+		if(Window.ON_ARCADE)
 		{
 			Color c = b.getColor().brighter().brighter();
 			ntw.setLed(b.getLedID(), c.getGreen(), c.getRed(), c.getBlue());
@@ -82,7 +42,7 @@ public class ButtonHandler implements KeyListener{
 	}
 	 
 	public void buttonRelease(Button b) {
-		if(Window.ON_RASP)
+		if(Window.ON_ARCADE)
 		{
 			ntw.setLed(b.getLedID(), b.getColor().getGreen(), b.getColor().getRed(), b.getColor().getBlue());
 			ntw.show();
@@ -119,7 +79,7 @@ public class ButtonHandler implements KeyListener{
 			buttonPress(buttons.get(6));
 			break;
 		case KeyEvent.VK_ESCAPE:
-			if(!Window.ON_RASP)
+			if(!Window.ON_ARCADE)
 				System.exit(0);
 			break;
 		}
@@ -177,8 +137,12 @@ public class ButtonHandler implements KeyListener{
 		buttons.add(new Button(1, 2, ntw));
 		buttons.add(new Button(2, 1, ntw));
 		buttons.add(new Button(3, 0, ntw));
-		buttons.add(new Button(4, 3, ntw));
+		buttons.add(new Button(4, -1, ntw));
-		buttons.add(new Button(5, 4, ntw));
+		buttons.add(new Button(5, 3, ntw));
-		buttons.add(new Button(6, 5, ntw));
+		buttons.add(new Button(6, 4, ntw));
+		
+		for (int i = 1; i < buttons.size(); i++) {
+			buttons.get(i).setColor(GameModel.colors[i - 1]);
+		}
 	}
 }

data/io/SQLConnector.java

@@ -8,8 +8,6 @@ import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.sun.crypto.provider.RSACipher;
-
 import model.objects.highscore.Highscore;
 import audio.Song;
 import audio.SongInstance;
@@ -48,6 +46,31 @@ public class SQLConnector
         }
     }
     
+    public Highscore getHighscore(Song s, SongInstance si)
+    {
+    	String query = "SELECT * FROM highscore WHERE songinstance = (SELECT id FROM songinstance WHERE difficulty='" + si.getDifficulty() + "' AND song=(SELECT id FROM song WHERE folder='" + s.getFolder() + "')) ORDER BY score DESC LIMIT 1";
+    	//System.out.println(query);
+    	Statement st = executeResultQuery(query);
+    	ResultSet result = null;
+		try {
+			result = st.getResultSet();
+		} catch (SQLException e1) {
+			e1.printStackTrace();
+		}
+		
+		Highscore hsc = null;
+		
+    	try {
+    		if(result.next() && result != null)
+    			hsc = new Highscore(si, result.getString("username"), result.getInt("score"), result.getDate("date").getTime());
+    		
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+    	
+		return hsc;
+    }
+    
     public List<Highscore> getHighscores(Song s, SongInstance si)
     {
     	String query = "SELECT * FROM highscore WHERE songinstance = (SELECT id FROM songinstance WHERE difficulty='" + si.getDifficulty() + "' AND song=(SELECT id FROM song WHERE folder='" + s.getFolder() + "')) ORDER BY score DESC";
@@ -169,6 +192,18 @@ public class SQLConnector
 					} catch (SQLException e) {
 						e.printStackTrace();
 					}
+	    			
+	    			Statement st4 = executeResultQuery("SELECT MAX(`score`) as score FROM `highscore` WHERE `songinstance`=(SELECT id FROM songinstance WHERE song=" + id + " AND difficulty='" + si.getDifficulty() + "')");
+	    			try {
+						ResultSet rs4 = st4.getResultSet();
+						if(rs4.next())
+						{
+							int i = rs4.getInt(1);
+			    			si.setHighestScore(i);
+						}
+					} catch (SQLException e) {
+						e.printStackTrace();
+					}
     			}
     		}
     		else

image/Images.java

@@ -35,6 +35,7 @@ public class Images {
 		   	images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/gameover.png"))));
 		   	images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/screenshot.png"))));
 		   	images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/help.png"))));
+		   	images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/youwon.png"))));
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
@@ -45,7 +46,7 @@ public class Images {
 	}
 
 	public enum ImageType {
-		pulse,cursor,pressstart,colorstrike,background,aanwijzers,kast,gameover, screenshot, help
+		pulse,cursor,pressstart,colorstrike,background,aanwijzers,kast,gameover, screenshot, help,youwon
 	}
 
 	public static BufferedImage readImage(File f) {

main/Window.java

@@ -2,8 +2,6 @@ package main;
 
 
 import java.awt.Cursor;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
 import java.awt.Point;
 import java.awt.Toolkit;
 import java.awt.event.WindowAdapter;
@@ -13,44 +11,37 @@ import java.awt.image.BufferedImage;
 import javax.swing.JFrame;
 
 import model.GameModel;
-import model.SongHandler;
 import view.GameView;
 import control.GameControl;
 import control.GameStateManager;
 import control.NetworkHandler;
+import control.SongHandler;
 import control.button.ButtonHandler;
 import control.joystick.JoystickHandler;
 import data.io.SQLConnector;
 
 public class Window extends JFrame {	
 	private static final long serialVersionUID = -9222956702898533696L;
-	public static boolean ON_RASP;
+	public static boolean ON_ARCADE;
 	
 	public final static int WIDTH = 1280;
 	public final static int HEIGHT = 1024;
 	
-	public Window(boolean ON_RASP)
+	public Window(boolean ON_ARCADE)
 	{
 		//Create window
 		super("Arcade");
 		setSize(WIDTH, HEIGHT);
 		
 		//Create Events
-//		Window.ON_RASP = ON_RASP;
+		Window.ON_ARCADE = ON_ARCADE;
-//		if(ON_RASP){ //Only on the raspberry pi
+		if(ON_ARCADE){ //Only on the arcade machine
-//			GraphicsEnvironment graphicsEnvironment = GraphicsEnvironment.getLocalGraphicsEnvironment();
+			//Remove cursor
-//			GraphicsDevice[] devices =  graphicsEnvironment.getScreenDevices();
+			setUndecorated(true);
-//
+			BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
-//			if (!devices[0].isFullScreenSupported ()){
+			Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(cursorImg, new Point(0, 0), "blank cursor");
-//			     throw new UnsupportedOperationException ("Fullscreen mode is unsupported.");
+			this.setCursor(blankCursor);
-//			}else{
+		}
-//				devices[0].setFullScreenWindow(this);
-//			}			
-//			//Remove cursor
-//			BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
-//			Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(cursorImg, new Point(0, 0), "blank cursor");
-//			this.setCursor(blankCursor);
-//		}
 		
 		ButtonHandler bth = new ButtonHandler();
 		JoystickHandler jsh = new JoystickHandler();
@@ -85,8 +76,8 @@ public class Window extends JFrame {
 		});
 		
 		//Create EventListeners
-			addKeyListener(bth);
+		addKeyListener(bth);
-			addKeyListener(jsh);
+		addKeyListener(jsh);
 		bth.addButtonListener(control);
 		jsh.addJoystickListener(control);
 		

model/GameModel.java

@@ -5,11 +5,12 @@ import java.awt.Color;
 import main.Window;
 import control.GameStateManager;
 import control.NetworkHandler;
-import control.button.ButtonHandler;
+import control.SongHandler;
 
 public class GameModel {
 
-	public static Color[] colors = { Color.GREEN, Color.YELLOW, Color.RED, Color.MAGENTA, Color.CYAN, Color.ORANGE };
+	public static Color[] colors = { Color.GREEN, Color.YELLOW, Color.RED, Color.MAGENTA, Color.CYAN, Color.BLUE };
+	private static String[] ledStripModes = {"full", "half", "quarter", "random"};
 	private GameStateManager gsm;
 	private NetworkHandler ntw;
 	private int count = 0;
@@ -17,28 +18,101 @@ public class GameModel {
 	public GameModel(SongHandler sh, GameStateManager gsm, NetworkHandler ntw) {
 		this.gsm = gsm;
 		this.ntw = ntw;
-
-		for (int i = 1; i < ButtonHandler.getButtons().size(); i++) {
-			ButtonHandler.getButtons().get(i).setColor(colors[i - 1]);
-			;
-		}
 	}
 
 	public void update(float factor) {
 		gsm.update(factor);
+		if (Window.ON_ARCADE)
+			updateLedStrip(factor);
+	}
 	
-		Color c = colors[(int) (Math.random() * (colors.length - 1) + 1)];
+	private void updateLedStrip(float factor)
+	{
 		
-		if (Window.ON_RASP) {
+		count += factor;
-			count++;
+		if(count > 400)
-			if(count>15)
+		{
+			String mode = ledStripModes[(int) (Math.random() * (ledStripModes.length - 1) + 1)];
+			
+			switch(mode)
 			{
-				for (int i = 7; i < 54; i++) {
+			default:
+			case "full":
+				
+				Color c = colors[(int) (Math.random() * (colors.length - 1) + 1)];
+				
+				for (int i = 6; i < 46; i++) { 
 					ntw.setLed(i, c.getRed(), c.getGreen(), c.getBlue());
 				}
+				
 				ntw.show();
-				count = 0;
+				
+				break;
+				
+			case "half":
+				
+				Color c1 = colors[(int) (Math.random() * (colors.length - 1) + 1)];
+				Color c2 = colors[(int) (Math.random() * (colors.length - 1) + 1)];
+				while(c1==c2)	
+					c2 = colors[(int) (Math.random() * (colors.length - 1) + 1)];
+				
+				for (int i = 6; i < 26; i++) {
+					ntw.setLed(i, c1.getRed(), c1.getGreen(), c1.getBlue());
+				}
+				for (int i = 27; i < 46; i++) {
+					ntw.setLed(i, c2.getRed(), c2.getGreen(), c2.getBlue());
+				}
+				
+				ntw.show();
+				
+				break;
+				
+			case "quarter":
+
+				Color c3 = colors[(int) (Math.random() * (colors.length - 1) + 1)];
+				Color c4 = colors[(int) (Math.random() * (colors.length - 1) + 1)];
+				Color c5 = colors[(int) (Math.random() * (colors.length - 1) + 1)];
+				Color c6 = colors[(int) (Math.random() * (colors.length - 1) + 1)];
+				
+				while(c3==c4)	
+					c4 = colors[(int) (Math.random() * (colors.length - 1) + 1)];
+				while(c4==c5)	
+					c5 = colors[(int) (Math.random() * (colors.length - 1) + 1)];
+				while(c5==c6)	
+					c6 = colors[(int) (Math.random() * (colors.length - 1) + 1)];
+				
+				for (int i = 6; i < 16; i++) {
+					ntw.setLed(i, c3.getRed(), c3.getGreen(), c3.getBlue());
+				}
+				for (int i = 17; i < 26; i++) {
+					ntw.setLed(i, c4.getRed(), c4.getGreen(), c4.getBlue());
+				}
+				for (int i = 27; i < 36; i++) {
+					ntw.setLed(i, c5.getRed(), c5.getGreen(), c5.getBlue());
+				}
+				for (int i = 37; i <46; i++) {
+					ntw.setLed(i, c6.getRed(), c6.getGreen(), c6.getBlue());
+				}
+				
+				ntw.show();
+				
+				break;
+				
+			case "random":
+				
+				Color c7;
+				
+				for (int i = 6; i < 46; i++) {
+					c7 = colors[(int) (Math.random() * (colors.length - 1) + 1)];
+					ntw.setLed(i, c7.getRed(), c7.getGreen(), c7.getBlue());
+				}
+				
+				ntw.show();
+				
+				break;
 			}
+			
+			count = 0;
 		}
 	}
 }

model/drawObjects/CoinAnimation.java

@@ -1,74 +0,0 @@
-package model.drawObjects;
-
-import model.gameState.PlayState;
-
-import java.awt.*;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.Point2D;
-
-/**
- * CoinAnimation klasse: Weergeeft een balletje (resembleerd een muntje) dat omlaag valt.
- *      Je hoeft alleen achter elkaar de paint(Graphics2D) methode aan te roepen, deze roep automatisch een 'reposition' aan,
- *      waardoor je het balletje alleen snel achter elkaar hoeft te repainten.
- *
- * *    Init (startX, startY):  Punt waar de animatie begint met vallen
- *
- *      start(): aanroepen om te starten
- * *
- * *
- **/
-public class CoinAnimation extends DrawObject {
-
-    private Ellipse2D       coinShape;
-    private Point2D.Double  coinSetPoint;
-
-    // Hoevaak de timer gelopen heeft
-    private static int timerLoops      = 0;
-
-    public CoinAnimation(int startX, int startY) {
-        coinSetPoint        = new Point2D.Double(startX, startY);
-        coinShape           = new Ellipse2D.Double(startX, startY, 20, 20);
-    }
-
-    // Start
-    public void start() {
-        timerLoops          = 1;
-    }
-
-    public void draw(Graphics2D g2) {
-        Color oldColor = g2.getColor();
-        update(timerLoops);                                             // UPDATE
-        g2.setColor(new Color(255, 255, 0));    // GEEL
-        g2.draw(coinShape);                                             // MUNTJE TEKENEN
-        g2.fill(coinShape);
-        g2.setColor(oldColor);
-    }
-
-    // Wordt na elke paint aangeroepen
-    public void update(float factor) {
-
-        // Coin omlaag verschuiven doordat Y * loops omlaag gaat.
-        // Per frame verschuift het balletje delta 10 op Y-as.
-        try {
-            coinShape.setFrame(coinSetPoint.getX() * timerLoops * 10, coinSetPoint.getY() * timerLoops,
-                                coinShape.getWidth(), coinShape.getHeight());
-/*            coinShape.setFrame(coinSetPoint.getX(), coinSetPoint.getY() + (1000 - 35 * PlayState.comboScore) / 25 * timerLoops,
-                    coinShape.getWidth(), coinShape.getHeight());*/
-        } catch (ArithmeticException a) { a.printStackTrace(); }
-
-        timerLoops++;
-    }
-
-    // Zijn we al begonnen/klaar?
-    public boolean areWeDoneYet() {
-        if (timerLoops > 24 || timerLoops == 0) {
-            timerLoops = 0;
-            return true;
-        }
-        return false;
-    }
-
-    // Zitten we in de laatste loop?
-    public boolean isLastLoop() { return (timerLoops == 24) ? true : false;  }
-
-}

model/drawObjects/PointAnimation.java

@@ -1,48 +0,0 @@
-package model.drawObjects;
-
-import model.gameState.PlayState;
-
-import java.awt.*;
-import java.awt.geom.Point2D;
-import java.util.LinkedList;
-
-public class PointAnimation extends DrawObject {
-
-    LinkedList<Point2D.Double>   puntenPos   =   new LinkedList<>();
-    LinkedList<Integer>          puntenGain  =   new LinkedList<>();
-    LinkedList<Integer>          iterations  =   new LinkedList<>();
-
-    public static double LastPointIncrement = 0;
-
-    public PointAnimation() {    }
-
-    public void enemyDied(Point2D.Double p) {
-        puntenPos.add(new Point2D.Double(p.getX(), p.getY()));
-        puntenGain.add((int)LastPointIncrement);
-        iterations.add(0);
-    }
-
-    @Override
-    public void draw(Graphics2D g2) {
-            for (int x = 0; x < puntenPos.size(); x++) {
-                g2.drawString("" + puntenGain.get(x), (int) puntenPos.get(x).getX(), (int) puntenPos.get(x).getY());
-
-                update(0);
-            }
-    }
-
-    @Override
-    public void update(float factor) {
-
-        for (int x = 0; x < puntenPos.size(); x++) {
-            puntenPos.get(x).setLocation(puntenPos.get(x).getX(), puntenPos.get(x).getY() - 3);
-            iterations.set(x, iterations.get(x) + 1);
-
-            if (iterations.get(x) > 100) {
-                puntenPos.remove(x);
-                iterations.remove(x);
-                puntenGain.remove(x);
-            }
-        }
-    }
-}

model/gameState/EndState.java

@@ -12,13 +12,13 @@ import java.awt.image.VolatileImage;
 import java.io.IOException;
 
 import model.GameModel;
-import model.SongHandler;
 import model.objects.InfoPanel;
 import model.objects.highscore.HighscoreName;
 
 import com.google.zxing.WriterException;
 
 import control.GameStateManager;
+import control.SongHandler;
 import control.GameStateManager.State;
 import control.button.ButtonEvent;
 import control.button.ButtonHandler;
@@ -27,9 +27,9 @@ import control.joystick.JoystickHandler;
 import data.io.SQLConnector;
 import data.io.WebcamUploader;
 
-public class GameOverState extends GameState {
+public class EndState extends GameState {
 
-    BufferedImage gameOver = Images.getImage(Images.ImageType.gameover);
+    BufferedImage end = null;
     VolatileImage background;
 	Font textFont = new Font("OCR A Extended", Font.BOLD, 70);
 	HighscoreName hsn;
@@ -37,9 +37,12 @@ public class GameOverState extends GameState {
 	private boolean uploaded;
 	private BufferedImage QRimage;
 	
+	boolean timeOut = false;
+	float timeOutCounter = 0;
+	
     int frame;
 
-	public GameOverState(GameStateManager gsm, SongHandler sh, SQLConnector sql) {
+	public EndState(GameStateManager gsm, SongHandler sh, SQLConnector sql) {
 		super(gsm, sh, sql);
 		hsn = new HighscoreName(640,717,5,textFont);
 	}
@@ -47,14 +50,35 @@ public class GameOverState extends GameState {
 	@Override
 	public void init() {
 		createBackground();
+		
 		ButtonHandler.getButton(1).setColor(GameModel.colors[0]);
 		ButtonHandler.getButton(2).setColor(GameModel.colors[2]);
+		
 		JoystickHandler.REPEAT = true;
 		uploaded = false;
+		timeOut = true;
+		timeOutCounter = 0;
+
+		if(PlayState.won()){
+			end = Images.getImage(Images.ImageType.youwon);
+		}else{
+			end = Images.getImage(Images.ImageType.gameover);
+		}
 	}
 
 	@Override
 	public void update(float factor) {
+		if(timeOut)
+		{
+			timeOutCounter += factor;
+			
+			if(timeOutCounter > 800)
+			{
+				timeOut = false;
+			}
+		}
+		
+		
 		image_x = ((frame / 5) % 5) * 40;
         frame++;
 	}
@@ -62,7 +86,11 @@ public class GameOverState extends GameState {
 	@Override
 	public void draw(Graphics2D g2) {
 		g2.drawImage(background, 0, 0, 1280, 1024, null);
-		g2.drawImage(gameOver.getSubimage(image_x, 0, 40, 26),  640-122, 400, 245, 130, null);
+		
+		if(end != null){
+			g2.drawImage(end.getSubimage(image_x, 0, 40, 26),  640-122, 400, 245, 130, null);
+		}
+			
 		if(!uploaded)
 			hsn.drawName(g2);
 		else if(QRimage != null){
@@ -74,62 +102,65 @@ public class GameOverState extends GameState {
 	
 	@Override
 	public void buttonPressed(ButtonEvent e) {
-		//System.out.println("Name: "+hsn.getName());
+		if(!timeOut)
-		switch(e.getButton().getButtonID()){
+		{
-		case 0:
+			switch(e.getButton().getButtonID()){
-			gsm.setState(State.TITLE_STATE);
+			case 0:
-			break;
+				gsm.setState(State.TITLE_STATE);
-		case 1:
+				break;
-			if(hsn.getName().trim().length() >= 3)
+			case 1:
-			{
+				if(hsn.getName().trim().length() >= 3)
-				if(!uploaded){
+				{
-					int id = sql.addHighscore(sh.getCurrentSong(), sh.getCurrentSongInstance(), hsn.getName(), PlayState.currentScore);
+					if(!uploaded){
-					try {
+						int id = sql.addHighscore(sh.getCurrentSong(), sh.getCurrentSongInstance(), hsn.getName(), PlayState.currentScore);
-						WebcamUploader.takePictureAndUpload(id);
+						try {
-					} catch (IOException e2) {
+							WebcamUploader.takePictureAndUpload(id);
-						e2.printStackTrace();
+						} catch (IOException e2) {
-					}
+							e2.printStackTrace();
+						}
 						 		
-					try {
+						try {
-						QRimage = WebcamUploader.createQRImage("http://portfolio.jancokock.me/colorstrike/message.php?id="+id, 400);
+							QRimage = WebcamUploader.createQRImage("http://portfolio.jancokock.me/colorstrike/message.php?id="+id, 400);
-					} catch (WriterException | IOException e1) {
+						} catch (WriterException | IOException e1) {
-						e1.printStackTrace();
+							e1.printStackTrace();
-					}
+						}
-					uploaded = true;
+						uploaded = true;
 	
-				}else{
+					}else{
-					gsm.setState(State.MENU_STATE);
+						gsm.setState(State.MENU_STATE);
+					}
 				}
+				break;			
+			case 2:
+				gsm.setState(State.MENU_STATE);
+				break;
 			}
-			break;			
-		case 2:
-			gsm.setState(State.MENU_STATE);
-			break;
 		}
-		
-		
 	}
+	
 	@Override
-	public void buttonReleased(ButtonEvent e) {
+	public void buttonReleased(ButtonEvent e) {}
 	
-	}
 	@Override
 	public void onJoystickMoved(JoystickEvent e) {
-		switch(e.getJoystick().getPos()){		
+		if(!timeOut)
-		case DOWN:
+		{
-			hsn.down();
+			switch(e.getJoystick().getPos()){		
-			break;			
+			case DOWN:
-		case LEFT:
+				hsn.down();
-			hsn.left();
+				break;			
-			break;
+			case LEFT:
-		case RIGHT:
+				hsn.left();
-			hsn.right();
+				break;
-			break;
+			case RIGHT:
-		case UP:
+				hsn.right();
-			hsn.up();
+				break;
-			break;		
+			case UP:
-		default:
+				hsn.up();
-			break;	
+				break;		
+			default:
+				break;	
+			}
 		}
 	}
 	

model/gameState/GameState.java

@@ -2,8 +2,8 @@ package model.gameState;
 
 import java.awt.Graphics2D;
 
-import model.SongHandler;
 import control.GameStateManager;
+import control.SongHandler;
 import control.button.ButtonEvent;
 import control.joystick.JoystickEvent;
 import data.io.SQLConnector;

model/gameState/HelpState.java

@@ -11,10 +11,11 @@ import java.awt.image.BufferedImage;
 import java.awt.image.VolatileImage;
 
 import model.GameModel;
-import model.SongHandler;
 import control.GameStateManager;
+import control.SongHandler;
 import control.GameStateManager.State;
 import control.button.ButtonEvent;
+import control.button.ButtonHandler;
 import control.joystick.JoystickEvent;
 import data.io.SQLConnector;
 
@@ -36,6 +37,7 @@ public class HelpState extends GameState {
 
 	@Override
 	public void init() {
+		ButtonHandler.getButton(2).setColor(GameModel.colors[2]);
 		sh.play();
 	}
 

model/gameState/MenuState.java

@@ -17,15 +17,17 @@ import java.util.ArrayList;
 import java.util.List;
 
 import model.GameModel;
-import model.SongHandler;
 import model.objects.DifficultyButton;
 import model.objects.MenuButton;
 import model.objects.highscore.Highscore;
 import audio.Song;
 import audio.SongInstance;
 import audio.sorting.SortALPHA;
+import audio.sorting.SortAUTHOR;
 import audio.sorting.SortPLAYED;
+import audio.sorting.SortSCORE;
 import control.GameStateManager;
+import control.SongHandler;
 import control.GameStateManager.State;
 import control.button.ButtonEvent;
 import control.button.ButtonHandler;
@@ -102,9 +104,12 @@ public class MenuState extends GameState {
 		else
 		{
 			ButtonHandler.getButton(1).setColor(GameModel.colors[0]);
+			ButtonHandler.getButton(2).setColor(GameModel.colors[3]);
 			
-			ButtonHandler.getButton(5).setColor(GameModel.colors[1]);
+			ButtonHandler.getButton(3).setColor(GameModel.colors[1]);
-			ButtonHandler.getButton(6).setColor(GameModel.colors[4]);
+			ButtonHandler.getButton(4).setColor(GameModel.colors[2]);
+			ButtonHandler.getButton(5).setColor(GameModel.colors[4]);
+			ButtonHandler.getButton(6).setColor(GameModel.colors[5]);
 			JoystickHandler.REPEAT = true;
 		}
 		
@@ -187,19 +192,25 @@ public class MenuState extends GameState {
 				subscreen = true;
 				gsm.init();
 				generateSubScreenForeground();
-			}else if(e.getButton().getButtonID() == 5){
+			}else if(e.getButton().getButtonID() == 2){
-				sh.sort(new SortALPHA());
-				selected = 0;
-				sh.set(songs.indexOf(selectedToSong(selected)));
-				sh.play();	
-			}else if(e.getButton().getButtonID() == 6){
-				sh.sort(new SortPLAYED());
-				selected = 0;
-				sh.set(songs.indexOf(selectedToSong(selected)));
-				sh.play();	
-			}else if(e.getButton().getButtonID() == 3){
 				gsm.setState(control.GameStateManager.State.HELP_STATE);
 			}
+			else
+			{
+				if(e.getButton().getButtonID() == 3){
+					sh.sort(new SortALPHA());
+				}else if(e.getButton().getButtonID() == 4){
+					sh.sort(new SortAUTHOR());	
+				}else if(e.getButton().getButtonID() == 5){
+					sh.sort(new SortPLAYED());	
+				}else if(e.getButton().getButtonID() == 6){
+					sh.sort(new SortSCORE());	
+				}
+				
+				selected = 0;
+				sh.set(songs.indexOf(selectedToSong(selected)));
+				sh.play();	
+			}
 		}
 		
 		if(e.getButton().getButtonID() == 0)
@@ -229,7 +240,7 @@ public class MenuState extends GameState {
 			}
 			else if(e.getJoystick().getPos() == Joystick.Position.CENTER)	
 			{
-				sh.set(selectedToSong(selected).getSongs().get(difSelect));
+				sh.set(selectedToSong(selected).getSongs().get( (sh.getCurrentSong().getSongs().size()-1) - difSelect));
 			}
 			//generateSubScreenForeground();			
 		}else{										//Screen for selecting song
@@ -334,23 +345,34 @@ public class MenuState extends GameState {
 		
 		//select
 		g2.setColor(GameModel.colors[0]);
-		g2.fillOval(20, 860, 30, 30);
+		g2.fillOval(20, 780, 30, 30);
-		g2.drawString("Play", 55, 880);
+		g2.drawString("Play", 55, 800);
 
 		//help
 		g2.setColor(GameModel.colors[3]);
-		g2.fillOval(20, 900, 30, 30);
+		g2.fillOval(20, 820, 30, 30);
-		g2.drawString("Help", 55, 920);
+		g2.drawString("Help", 55, 840);
 
 		//letters
 		g2.setColor(GameModel.colors[1]);
-		g2.fillOval(20, 940, 30, 30);
+		g2.fillOval(20, 860, 30, 30);
-		g2.drawString("A-Z", 55, 960);
+		g2.drawString("A-Z", 55, 880);
+		
+		//most played
+		g2.setColor(GameModel.colors[2]);
+		g2.fillOval(20, 900, 30, 30);
+		g2.drawString("Author", 55, 920);		
 		
 		//most played
 		g2.setColor(GameModel.colors[4]);
+		g2.fillOval(20, 940, 30, 30);
+		g2.drawString("Most Played", 55, 960);		
+		
+		//most played
+		g2.setColor(GameModel.colors[5]);
 		g2.fillOval(20, 980, 30, 30);
-		g2.drawString("Most Played", 55, 1000);		
+		g2.drawString("Highest Score", 55, 1000);
+		
 		g2.dispose();
 	
 		mainScreenBackground.createGraphics();
@@ -395,21 +417,21 @@ public class MenuState extends GameState {
 		g2.setFont(textFont);
 		
 		boolean highscoresFound = true;
-		int HIGHSCORES_TO_DISPLAY = 5;
+		int HIGHSCORES_TO_DISPLAY = 7;
 		
-		List<Highscore> highscores = sql.getHighscoresToday(selectedToSong(selected), sh.getCurrentSong().getSongs().get(difSelect));
+		List<Highscore> highscores = sql.getHighscoresToday(selectedToSong(selected), sh.getCurrentSong().getSongs().get((sh.getCurrentSong().getSongs().size() - 1) - difSelect));
 		if(highscores.isEmpty())
 		{
-			highscores = sql.getHighscores(selectedToSong(selected), sh.getCurrentSong().getSongs().get(difSelect));
+			highscores = sql.getHighscores(selectedToSong(selected), sh.getCurrentSong().getSongs().get((sh.getCurrentSong().getSongs().size() - 1) - difSelect));
 			if(highscores.isEmpty())
 			{
 				highscoresFound = false;
 			}
 			else
-				g2.drawString("All Time Highscores", 30, 300);
+				g2.drawString("All Time Highscores", 30, 235);
 		}
 		else
-			g2.drawString("Daily Highscore", 30, 300);
+			g2.drawString("Daily Highscore", 30, 235);
  			g2.setFont(textFont2);
 		
 		if(highscoresFound)
@@ -420,7 +442,7 @@ public class MenuState extends GameState {
 			{
 				Highscore hi = highscores.get(i);
 				
-				g2.drawString(hi.getName() + " - " + hi.getScore(), 30, 350 + i*100);
+				g2.drawString(" " + (i+1) + "#  " + hi.getName() + " - " + hi.getScore(), 30, 290 + i*80);
 			}
 		}
 		else

model/gameState/PlayState.java

@@ -4,22 +4,19 @@ import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.Stroke;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 import java.util.Iterator;
 
-import main.Window;
-import model.SongHandler;
 import model.drawObjects.Enemy;
 import model.drawObjects.Player;
-import model.drawObjects.PointAnimation;
 import model.objects.InfoPanel;
 import model.objects.Path;
 import model.objects.PlayArea;
+import model.objects.highscore.Highscore;
 import audio.ButtonInstance;
 import audio.ObjectInstance;
 import control.GameStateManager;
+import control.SongHandler;
 import control.GameStateManager.State;
 import control.button.Button;
 import control.button.ButtonEvent;
@@ -47,12 +44,13 @@ public class PlayState extends GameState {
 	private int joystick_moved = 0;
 	
 	private boolean init = false;
+	private static boolean won = false;
 
 	private long oldProgress = 0;
 
 	public PlayState(GameStateManager gsm, SongHandler sh, SQLConnector sql) {
 		super(gsm, sh, sql);
-		infoPanel = new InfoPanel(0, 0, sh);
+		infoPanel = new InfoPanel(sh);
 		area = new PlayArea(256, 1024, 1024, 125);
 		player = new Player(1280 - 1024 + 1024 / 2, 1024 / 2);
 		stroke = new BasicStroke(sizeOfEnemy, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND);
@@ -62,6 +60,7 @@ public class PlayState extends GameState {
 	@Override
 	public void init() {
 		init = true;
+		won = false;
 		lifePoints = 100;
 		currentScore = 0;
 		comboScore = 0;
@@ -71,17 +70,15 @@ public class PlayState extends GameState {
 		enemies_missed = 0;
 		buttons_pressed = 0;
 		joystick_moved = 0;
+		Highscore h = sql.getHighscore(sh.getCurrentSong(), sh.getCurrentSongInstance());
+		if(h != null)
+			infoPanel.init(h.getScore());
 		
 		for(Path p : area.paths)
 		{
 			p.getEnemysInPath().clear();
 		}
 		
-		for (int i = 1; i < ButtonHandler.getButtons().size(); i++) {
-			Button b = ButtonHandler.getButton(i);
-			b.setColor(Color.BLACK);
-		}
-		
 		ButtonHandler.getButton(1).setColor(sh.getCurrentSongInstance().getButtons().get(0).getColor());
 		
 		sh.play();
@@ -106,8 +103,11 @@ public class PlayState extends GameState {
 		}
 		
 
-		if(progress > sh.getCurrentSongInstance().getEndTime() + Enemy.secondsToEnd*1000*2)
+		if(progress > sh.getCurrentSongInstance().getEndTime() + Enemy.secondsToEnd*2500){
+			won = true;
 			endGame();			
+		}
+			
 
 		oldProgress = progress;
 
@@ -122,7 +122,7 @@ public class PlayState extends GameState {
 				Enemy e = enemyIterator.next();
 				if (e.getDistanceFromStart() > Enemy.distanceToOctagon + (sizeOfEnemy * 1.5)) {
 					enemyIterator.remove();
-					lifePoints -= 5;
+					lifePoints -= 6;
 					comboScore /= 2;
 					enemies_missed++;
 				}
@@ -136,7 +136,7 @@ public class PlayState extends GameState {
 			}
 		}
 
-		lifePoints -= 0.002 * factor;
+		lifePoints -= 0.003 * factor;
 		
 		infoPanel.updateIPanel();
 		
@@ -160,7 +160,7 @@ public class PlayState extends GameState {
 	}
 
 	private void endGame() {
-		if(sh.getProgress()/1000 < 5000)	
+		if(sh.getProgress()/1000 > 5000)	
 		{
 			sql.addPlaydata(sh.getCurrentSong(), sh.getCurrentSongInstance(), sh.getProgress()/1000, enemies_missed, enemies_hit, buttons_pressed, joystick_moved);
 			sh.getCurrentSongInstance().played();
@@ -169,7 +169,7 @@ public class PlayState extends GameState {
 		if(currentScore == 0)
 			gsm.setState(State.MENU_STATE);
 		else
-			gsm.setState(State.GAMEOVER_STATE);
+			gsm.setState(State.END_STATE);
 	}
 
 	@Override
@@ -194,19 +194,6 @@ public class PlayState extends GameState {
 				player.draw(g2);
 		} catch (Exception e) {
 		}
-		if(!Window.ON_RASP){
-			int width,height;
-			width = g2.getFontMetrics().stringWidth("");
-			height = g2.getFontMetrics().getHeight();
-			for (int i = 1; i < ButtonHandler.getButtons().size(); i++) {
-				Ellipse2D oval = new Ellipse2D.Double(880+(50*i), 0, 50, 50);
-				g2.setColor(ButtonHandler.getButton(i).getColor());
-				g2.fill(oval);
-				g2.setColor(Color.BLACK);
-				width = g2.getFontMetrics().stringWidth(""+i);
-				g2.drawString(""+i, (int)oval.getCenterX()-width/2,(int)oval.getMaxY()+height);
-			}
-		}
 	}
 
 	@Override
@@ -217,15 +204,12 @@ public class PlayState extends GameState {
 			Enemy enemy = enemysInPath.next();
 			if (enemy.getDistanceFromStart() > Enemy.distanceToOctagon || enemy.getDistanceFromStart() > Enemy.distanceToOctagon + sizeOfEnemy) {
 				if (e.getButton().getColor().equals(enemy.getColor())) {
-					PointAnimation.LastPointIncrement = (int)(enemy.getDistanceFromStart() - Enemy.distanceToOctagon);
+					currentScore += enemy.getDistanceFromStart() - Enemy.distanceToOctagon;
-					currentScore += PointAnimation.LastPointIncrement;
 					comboScore += 5;
-					lifePoints = Math.min(lifePoints+10, 100);
+					lifePoints = Math.min(lifePoints+8, 100);
 					area.setHitAreaColor(enemy.getColor());
-					area.enemyDied((Point2D.Double) enemy.getEnemy().getP1());
 					area.hit();
 					enemies_hit++;
-					infoPanel.throwACoin(); // Coin Animatie starten bij hit
 					enemysInPath.remove();
 					notHit = false;
 					break;
@@ -233,6 +217,7 @@ public class PlayState extends GameState {
 			}
 		}
 		
+
 		player.setBeat();
 
 		if(notHit)
@@ -295,4 +280,8 @@ public class PlayState extends GameState {
 		Enemy e = new Enemy(pathID, 1, color, path);
 		path.getEnemysInPath().addLast(e);
 	}	
+	
+	public static boolean won(){
+		return won;
+	}
 }

model/gameState/PreGameState.java

@@ -8,8 +8,8 @@ import java.awt.Font;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 
-import model.SongHandler;
 import control.GameStateManager;
+import control.SongHandler;
 import control.button.ButtonEvent;
 import control.joystick.JoystickEvent;
 import data.io.SQLConnector;
@@ -18,7 +18,6 @@ public class PreGameState extends GameState {
 
 	double index2 = 3;
 	double index = 3;
-	double timer;
 	int grootte = 150;
 	BasicStroke s = new BasicStroke(20);
 	
@@ -31,7 +30,9 @@ public class PreGameState extends GameState {
 
 	@Override
 	public void init() {
-		
+		grootte = 150;
+		index = 3;
+		index2 = 3;
 	}
 
 	@Override

model/gameState/TitleState.java

@@ -12,8 +12,8 @@ import java.awt.Transparency;
 import java.awt.image.BufferedImage;
 import java.awt.image.VolatileImage;
 
-import model.SongHandler;
 import control.GameStateManager;
+import control.SongHandler;
 import control.GameStateManager.State;
 import control.button.ButtonEvent;
 import control.joystick.JoystickEvent;
@@ -21,64 +21,76 @@ import data.io.SQLConnector;
 
 public class TitleState extends GameState {
 
-	private BufferedImage 	pressStart 	= 	Images.getImage(ImageType.pressstart),
+    BufferedImage pressStart = Images.getImage(ImageType.pressstart);
-			colorStrike = 	Images.getImage(ImageType.colorstrike),
+    BufferedImage colorStrike = Images.getImage(ImageType.colorstrike);
-			kast 		= 	Images.getImage(ImageType.kast);
+    BufferedImage kast = Images.getImage(ImageType.kast);
-	private VolatileImage 	background;
+    VolatileImage background;
-
+	Font textFont = new Font("OCR A Extended", Font.BOLD, 15);
-	private Font 			textFont 	= 	new Font("OCR A Extended", Font.BOLD, 15),
+	Font textFont2 = new Font("OCR A Extended", Font.BOLD, 130);
-			textFont2 	=	new Font("OCR A Extended", Font.BOLD, 130);
+	GradientPaint gp = new GradientPaint(300, 0, new Color(0, 0, 1, 0.6f), 980, 1024, new Color(0, 0, 1, 0.2f));
-
-	private GradientPaint gp = new GradientPaint(300, 0, new Color(0, 0, 1, 0.6f), 980, 1024, new Color(0, 0, 1, 0.2f));
 
 	
-	private int index 		= 0,
+    int index = 0;
-			varx 		= 0,
+    int varx = 0;
-			indexKast 	= 0,
+    
-			xKast	  	= 0,
+    int frame = 0;
-			frame;
+    int image_x = 0;
+
+    
+    int indexKast = 0;
+    int xKast=0;
     
 	public TitleState(GameStateManager gsm, SongHandler sh, SQLConnector sql){
 		super(gsm, sh, sql);
+		if(!sh.isPlaying())
+			sh.play();
 		createBackground();
 	}
 
 	@Override
 	public void init() {
-		sh.play();
+		if(!sh.isPlaying())
+			sh.play();
+		
+		frame = 0;
+		image_x = 0;
+		
+		indexKast = 0;
+		xKast = 0;
 	}
 
 	@Override
 	public void update(float factor) {
-		frame++;
+		image_x = ((frame / 6) % 6) * 49;
-		indexKast++;
+        frame++;
+        
+        indexKast++;
+        xKast = indexKast/10;
+		xKast%=4;
 	}
 
+	@Override
 	public void draw(Graphics2D g2) {
-		// Scherm beelt wat kleurrijke rectangles op het scherm.
+		g2.drawImage(background, 0, 0, 1280, 1024, null);
-		if (frame > 0) {
-			g2.drawImage(background, 0, 0, 1280, 1024, null);
-			createBackground();
-		}
-		if (frame > 160) {
-			// Code die de arcadekast en 'Press Start' toont.
-			int image_x = ((frame / 6) % 6) * 49;
-			g2.drawImage(pressStart.getSubimage(image_x, 0, 49, 26), 640 - 122, 512, 245, 130, null);
 		
-			xKast = indexKast / 10;
+		g2.drawImage(pressStart.getSubimage(image_x, 0, 49, 26),  640-122, 512, 245, 130, null);
-			xKast %= 4;
+		
-			g2.drawImage(kast.getSubimage(xKast * 300, 0, 300, 400), 100, 300, 300, 400, null);
+		g2.drawImage(kast.getSubimage(xKast*600,0,600,800), 490,624,300,400,null);
-		}
+		
+		g2.setFont(textFont);
+		g2.setColor(Color.WHITE);
+		g2.drawString("©2015 Team Hamtaro", 550, 1012);
 	}
 
 	@Override
 	public void buttonPressed(ButtonEvent e) {
 
 		switch (e.getButton().getButtonID()) {
-			case 0:
+		case 0:
-				gsm.setState(State.MENU_STATE);
+			gsm.setState(State.MENU_STATE);
-				break;
+			break;
 		}
+
 	}
 
 	@Override
@@ -93,47 +105,31 @@ public class TitleState extends GameState {
 	public void createBackground() {
 		background = Images.initVolatileImage(1280, 1024, Transparency.OPAQUE);
 		Graphics2D g2 = background.createGraphics();
+		RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+		g2.setRenderingHints(rh);
+		g2.setColor(new Color(1, 1, 1, 0.3f));
+		g2.fillRect(0, 0, 1280, 1024);
 
-		if (frame > 0) {
+		g2.setColor(new Color(0, 1, 0, 0.7f));
-			RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+		g2.fillRect(0, 0, 100, 1024);
-			g2.setRenderingHints(rh);
+		g2.fillRect(1180, 0, 100, 1024);
-		}
-		if (frame > 20) {
-			g2.setColor(new Color(1, 1, 1, 0.3f));
-			g2.fillRect(0, 0, 1280, 1024);
-		}
-		if (frame > 40) {
-			g2.setColor(new Color(0, 1, 0, 0.7f));
-			g2.fillRect(0, 0, 100, 1024);
-			g2.fillRect(1180, 0, 100, 1024);
-		}
-		if (frame > 60) {
-			g2.setColor(new Color(1, 1, 0, 0.7f));
-			g2.fillRect(100, 0, 100, 1024);
-			g2.fillRect(1080, 0, 100, 1024);
-		}
-		if (frame > 80) {
-			g2.setColor(new Color(1, 0, 0, 0.7f));
-			g2.fillRect(200, 0, 100, 1024);
-			g2.fillRect(980, 0, 100, 1024);
-		}
-		if (frame > 100) {
-			g2.setPaint(gp);
-			g2.fillRect(300, 0, 680, 1024);
-		}
-		if (frame > 120) {
-			g2.setFont(textFont);
-			g2.setColor(Color.WHITE);
-			g2.drawString("©2015 Team Hamtaro", 550, 1012);
-		}
-		if (frame > 140) {
-			g2.setColor(Color.RED);
-			g2.setFont(textFont2);
-			g2.drawString("Color", 385, 212);
-			g2.drawString("Strike", 390, 342);
-			g2.dispose();
-		}
 
+		g2.setColor(new Color(1, 1, 0, 0.7f));
+		g2.fillRect(100, 0, 100, 1024);
+		g2.fillRect(1080, 0, 100, 1024);
+
+		g2.setColor(new Color(1, 0, 0, 0.7f));
+		g2.fillRect(200, 0, 100, 1024);
+		g2.fillRect(980, 0, 100, 1024);
+
+		g2.setPaint(gp);
+		g2.fillRect(300, 0, 680, 1024);
+
+		g2.setColor(Color.RED);
+		g2.setFont(textFont2);
+		g2.drawString("Color", 385, 212);
+		g2.drawString("Strike", 390, 342);
+		g2.dispose();
 		background.createGraphics();
 	}
 

model/objects/DifficultyButton.java

@@ -27,11 +27,14 @@ public class DifficultyButton {
 		button = Images.initVolatileImage(305, 80, Transparency.OPAQUE);
 		Graphics2D g2 = button.createGraphics();
 		g2.setColor(Color.WHITE);
-		g2.fillRect(0, 0, 300, 75);
+		g2.fillRect(0, 0, 305, 80);
 		g2.setColor(Color.ORANGE);
-		g2.drawRect(0, 0, 300, 75);
+		g2.drawRect(0, 0, 304, 79);
-		//g2.drawRect(0-2, 0-2, 304, 79);
+		g2.drawRect(2, 2, 300, 75);
-		
+//		g2.drawRect(0, 0, 300, 75);
+//		g2.drawRect(0-2, 0-2, 304, 79);
+		g2.drawRect(0, 0, 304, 79);
+		g2.drawRect(2, 2, 300, 75);
 		g2.setColor(color);
 		Font textFont2 = new Font("OCR A Extended", Font.BOLD, 50);
 		g2.setFont(textFont2);

model/objects/InfoPanel.java

@@ -8,41 +8,35 @@ import java.awt.GradientPaint;
 import java.awt.Graphics2D;
 import java.awt.RenderingHints;
 import java.awt.Transparency;
+import java.awt.geom.Ellipse2D;
 import java.awt.image.VolatileImage;
 
-import model.SongHandler;
-import model.drawObjects.CoinAnimation;
 import model.gameState.PlayState;
+import control.SongHandler;
+import control.button.ButtonHandler;
 
 public class InfoPanel {
 	
 	private static String totalHighscore = "000000";
-	private int x, y;
 	private VolatileImage infoPanel;
 	private SongHandler sh;
 	private String time;
+	private int highscore = 0;
 	
-	private int tempComboMulitplier;
+	public InfoPanel(SongHandler sh){
-
-	private CoinAnimation coinAnimation = new CoinAnimation(125, 300);
-	
-	public InfoPanel(int x, int y, SongHandler sh){
-		this.x = x;
-		this.y = y;
 		this.sh = sh;
 		updateIPanel();
 		generateInfoPanel();
 	}
 
+	public void init(int highscore)
+	{
+		this.highscore = highscore;
+		updateIPanel();
+		generateInfoPanel();
+	}
 	public void updateIPanel() {		
 		totalHighscore  = "" + PlayState.currentScore;
-//		time = "";
-//		long progress = (sh.getProgress() / 1000);
-//		time = progress%1000 + time;
-//		progress /= 1000;
-//		time = progress%1000 + ":" + time;
-//		progress /= 1000;
-//		time = progress + ":" +  time;
 		
 		long progress = (sh.getProgress() / 1000);
 		String millis = (((progress) % 1000) + "").length() > 3 ? ("" +((progress) % 1000)).substring(0, 2) : "" + ((progress) % 1000);
@@ -58,54 +52,75 @@ public class InfoPanel {
 		RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
 	    g2.setRenderingHints(rh);	
 	    
-	    
-//	    g2.setColor(Color.GRAY);
 	    GradientPaint gp = new GradientPaint(0, 0, new Color(245,245,245), 256, 1024, Color.WHITE);
 	    g2.setPaint(gp);
-		g2.fillRect(x, y, 256, 1024);
 		
-		g2.setColor(Color.BLACK);
-		g2.drawRect(x, y, 255, 1023);
-		
-		Font scoreFont = new Font("OCR A Extended", Font.BOLD, 30);
-		g2.setFont(scoreFont);
 		g2.setColor(Color.GREEN);
-		g2.fillRect(25, 100, (int)(2 * PlayState.lifePoints), 30);
+		g2.fillRect(25, 900, (int)(2 * PlayState.lifePoints), 30);
-		
-		g2.setColor(Color.BLACK);
-		g2.drawString("Score: " + totalHighscore, 25, 75);
-		g2.drawRect(25, 100, 200, 30);
-		g2.drawRect(25, 300, 200, 700);
-		
-		g2.drawString(sh.getCurrentSong().getTitle(), 25, 200);
-		g2.drawString(sh.getCurrentSongInstance().getDifficulty(), 25, 230);
-		g2.drawString(sh.getCurrentSong().getAuthor(), 25, 260);
-		g2.drawString(time, 25, 290);
-		
-//	    GradientPaint gp = new GradientPaint(300, 0, new Color(200,200,255), 256, 1024, Color.WHITE);
-//	    g2.setPaint(gp);
-//		g2.fillRect(x, y, 256, 1024);
 		
 		g2.setColor(Color.YELLOW);		
-		// Controlen of coin animatie nodig is
+		g2.fillRect(25, 950, (int)(2 * PlayState.comboScore), 30);
-		if (!coinAnimation.areWeDoneYet()) {
+		
-			coinAnimation.draw(g2);
+		g2.setColor(Color.BLACK);
-			// Score pas updaten wanneer coin in zijn laatste draw loop zit
+		
-			if (coinAnimation.isLastLoop())
+		g2.drawRect(25, 900, 200, 30);
-				tempComboMulitplier = PlayState.comboScore;
+		g2.drawRect(25, 950, 200, 30);
-		} else
+		
-			tempComboMulitplier = PlayState.comboScore;
+		Font scoreFont = new Font("OCR A Extended", Font.BOLD, 35);
+		g2.setFont(scoreFont);
+		g2.drawString("Score: ", 25, 75);
+		
+		g2.drawString(sh.getCurrentSong().getTitle(), 25, 215);
+		g2.drawString(sh.getCurrentSongInstance().getDifficulty(), 25, 295);
+		g2.drawString(time, 25, 375);
+		g2.drawString("" + highscore, 25, 455);
+		
+		Font scoreFont2 = new Font("OCR A Extended", Font.BOLD, 25);
+		g2.setFont(scoreFont2);
+		g2.drawString("Title: ", 25, 185);
+		g2.drawString("Difficulty: ", 25, 265);
+		g2.drawString("Time: ", 25, 345);
+		g2.drawString("Best: ", 25, 425);
 		
 		
-		g2.fillRect(25, 1000 - 7 * PlayState.comboScore, 200, 0 + 7 * PlayState.comboScore);
+		Font scoreFont3 = new Font("OCR A Extended", Font.BOLD, 45);
+		g2.setFont(scoreFont3);
+		g2.drawString("" + totalHighscore, 25, 115);
+		
+		
+
+
+
+			
+			
+			Ellipse2D oval1 = new Ellipse2D.Double(25, 700, 50, 50);
+			g2.setColor(ButtonHandler.getButton(1).getColor());
+			g2.fill(oval1);
+			
+			Ellipse2D oval2 = new Ellipse2D.Double(85, 700, 50, 50);
+			g2.setColor(ButtonHandler.getButton(2).getColor());
+			g2.fill(oval2);
+			
+			Ellipse2D oval3 = new Ellipse2D.Double(145, 700, 50, 50);
+			g2.setColor(ButtonHandler.getButton(3).getColor());
+			g2.fill(oval3);
+			
+			Ellipse2D oval4 = new Ellipse2D.Double(50, 760, 50, 50);
+			g2.setColor(ButtonHandler.getButton(4).getColor());
+			g2.fill(oval4);
+			
+			Ellipse2D oval5 = new Ellipse2D.Double(110, 760, 50, 50);
+			g2.setColor(ButtonHandler.getButton(5).getColor());
+			g2.fill(oval5);
+			
+			Ellipse2D oval6 = new Ellipse2D.Double(170, 760, 50, 50);
+			g2.setColor(ButtonHandler.getButton(6).getColor());
+			g2.fill(oval6);
+				
 		g2.dispose();
 		infoPanel.createGraphics();
 	}
 	
-	public void throwACoin() {
-		coinAnimation.start();		// Teller weer op 1 zetten
-	}
-
 	public void draw(Graphics2D g2){
 		g2.drawImage(infoPanel, 0, 0, 256,1024,null);
 	}

model/objects/PlayArea.java

@@ -2,17 +2,21 @@ package model.objects;
 
 import image.Images;
 
-import java.awt.*;
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.Polygon;
+import java.awt.RenderingHints;
+import java.awt.Stroke;
+import java.awt.Transparency;
 import java.awt.geom.GeneralPath;
 import java.awt.geom.Line2D;
-import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.VolatileImage;
 import java.util.ArrayList;
 import java.util.List;
 
 import model.drawObjects.Enemy;
-import model.drawObjects.PointAnimation;
 import model.gameState.PlayState;
 
 public class PlayArea {
@@ -24,8 +28,7 @@ public class PlayArea {
 	private VolatileImage background;
 	private boolean hit = false;
 	private int count = 0,maxCount = 100,pathID = -1;
-	private Stroke stroke = new BasicStroke(5);
+	private Stroke stroke = new BasicStroke(5,BasicStroke.CAP_ROUND,BasicStroke.JOIN_ROUND);
-	private PointAnimation pointAnimation = new PointAnimation();
 	
 	private Rectangle2D backgroundPlay = new Rectangle2D.Double(256, 0, 1024, 1024);
 	
@@ -118,12 +121,6 @@ public class PlayArea {
 			g2.setColor(pathColor);
 			g2.draw(paths.get(pathID));
 		}
-
-		Font scoreFont = new Font("OCR A Extended", Font.BOLD, 40);
-		Font tempFont = g2.getFont();
-		g2.setFont(scoreFont);
-		pointAnimation.draw(g2);
-		g2.setFont(tempFont);
 	}
 	
 	public Line2D getLine(int index){
@@ -160,6 +157,4 @@ public class PlayArea {
 		this.pathID = pathID;
 		this.pathColor = pathColor;
 	}
-
-	public void enemyDied(Point2D.Double p) { pointAnimation.enemyDied(p); }
 }