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

Bugfix/everything

Browse Source 
# Conflicts:
#	model/SongHandler.java
#	model/gameState/PlayState.java
This commit is contained in:
jancoow
2015-06-08 14:01:07 +02:00
parent 3f7cd5a964 861a973cde
commit ed1f44299e
14 changed files with 249 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/gameState/MenuState.java
+38 -8
View File
@@ -3,6 +3,7 @@ package model.gameState;
import image.Images;
import image.Images.ImageType;
import java.awt.AlphaComposite;
import java.awt.Color;
import java.awt.Font;
import java.awt.GradientPaint;
@@ -21,8 +22,11 @@ import model.objects.DifficultyButton;
import model.objects.MenuButton;
import audio.Song;
import audio.SongInstance;
import audio.sorting.SortALPHA;
import audio.sorting.SortPLAYED;
import control.GameStateManager;
import control.button.ButtonEvent;
import control.button.ButtonHandler;
import control.joystick.Joystick;
import control.joystick.JoystickEvent;
@@ -34,7 +38,7 @@ public class MenuState extends GameState {
private int animationcounter;
private boolean subscreen, startanimation;
private VolatileImage mainScreenBackground, subScreenBackground;
private VolatileImage mainScreenBackground, subScreenBackground, subScreenForeground;
int yPosDiffButton = 900;
private int difSelect=0;
@@ -59,11 +63,16 @@ public class MenuState extends GameState {
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);
generateMainScreenBackground();
generateMainScreenBackground();
generateSubScreenBackground();
}
@Override
public void init() {
ButtonHandler.getButton(1).setColor(GameModel.colors[0]);
ButtonHandler.getButton(2).setColor(GameModel.colors[2]);
ButtonHandler.getButton(5).setColor(GameModel.colors[1]);
ButtonHandler.getButton(6).setColor(GameModel.colors[4]);
}
@Override
@@ -96,7 +105,6 @@ public class MenuState extends GameState {
buttons2.add(new DifficultyButton(yPosDiffButton-instanceNr,si.getDifficulty(), GameModel.colors[i-1]));
instanceNr += 100;
}
}
index++;
}
@@ -111,6 +119,7 @@ public class MenuState extends GameState {
}
if(subscreen) {
g2.drawImage(subScreenBackground,0,0,1280,1024,null);
g2.drawImage(subScreenForeground,0,0,1280,1024,null);
index%=25;
int y = (index/5)*75;
int x = (index%5)*75;
@@ -131,9 +140,17 @@ public class MenuState extends GameState {
}else{ //Screen for selecting song
if(e.getButton().getButtonID() == 1){
subscreen = true;
generateSubScreenBackground();
generateSubScreenForeground();
}else if(e.getButton().getButtonID() == 2){
subscreen = false;
}else if(e.getButton().getButtonID() == 5){
sh.sort(new SortALPHA());
oldselected = 1;
selected = 0;
}else if(e.getButton().getButtonID() == 6){
sh.sort(new SortPLAYED());
oldselected = 1;
selected = 0;
}
}
}
@@ -157,7 +174,7 @@ public class MenuState extends GameState {
}
}
sh.set(sh.getCurrentSong().getSongs().get(difSelect));
generateSubScreenBackground();
generateSubScreenForeground();
}else{ //Screen for selecting song
if(e.getJoystick().getPos() == Joystick.Position.DOWN){
selected++;
@@ -195,13 +212,26 @@ public class MenuState extends GameState {
Graphics2D g2 = subScreenBackground.createGraphics();
RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
g2.setRenderingHints(rh);
g2.setFont(textFont2);
g2.setColor(Color.BLACK);
g2.drawImage(subMenu, 0, 0, 1280, 1024, null);
g2.setColor(Color.ORANGE);
g2.fillRect(0, 0, 1280, 1024/8);
g2.setColor(Color.BLACK);
g2.dispose();
subScreenBackground.createGraphics();
}
public void generateSubScreenForeground(){
subScreenForeground = Images.initVolatileImage(1280, 1024, Transparency.TRANSLUCENT);
Graphics2D g2 = subScreenForeground.createGraphics();
RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
g2.setComposite(AlphaComposite.DstOut);
g2.fillRect(0, 0, subScreenForeground.getWidth(), subScreenForeground.getHeight());
g2.setComposite(AlphaComposite.SrcOver);
g2.setRenderingHints(rh);
g2.setColor(Color.BLACK);
g2.setFont(textFont2);
g2.drawString(selectedToSong(selected).getTitle(), 30, 60);
@@ -213,8 +243,8 @@ public class MenuState extends GameState {
for(DifficultyButton b : buttons2){
b.draw(g2);
}
g2.dispose();
subScreenBackground.createGraphics();
g2.dispose();
subScreenForeground.createGraphics();
}
public void buttonInAnimation(int button){