Feature/menu
Conflicts: audio/AudioPlayer.java model/GameModel.java model/SongHandler.java model/gameState/MenuState.java Menu now works togheter with the game. A lot of known bugs with audio player
This commit is contained in:
jancoow
+204
-42
@@ -4,66 +4,195 @@ import image.Images;
|
||||
import image.Images.ImageType;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.awt.Font;
|
||||
import java.awt.GradientPaint;
|
||||
import java.awt.Graphics2D;
|
||||
import java.awt.Polygon;
|
||||
import java.awt.image.BufferedImage;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import com.sun.glass.ui.EventLoop.State;
|
||||
|
||||
import model.GameModel;
|
||||
import model.SongHandler;
|
||||
import model.objects.DifficultyButton;
|
||||
import model.objects.MenuButton;
|
||||
import audio.Song;
|
||||
import audio.SongInstance;
|
||||
import control.GameStateManager;
|
||||
import control.GameStateManager.State;
|
||||
import control.button.ButtonEvent;
|
||||
import control.joystick.Joystick;
|
||||
import control.joystick.JoystickEvent;
|
||||
|
||||
public class MenuState extends GameState {
|
||||
private ArrayList<MenuButton> buttons;
|
||||
private ArrayList<DifficultyButton> buttons2;
|
||||
private int selected, oldselected;
|
||||
private List<Song> songs;
|
||||
private Polygon triangle,triangle2;
|
||||
|
||||
int frame = 0;
|
||||
int maxFrames = 2560;
|
||||
int animationcounter;
|
||||
|
||||
ArrayList<MenuButton> buttons;
|
||||
int selected;
|
||||
|
||||
private int animationcounter;
|
||||
private boolean subscreen, startanimation;
|
||||
|
||||
int yPosDiffButton = 900;
|
||||
private int difSelect=0;
|
||||
|
||||
BufferedImage aanwijzers = Images.getImage(ImageType.aanwijzers);
|
||||
int index = 0;
|
||||
|
||||
public MenuState(GameStateManager gsm, SongHandler sh) {
|
||||
super(gsm, sh);
|
||||
buttons = new ArrayList<MenuButton>();
|
||||
buttons.add(new MenuButton(-600, 50,1.7, "Quick play", 0, Color.green));
|
||||
buttons.add(new MenuButton(-600, 150, 1.7, "Pick song", 10, new Color(60,60,255)));
|
||||
buttons.add(new MenuButton(-600, 250, 1.7, "Best played", 20, Color.red));
|
||||
buttons.add(new MenuButton(-600, 350, 1.7, "Last played", 30, Color.yellow));
|
||||
buttons2 = new ArrayList<DifficultyButton>();
|
||||
this.songs = sh.getSongs();
|
||||
startanimation = true;
|
||||
subscreen = false;
|
||||
|
||||
buttons.add(new MenuButton(-600, 50,1.7, 0, Color.green, selectedToSong(selected-2) ));
|
||||
buttons.add(new MenuButton(-600, 150, 1.7, 10, Color.BLUE, selectedToSong(selected-1)));
|
||||
buttons.add(new MenuButton(-600, 250, 1.7, 20, Color.red, selectedToSong(selected)));
|
||||
buttons.add(new MenuButton(-600, 350, 1.7, 30, Color.yellow,selectedToSong(selected+1)));
|
||||
buttons.add(new MenuButton(-600, 450, 1.7, 30, Color.WHITE,selectedToSong(selected+2)));
|
||||
buttons.get(2).setSelected(true);
|
||||
|
||||
}
|
||||
@Override
|
||||
public void init() {
|
||||
// TODO Auto-generated method stub
|
||||
sh.play(true);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void update(float factor) {
|
||||
buttonInAnimation(animationcounter);
|
||||
if(startanimation){
|
||||
buttonInAnimation(animationcounter);
|
||||
if(animationcounter == 5){
|
||||
startanimation = false;
|
||||
}
|
||||
}else if(subscreen){
|
||||
nextScreen();
|
||||
}else{
|
||||
previousScreen();
|
||||
}
|
||||
for(MenuButton b:buttons){
|
||||
b.update();
|
||||
}
|
||||
frame++;
|
||||
if(selected != oldselected){
|
||||
for(int i = 0; i < buttons.size(); i++){
|
||||
buttons.get(i).setSong(selectedToSong(selected+(i-2)));
|
||||
}
|
||||
oldselected = selected;
|
||||
|
||||
buttons2.clear();
|
||||
int instanceNr = 0;
|
||||
for(int i = sh.getCurrentSong().getSongs().size(); i>0; i--){
|
||||
if(sh.getCurrentSong().getSongs().size() == 0)
|
||||
continue;
|
||||
SongInstance si = sh.getCurrentSong().getSongs().get(i-1);
|
||||
buttons2.add(new DifficultyButton(yPosDiffButton-instanceNr,si.getDifficulty(), GameModel.colors[i-1]));
|
||||
instanceNr += 100;
|
||||
}
|
||||
|
||||
}
|
||||
index++;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void draw(Graphics2D g2) {
|
||||
g2.drawImage(Images.getImage(ImageType.background), -640 -((frame * 4) % maxFrames), 0, 5120, 1024, null);
|
||||
for(MenuButton b:buttons){
|
||||
b.draw(g2);
|
||||
}
|
||||
|
||||
|
||||
g2.setColor(Color.BLACK);
|
||||
Font textFont2 = new Font("OCR A Extended", Font.BOLD, 50);
|
||||
g2.setFont(textFont2);
|
||||
|
||||
|
||||
if(!subscreen) {
|
||||
GradientPaint gp = new GradientPaint(0, 0, new Color(0,0,1, 0.6f),1280,1024 ,new Color(0,0,1, 0.2f));
|
||||
g2.setPaint(gp);
|
||||
g2.fillRect(0, 0, 1280, 1024);
|
||||
|
||||
|
||||
|
||||
triangle2 = new Polygon();
|
||||
triangle2.addPoint(0, 0);
|
||||
triangle2.addPoint(0, 1024/4+50);
|
||||
triangle2.addPoint(1280/2+50, 0);
|
||||
|
||||
|
||||
|
||||
triangle = new Polygon();
|
||||
triangle.addPoint(0, 0);
|
||||
triangle.addPoint(0, 1024/4);
|
||||
triangle.addPoint(1280/2, 0);
|
||||
|
||||
|
||||
for(MenuButton b:buttons){
|
||||
b.draw(g2);
|
||||
}
|
||||
|
||||
|
||||
GradientPaint gp2 = new GradientPaint(0, 0, new Color(1,1,0, 0.6f),1280,1024 ,new Color(0,0,1, 0.2f));
|
||||
g2.setPaint(gp2);
|
||||
g2.fillPolygon(triangle2);
|
||||
|
||||
g2.setColor(Color.ORANGE);
|
||||
g2.fillPolygon(triangle);
|
||||
|
||||
g2.setColor(Color.BLACK);
|
||||
g2.drawString("Main Menu", 30, 60);
|
||||
}
|
||||
|
||||
if(subscreen) {
|
||||
//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.setColor(Color.ORANGE);
|
||||
g2.fillRect(0, 0, 1280, 1024/8);
|
||||
g2.setColor(Color.BLACK);
|
||||
g2.drawString(selectedToSong(selected).getTitle(), 30, 60);
|
||||
|
||||
|
||||
g2.setColor(Color.WHITE);
|
||||
g2.drawString("Overall Highscore: " + "", 30, 200);
|
||||
g2.drawString("Daily Highscore: " + "", 30, 300);
|
||||
g2.drawString("Beats per Minute: " + selectedToSong(selected).getBPM(), 30, 400);
|
||||
|
||||
for(DifficultyButton b : buttons2){
|
||||
b.draw(g2);
|
||||
}
|
||||
|
||||
|
||||
int y = (index/5)*75;
|
||||
int x = (index%5)*75;
|
||||
index%=25;
|
||||
BufferedImage subImg = aanwijzers.getSubimage(x, y, 75, 75);
|
||||
g2.drawImage(subImg, 825,900 - difSelect*100,75,75,null);
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void buttonPressed(ButtonEvent e) {
|
||||
if(e.getButton().getButtonID() == 1){
|
||||
for(MenuButton b:buttons){
|
||||
if(b.isSelected()){
|
||||
gsm.setState(State.PLAY_STATE);
|
||||
}
|
||||
if(subscreen){ //Screen for Song details
|
||||
if(e.getButton().getButtonID() == 2){
|
||||
subscreen = false;
|
||||
}
|
||||
if(e.getButton().getButtonID() == 1){
|
||||
sh.close();
|
||||
gsm.setState(control.GameStateManager.State.PLAY_STATE);
|
||||
}
|
||||
}else{ //Screen for selecting song
|
||||
if(e.getButton().getButtonID() == 1){
|
||||
subscreen = true;
|
||||
}else if(e.getButton().getButtonID() == 2){
|
||||
subscreen = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
@Override
|
||||
@@ -72,26 +201,35 @@ public class MenuState extends GameState {
|
||||
}
|
||||
@Override
|
||||
public void onJoystickMoved(JoystickEvent e) {
|
||||
if(e.getJoystick().getPos() == Joystick.Position.DOWN){
|
||||
selected++;
|
||||
selected %= buttons.size();
|
||||
for(int i = 0; i < buttons.size(); i++){
|
||||
if(selected == i){
|
||||
buttons.get(i).setSelected(true);
|
||||
}else{
|
||||
buttons.get(i).setSelected(false);
|
||||
|
||||
if(subscreen){
|
||||
if(e.getJoystick().getPos() == Joystick.Position.DOWN){
|
||||
difSelect--;
|
||||
if(difSelect < 0){
|
||||
difSelect += buttons2.size();
|
||||
}
|
||||
}
|
||||
}else if(e.getJoystick().getPos() == Joystick.Position.UP){
|
||||
selected--;
|
||||
if(selected < 0) selected = buttons.size()-1;
|
||||
for(int i = 0; i < buttons.size(); i++){
|
||||
if(selected == i){
|
||||
buttons.get(i).setSelected(true);
|
||||
}else{
|
||||
buttons.get(i).setSelected(false);
|
||||
// System.out.println(difSelect);
|
||||
}else if(e.getJoystick().getPos() == Joystick.Position.UP){
|
||||
difSelect++;
|
||||
if(difSelect > buttons2.size()-1){
|
||||
difSelect = 0;
|
||||
}
|
||||
|
||||
// System.out.println(difSelect);
|
||||
}
|
||||
sh.set(sh.getCurrentSong().getSongs().get(difSelect));
|
||||
|
||||
|
||||
|
||||
|
||||
}else{ //Screen for selecting song
|
||||
if(e.getJoystick().getPos() == Joystick.Position.DOWN){
|
||||
selected++;
|
||||
}else if(e.getJoystick().getPos() == Joystick.Position.UP){
|
||||
selected--;
|
||||
}
|
||||
sh.set(songs.indexOf(selectedToSong(selected)));
|
||||
sh.play();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -107,4 +245,28 @@ public class MenuState extends GameState {
|
||||
}
|
||||
}
|
||||
|
||||
public void nextScreen(){
|
||||
if(buttons.get(0).getX() > -700){
|
||||
for(MenuButton b:buttons){
|
||||
b.setX(b.getX()-100);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void previousScreen(){
|
||||
if(buttons.get(0).getX() < 300){
|
||||
for(MenuButton b:buttons){
|
||||
b.setX(b.getX()+100);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public Song selectedToSong(int s){
|
||||
s %= songs.size();
|
||||
if(s < 0){
|
||||
return songs.get(songs.size()+s);
|
||||
}else{
|
||||
return songs.get(s);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
package model.gameState;
|
||||
|
||||
import java.awt.Graphics2D;
|
||||
|
||||
import model.SongHandler;
|
||||
import control.GameStateManager;
|
||||
import control.button.ButtonEvent;
|
||||
import control.joystick.JoystickEvent;
|
||||
|
||||
public class PickSongState extends GameState {
|
||||
|
||||
public PickSongState(GameStateManager gsm, SongHandler sh) {
|
||||
super(gsm, sh);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void init() {
|
||||
sh.set(0);
|
||||
sh.play(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void update(float factor) {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void draw(Graphics2D g2d) {
|
||||
g2d.drawImage(sh.getCurrentSong().getBackgroundImage(), null, 0, 0);
|
||||
g2d.drawImage(sh.getCurrentSong().getBannerImage(), null, 400, 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void buttonPressed(ButtonEvent e) {}
|
||||
|
||||
@Override
|
||||
public void buttonReleased(ButtonEvent e) {}
|
||||
|
||||
@Override
|
||||
public void onJoystickMoved(JoystickEvent e) {
|
||||
switch (e.getJoystick().getPos()) {
|
||||
case LEFT:
|
||||
sh.previous();
|
||||
sh.play(true);
|
||||
break;
|
||||
case RIGHT:
|
||||
sh.next();
|
||||
sh.play(true);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -51,6 +51,12 @@ public class PlayState extends GameState {
|
||||
|
||||
@Override
|
||||
public void init() {
|
||||
try {
|
||||
Thread.sleep(2000);
|
||||
} catch (InterruptedException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
sh.play();
|
||||
|
||||
for(int i=1; i<ButtonHandler.getButtons().size(); i++)
|
||||
|
||||
@@ -5,6 +5,7 @@ import image.Images.ImageType;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.awt.Font;
|
||||
import java.awt.GradientPaint;
|
||||
import java.awt.Graphics2D;
|
||||
import java.awt.image.BufferedImage;
|
||||
|
||||
@@ -22,8 +23,7 @@ public class TitleState extends GameState {
|
||||
|
||||
int index = 0;
|
||||
int varx = 0;
|
||||
int frame = 0;
|
||||
int maxFrames = 2560;
|
||||
int frame;
|
||||
|
||||
public TitleState(GameStateManager gsm, SongHandler sh){
|
||||
super(gsm, sh);
|
||||
@@ -43,30 +43,49 @@ public class TitleState extends GameState {
|
||||
@Override
|
||||
public void draw(Graphics2D g2) {
|
||||
|
||||
g2.setColor(Color.WHITE);
|
||||
|
||||
g2.setColor(new Color(1,1,1, 0.3f));
|
||||
g2.fillRect(0,0,1280,1024);
|
||||
|
||||
g2.setColor(new Color(0,1,0, 0.7f));
|
||||
g2.fillRect(0,0,100,1024);
|
||||
|
||||
g2.setColor(new Color(1,1,0, 0.7f));
|
||||
g2.fillRect(100,0,100,1024);
|
||||
|
||||
g2.setColor(new Color(1,0,0, 0.7f));
|
||||
g2.fillRect(200,0,100,1024);
|
||||
|
||||
g2.setColor(new Color(0,1,0, 0.7f));
|
||||
g2.fillRect(1180,0,100,1024);
|
||||
|
||||
g2.setColor(new Color(1,1,0, 0.7f));
|
||||
g2.fillRect(1080,0,100,1024);
|
||||
|
||||
g2.setColor(new Color(1,0,0, 0.7f));
|
||||
g2.fillRect(980,0,100,1024);
|
||||
|
||||
GradientPaint gp = new GradientPaint(300, 0, new Color(0,0,1, 0.6f),980,1024 ,new Color(0,0,1, 0.2f));
|
||||
g2.setPaint(gp);
|
||||
g2.fillRect(300, 0, 680, 1024);
|
||||
|
||||
g2.translate(640, 512);
|
||||
|
||||
BufferedImage subImg2 = background.getSubimage(0, 0, 5120, 1024);
|
||||
g2.drawImage(subImg2, -640 -((frame * 4) % maxFrames), -512, 5120, 1024, null);
|
||||
//
|
||||
// g2.setColor(Color.ORANGE);
|
||||
// g2.fillRect( -25*5 -1, - 18*5 -1, 49*5 + 1, 26*5 + 1);
|
||||
// g2.drawRect( -25*5 -3, - 18*5 -3, 49*5 + 4, 26*5 + 4);
|
||||
|
||||
|
||||
int image_x = ((frame / 6) % 6) * 49;
|
||||
BufferedImage subImg = pressStart.getSubimage(image_x, 0, 49, 26);
|
||||
g2.drawImage(subImg, - 25*5, - 18*5, 49*5, 26*5, null);
|
||||
|
||||
g2.drawImage(colorStrike, -27*8 , -300, 54*8, 18*8, null);
|
||||
|
||||
g2.drawImage(subImg, - 25*5, 200, 49*5, 26*5, null);
|
||||
|
||||
Font textFont = new Font("OCR A Extended", Font.BOLD, 15);
|
||||
g2.setFont(textFont);
|
||||
g2.setColor(Color.WHITE);
|
||||
g2.drawString("�2015 Team Hamtaro", - 18*5, 500);
|
||||
|
||||
g2.setColor(Color.RED);
|
||||
Font textFont2 = new Font("OCR A Extended", Font.BOLD, 130);
|
||||
g2.setFont(textFont2);
|
||||
g2.drawString("Color", -215, -300);
|
||||
g2.drawString("Strike", -250, -170);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -75,7 +94,7 @@ public class TitleState extends GameState {
|
||||
switch(e.getButton().getButtonID()){
|
||||
case 0:
|
||||
//gsm.next();
|
||||
gsm.setState(State.PLAY_STATE);
|
||||
gsm.setState(State.MENU_STATE);
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user