diff --git a/image/Images.java b/image/Images.java index a7477ef..14b1ccd 100644 --- a/image/Images.java +++ b/image/Images.java @@ -31,6 +31,8 @@ public class Images { images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/colorstrike.png")))); images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/background.png")))); images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/aanwijzers4sho.png")))); + images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/MenuAchtergrond.png")))); + images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/SubmenuAchtergrond.png")))); } catch (IOException e) { e.printStackTrace(); } @@ -41,7 +43,7 @@ public class Images { } public enum ImageType { - pulse,cursor,pressstart,colorstrike,background,aanwijzers + pulse,cursor,pressstart,colorstrike,background,aanwijzers,menuachtergrond,subMenu } public static BufferedImage readImage(File f) { diff --git a/image/MenuAchtergrond.png b/image/MenuAchtergrond.png new file mode 100644 index 0000000..d16d750 Binary files /dev/null and b/image/MenuAchtergrond.png differ diff --git a/image/SubmenuAchtergrond.png b/image/SubmenuAchtergrond.png new file mode 100644 index 0000000..589dc4b Binary files /dev/null and b/image/SubmenuAchtergrond.png differ diff --git a/model/gameState/MenuState.java b/model/gameState/MenuState.java index b6764cb..cbdb9cc 100644 --- a/model/gameState/MenuState.java +++ b/model/gameState/MenuState.java @@ -42,6 +42,9 @@ public class MenuState extends GameState { BufferedImage aanwijzers = Images.getImage(ImageType.aanwijzers); int index = 0; + BufferedImage menuAchtergrond = Images.getImage(ImageType.menuachtergrond); + BufferedImage subMenu = Images.getImage(ImageType.subMenu); + public MenuState(GameStateManager gsm, SongHandler sh) { super(gsm, sh); buttons = new ArrayList(); @@ -172,16 +175,7 @@ public class MenuState extends GameState { RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); g2.setRenderingHints(rh); g2.setFont(textFont2); - g2.setPaint(new GradientPaint(0, 0, new Color(0,0,1, 0.6f),1280,1024 ,new Color(0,0,1, 0.2f))); - g2.fillRect(0, 0, 1280, 1024); - g2.setPaint(new GradientPaint(0, 0, new Color(1,1,0, 0.6f),1280,1024 ,new Color(0,0,1, 0.2f))); - - - Polygon triangle2 = new Polygon(); - triangle2.addPoint(0, 0); - triangle2.addPoint(0, 1024/4+50); - triangle2.addPoint(1280/2+50, 0); - g2.fillPolygon(triangle2); + g2.drawImage(menuAchtergrond,0,0,1280,1024,null); g2.setColor(Color.ORANGE); Polygon triangle = new Polygon(); @@ -203,12 +197,8 @@ public class MenuState extends GameState { g2.setRenderingHints(rh); g2.setFont(textFont2); g2.setColor(Color.BLACK); - GradientPaint gp3 = new GradientPaint(640, 1024/8,Color.BLUE,640,1024 ,Color.WHITE); - g2.setPaint(gp3); - g2.fillRect(0, 0, 1280, 1024); - GradientPaint gp4 = new GradientPaint(0, 0,new Color(1,1,0,0.6f),1280,1024,new Color(1,1,1,0.2f)); - g2.setPaint(gp4); - g2.fillRect(0,128,1280,25); + g2.drawImage(subMenu, 0, 0, 1280, 1024, null); + g2.setColor(Color.ORANGE); g2.fillRect(0, 0, 1280, 1024/8); g2.setColor(Color.BLACK);