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
29 lines
599 B
Java
29 lines
599 B
Java
package model;
|
|
|
|
import java.awt.Color;
|
|
|
|
import control.GameStateManager;
|
|
import control.button.ButtonHandler;
|
|
|
|
public class GameModel{
|
|
|
|
public static Color[] colors = {Color.GREEN,Color.YELLOW,Color.RED,Color.MAGENTA,Color.CYAN,Color.WHITE};
|
|
private GameStateManager gsm;
|
|
private SongHandler sh;
|
|
|
|
public GameModel(SongHandler sh, GameStateManager gsm)
|
|
{
|
|
this.gsm = gsm;
|
|
|
|
this.sh = sh;
|
|
|
|
for(int i = 1; i < ButtonHandler.getButtons().size(); i++){
|
|
ButtonHandler.getButtons().get(i).setColor(colors[i-1]);;
|
|
}
|
|
}
|
|
|
|
public void update(float factor){
|
|
gsm.update(factor);
|
|
}
|
|
}
|