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

Feature/menu

Browse Source 
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
2015-06-05 23:17:29 +02:00
parent ab5fd4007d e424faf0e6
commit 396769317c
74 changed files with 334 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/gameState/TitleState.java
+35 -16
View File
@@ -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;
}