improved audio data structure, started work on analysis page
This commit is contained in:
12
core/src/zero1hd/polyjet/screens/AnalyzePage.java
Executable file
12
core/src/zero1hd/polyjet/screens/AnalyzePage.java
Executable file
@@ -0,0 +1,12 @@
|
||||
package zero1hd.polyjet.screens;
|
||||
|
||||
import com.badlogic.gdx.scenes.scene2d.ui.Skin;
|
||||
|
||||
import zero1hd.polyjet.ui.pages.Page;
|
||||
|
||||
public class AnalyzePage extends Page {
|
||||
public AnalyzePage(Skin skin) {
|
||||
super("Results", skin);
|
||||
}
|
||||
|
||||
}
|
@@ -31,6 +31,7 @@ public class PreGameScreen extends ScreenAdapter implements TransitionAdapter {
|
||||
Label lastStatement;
|
||||
|
||||
private MainMenu mainMenu;
|
||||
private MusicSelectionPage musicSelection;
|
||||
|
||||
public PreGameScreen(final Polyjet core, MainMenu mainMenu) {
|
||||
this.core = core;
|
||||
@@ -58,7 +59,7 @@ public class PreGameScreen extends ScreenAdapter implements TransitionAdapter {
|
||||
stage.addActor(cyberCircle1);
|
||||
|
||||
//draw music selector
|
||||
MusicSelectionPage musicSelection = new MusicSelectionPage(core, mainMenu);
|
||||
musicSelection = new MusicSelectionPage(core, mainMenu);
|
||||
stage.addActor(musicSelection);
|
||||
musicSelection.beginMusicSearch();
|
||||
|
||||
@@ -77,6 +78,13 @@ public class PreGameScreen extends ScreenAdapter implements TransitionAdapter {
|
||||
stage.act();
|
||||
stage.draw();
|
||||
|
||||
if (stage.getCamera().position.x != cameraTarget.x) {
|
||||
stage.getCamera().position.lerp(cameraTarget, 0.25f);
|
||||
}
|
||||
|
||||
if (cameraTarget.x != 1.5f*Gdx.graphics.getWidth() && musicSelection.getAudio() != null) {
|
||||
cameraTarget.x = 1.5f*Gdx.graphics.getWidth();
|
||||
}
|
||||
super.render(delta);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user