Avans/Arcade
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/menu' into feature/menu

Browse Source 
# Conflicts:
#	model/gameState/MenuState.java
This commit is contained in:
jancoow
2015-06-02 12:00:27 +02:00
parent ab827600b1 10f73d6e91
commit 058d18784f
2 changed files with 50 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/gameState/MenuState.java
+16 -10
View File
@@ -5,6 +5,8 @@ import image.Images.ImageType;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.Polygon;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import model.SongHandler;
@@ -16,14 +18,14 @@ import control.joystick.Joystick;
import control.joystick.JoystickEvent;
public class MenuState extends GameState {
private ArrayList<MenuButton> buttons;
private int selected;
private Polygon triangle;
int frame = 0;
int maxFrames = 2560;
int animationcounter;
ArrayList<MenuButton> buttons;
int selected;
public MenuState(GameStateManager gsm, SongHandler sh) {
super(gsm, sh);
buttons = new ArrayList<MenuButton>();
@@ -34,8 +36,6 @@ public class MenuState extends GameState {
}
@Override
public void init() {
// TODO Auto-generated method stub
}
@Override
@@ -49,11 +49,17 @@ public class MenuState extends GameState {
@Override
public void draw(Graphics2D g2) {
g2.drawImage(Images.getImage(ImageType.background), -640 -((frame * 4) % maxFrames), 0, 5120, 1024, null);
for(MenuButton b:buttons){
// g2.drawImage(Images.getImage(ImageType.background), -640 -((frame * 4) % maxFrames), 0, 5120, 1024, null);
for(MenuButton b:buttons){
b.draw(g2);
}
}
g2.setColor(Color.ORANGE);
triangle = new Polygon();
triangle.addPoint(0, 0);
triangle.addPoint(0, 1024/4);
triangle.addPoint(1280/2, 0);
g2.fillPolygon(triangle);
}
@Override