InfoPanel herdeelt

model/objects/InfoPanel.java

@@ -8,8 +8,11 @@ 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 control.button.ButtonHandler;
+import main.Window;
 import model.SongHandler;
 import model.gameState.PlayState;
 
@@ -20,6 +23,7 @@ public class InfoPanel {
 	private VolatileImage infoPanel;
 	private SongHandler sh;
 	private String time;
+	private int highscore;
 	
 	public InfoPanel(int x, int y, SongHandler sh){
 		this.x = x;
@@ -28,16 +32,15 @@ public class InfoPanel {
 		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);
@@ -53,37 +56,68 @@ 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.YELLOW);		
+		g2.fillRect(25, 950, (int)(2 * PlayState.comboScore), 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);
+		g2.drawRect(25, 900, 200, 30);
+		g2.drawRect(25, 950, 200, 30);
 		
-//	    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.drawString("Score: " + totalHighscore, 25, 75);
+		g2.drawString(sh.getCurrentSong().getTitle(), 25, 125);
+		g2.drawString(sh.getCurrentSong().getAuthor(), 25, 175);
+		g2.drawString("" + highscore, 25, 225);
+		g2.drawString(time, 25, 275);
+			
+
+		if(!Window.ON_RASP){
+			int width,height;
+			width = g2.getFontMetrics().stringWidth("");
+			height = g2.getFontMetrics().getHeight();
 			
 			
-		g2.setColor(Color.YELLOW);		
-		g2.fillRect(25, 1000 - 7 * PlayState.comboScore, 200, 0 + 7 * PlayState.comboScore);
+			Ellipse2D oval1 = new Ellipse2D.Double(15, 700, 50, 50);
+			g2.setColor(ButtonHandler.getButton(1).getColor());
+			g2.fill(oval1);
+			
+			Ellipse2D oval2 = new Ellipse2D.Double(75, 700, 50, 50);
+			g2.setColor(ButtonHandler.getButton(2).getColor());
+			g2.fill(oval2);
+			
+			Ellipse2D oval3 = new Ellipse2D.Double(135, 700, 50, 50);
+			g2.setColor(ButtonHandler.getButton(3).getColor());
+			g2.fill(oval3);
+			
+			Ellipse2D oval4 = new Ellipse2D.Double(40, 760, 50, 50);
+			g2.setColor(ButtonHandler.getButton(4).getColor());
+			g2.fill(oval4);
+			
+			Ellipse2D oval5 = new Ellipse2D.Double(100, 760, 50, 50);
+			g2.setColor(ButtonHandler.getButton(5).getColor());
+			g2.fill(oval5);
+			
+			Ellipse2D oval6 = new Ellipse2D.Double(160, 760, 50, 50);
+			g2.setColor(ButtonHandler.getButton(6).getColor());
+			g2.fill(oval6);
+		}
+				
+//				g2.setColor(Color.BLACK);
+//				width = g2.getFontMetrics().stringWidth(""+i);
+//				g2.drawString(""+i, (int)oval.getCenterX()-width/2,(int)oval.getMaxY()+height);
+		
+		
+		
+		
 		g2.dispose();
 		infoPanel.createGraphics();
 	}