ydeng/rhythmbullet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor cleanup

Browse Source
This commit is contained in:
Harrison Deng 2017-04-20 00:36:44 -05:00
parent a7cf85a581
commit ea7b81d342
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/zero1hd/polyjet/screens/PreGameScreen.java
View File

@ -34,7 +34,6 @@ public class PreGameScreen extends ScreenAdapter implements TransitionAdapter {
Label lastStatement; Label lastStatement;
MusicSelectionPage musicSelection; MusicSelectionPage musicSelection;
public PreGameScreen(final Polyjet core) { public PreGameScreen(final Polyjet core) {
this.core = core; this.core = core;
analyzer = new AudioAnalyzer(); analyzer = new AudioAnalyzer();
@ -58,7 +57,7 @@ public class PreGameScreen extends ScreenAdapter implements TransitionAdapter {
public void postTransition() { public void postTransition() {
stage.clear(); stage.clear();
//draw music selector //draw music selector
musicSelection = new MusicSelectionPage(core, core.defaultSkin); musicSelection = new MusicSelectionPage(core);
stage.addActor(musicSelection); stage.addActor(musicSelection);
statusText = new Label(null, core.defaultSkin); statusText = new Label(null, core.defaultSkin);

8
core/src/zero1hd/polyjet/ui/MusicSelectionPage.java
View File

@ -2,17 +2,17 @@ package zero1hd.polyjet.ui;
import com.badlogic.gdx.scenes.scene2d.actions.Actions; import com.badlogic.gdx.scenes.scene2d.actions.Actions;
import com.badlogic.gdx.scenes.scene2d.ui.Image; import com.badlogic.gdx.scenes.scene2d.ui.Image;
import com.badlogic.gdx.scenes.scene2d.ui.Skin;
import zero1hd.polyjet.Polyjet; import zero1hd.polyjet.Polyjet;
public class MusicSelectionPage extends Page { public class MusicSelectionPage extends Page {
Image loading; Image loading;
public MusicSelectionPage(Polyjet core, Skin skin) { public MusicSelectionPage(final Polyjet core) {
super("Select music", skin); super("Select music", core.defaultSkin);
loading = new Image(skin, "loading");
loading = new Image(core.defaultSkin, "loading");
loading.setPosition((getWidth()-loading.getWidth())/2, (getHeight()-loading.getHeight())/2); loading.setPosition((getWidth()-loading.getWidth())/2, (getHeight()-loading.getHeight())/2);
loading.setOrigin(loading.getWidth()/2, loading.getHeight()/2); loading.setOrigin(loading.getWidth()/2, loading.getHeight()/2);
loading.addAction(Actions.forever(Actions.rotateBy(-360f, 2f))); loading.addAction(Actions.forever(Actions.rotateBy(-360f, 2f)));