fixed and cleaned code up

This commit is contained in:
2017-05-28 17:30:35 -05:00
parent b4a6bbbea3
commit a52e5fc0ed
12 changed files with 53 additions and 38 deletions

View File

@@ -24,9 +24,7 @@ public class PreGameScreen extends ScreenAdapter implements TransitionAdapter, M
MusicSelectionPage ms;
AnalyzePage ap;
private Vector3 cameraPos;
private Polyjet core;
public PreGameScreen(Polyjet core) {
@@ -61,7 +59,7 @@ public class PreGameScreen extends ScreenAdapter implements TransitionAdapter, M
switch (ID) {
case MUSIC_SELECTED:
cameraPos.x = 1.5f*Gdx.graphics.getWidth();
ap.setSong(Audio.getAudioData(ms.getSelectedMusic()), ms.getSelectedMusicInfo());
ap.setSong(Audio.getAudioData(ms.getSelectedMusic()), ms.getSelectedMusicInfo(), this);
break;
case SPECTRAL_FLUX_DONE:
break;
@@ -91,7 +89,6 @@ public class PreGameScreen extends ScreenAdapter implements TransitionAdapter, M
stage.addActor(ms);
ap = new AnalyzePage(core.getDefaultSkin(), core.getAssetManager());
ap.getAudioAnalyzer().sender.addListener(this);
ap.miniSender.addListener(this);
ap.setPosition(Gdx.graphics.getWidth(), ap.getY());
stage.addActor(ap);