From 82f903828fdfcb49cf9e5d09d447ab66ab54c735 Mon Sep 17 00:00:00 2001
From: Dofensmirtsz <dofensmirtsz@gmail.com>
Date: Thu, 18 Jun 2015 14:02:38 +0200
Subject: [PATCH] =?UTF-8?q?=C3=80chtergrond=20verandert=20van=20kleur=20en?=
 =?UTF-8?q?=20inforpanel=20is=20beter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/io/WebcamUploader.class | Bin 0 -> 4454 bytes
 model/objects/InfoPanel.java |  22 +++++++++++++++++-----
 model/objects/PlayArea.java  |  22 ++++++++++++++++++----
 3 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 data/io/WebcamUploader.class

diff --git a/data/io/WebcamUploader.class b/data/io/WebcamUploader.class
new file mode 100644
index 0000000000000000000000000000000000000000..cd6fe5dbc649a7264de3171c5ed23af79d546bde
GIT binary patch
literal 4454
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

literal 0
HcmV?d00001

diff --git a/model/objects/InfoPanel.java b/model/objects/InfoPanel.java
index 93f55df..2478202 100644
--- a/model/objects/InfoPanel.java
+++ b/model/objects/InfoPanel.java
@@ -4,6 +4,7 @@ import image.Images;
 
 import java.awt.Color;
 import java.awt.Font;
+import java.awt.GradientPaint;
 import java.awt.Graphics2D;
 import java.awt.RenderingHints;
 import java.awt.Transparency;
@@ -51,25 +52,36 @@ public class InfoPanel {
 		Graphics2D g2 = infoPanel.createGraphics();
 		RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
 	    g2.setRenderingHints(rh);	
-	    g2.setColor(Color.BLACK);
 	    
+	    
+//	    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.setColor(Color.ORANGE);
+		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.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);		
 		g2.fillRect(25, 1000 - 7 * PlayState.comboScore, 200, 0 + 7 * PlayState.comboScore);
 		g2.dispose();
diff --git a/model/objects/PlayArea.java b/model/objects/PlayArea.java
index 482e59e..feec629 100644
--- a/model/objects/PlayArea.java
+++ b/model/objects/PlayArea.java
@@ -2,13 +2,17 @@ package model.objects;
 
 import image.Images;
 
+import java.awt.AlphaComposite;
+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.Rectangle2D;
 import java.awt.image.VolatileImage;
 import java.util.ArrayList;
 import java.util.List;
@@ -25,11 +29,15 @@ 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 Rectangle2D backgroundPlay = new Rectangle2D.Double(256, 0, 1024, 1024);
+	
 	
 	public PlayArea(double xToRight,double heightOfGameScreen,double widthOfGameScreen, int sizeOctagon) {
 		super();
 		paths = new ArrayList<Path>();		
-		setHitAreaColor(Color.RED);
+		setHitAreaColor(Color.WHITE);
 		//make the polygons
 		int amountOfAngles = 8;
 		double middlePointX = widthOfGameScreen/2+xToRight;
@@ -80,11 +88,14 @@ public class PlayArea {
 		
 		//drawing into buffer
 		background = Images.initVolatileImage(1280,1024, Transparency.BITMASK);
-		Graphics2D g2 = background.createGraphics();
+		Graphics2D g2 = background.createGraphics();		
 		RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
 	    g2.setRenderingHints(rh);
-	    Line2D current;		
+//	    g2.setColor(Color.WHITE);
+//	    g2.fillRect(256, 0, 1024, 1024);
+	    Line2D current;	
 		g2.setColor(Color.BLACK);
+		g2.setStroke(stroke);
 		for(int i = 0; i < paths.size(); i++){
 			current = paths.get(i);			
 			g2.draw(current);
@@ -104,7 +115,10 @@ public class PlayArea {
 				hit = false;
 			}
 		}		
-		if(pathID >= 0 && pathColor != null){
+		if(pathID >= 0 && pathColor != null){	
+			g2.setColor(new Color(pathColor.getRed(), pathColor.getGreen(), pathColor.getBlue(),50));
+			g2.fill(backgroundPlay);
+			g2.setStroke(stroke);
 			g2.setColor(pathColor);
 			g2.draw(paths.get(pathID));
 		}