diff --git a/image/Images.java b/image/Images.java index 14b1ccd..a7477ef 100644 --- a/image/Images.java +++ b/image/Images.java @@ -31,8 +31,6 @@ 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(); } @@ -43,7 +41,7 @@ public class Images { } public enum ImageType { - pulse,cursor,pressstart,colorstrike,background,aanwijzers,menuachtergrond,subMenu + pulse,cursor,pressstart,colorstrike,background,aanwijzers } public static BufferedImage readImage(File f) { diff --git a/image/MenuAchtergrond.png b/image/MenuAchtergrond.png deleted file mode 100644 index d16d750..0000000 Binary files a/image/MenuAchtergrond.png and /dev/null differ diff --git a/image/SubmenuAchtergrond.png b/image/SubmenuAchtergrond.png deleted file mode 100644 index 589dc4b..0000000 Binary files a/image/SubmenuAchtergrond.png and /dev/null differ diff --git a/model/gameState/MenuState.java b/model/gameState/MenuState.java index 822c511..c6761d9 100644 --- a/model/gameState/MenuState.java +++ b/model/gameState/MenuState.java @@ -46,9 +46,6 @@ 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(); @@ -192,7 +189,16 @@ public class MenuState extends GameState { RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); g2.setRenderingHints(rh); g2.setFont(textFont2); - g2.drawImage(menuAchtergrond,0,0,1280,1024,null); + 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.setColor(Color.ORANGE); Polygon triangle = new Polygon(); @@ -213,8 +219,12 @@ public class MenuState extends GameState { RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); g2.setRenderingHints(rh); g2.setColor(Color.BLACK); - g2.drawImage(subMenu, 0, 0, 1280, 1024, null); - + 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.setColor(Color.ORANGE); g2.fillRect(0, 0, 1280, 1024/8); g2.setColor(Color.BLACK);