made ui changes, cont. work on music selection

This commit is contained in:
2017-04-20 20:07:39 -05:00
parent 16bbba0e68
commit ba05dbf0c1
9 changed files with 65 additions and 84 deletions

View File

@@ -33,20 +33,16 @@ public class PreGameScreen extends ScreenAdapter implements TransitionAdapter {
Label lastStatement;
MusicSelectionPage musicSelection;
private MainMenu mainMenu;
public PreGameScreen(final Polyjet core) {
this.core = core;
analyzer = new AudioAnalyzer();
rhythmMap = new RhythmMap(analyzer);
stage = new Stage();
mainMenu = (MainMenu) core.getScreen();
stage.addListener(new ClickListener() {
@Override
public void clicked(InputEvent event, float x, float y) {
core.setScreen(new GameScreen(core));
super.clicked(event, x, y);
}
});
stage = new Stage();
cameraTarget = new Vector3(stage.getCamera().position);
postTransition();
@@ -56,7 +52,7 @@ public class PreGameScreen extends ScreenAdapter implements TransitionAdapter {
public void postTransition() {
stage.clear();
//draw music selector
musicSelection = new MusicSelectionPage(core);
musicSelection = new MusicSelectionPage(core, mainMenu);
stage.addActor(musicSelection);
statusText = new Label(null, core.defaultSkin);