diff --git a/data/io/WebcamUploader.class b/data/io/WebcamUploader.class new file mode 100644 index 0000000..cd6fe5d Binary files /dev/null and b/data/io/WebcamUploader.class differ 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(); - 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)); }