From ea7b81d34295065e24a7eb337a3300e2744bf400 Mon Sep 17 00:00:00 2001 From: Recrown Date: Thu, 20 Apr 2017 00:36:44 -0500 Subject: [PATCH] minor cleanup --- core/src/zero1hd/polyjet/screens/PreGameScreen.java | 3 +-- core/src/zero1hd/polyjet/ui/MusicSelectionPage.java | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/core/src/zero1hd/polyjet/screens/PreGameScreen.java b/core/src/zero1hd/polyjet/screens/PreGameScreen.java index 8c4bba0..936709d 100755 --- a/core/src/zero1hd/polyjet/screens/PreGameScreen.java +++ b/core/src/zero1hd/polyjet/screens/PreGameScreen.java @@ -34,7 +34,6 @@ public class PreGameScreen extends ScreenAdapter implements TransitionAdapter { Label lastStatement; MusicSelectionPage musicSelection; - public PreGameScreen(final Polyjet core) { this.core = core; analyzer = new AudioAnalyzer(); @@ -58,7 +57,7 @@ public class PreGameScreen extends ScreenAdapter implements TransitionAdapter { public void postTransition() { stage.clear(); //draw music selector - musicSelection = new MusicSelectionPage(core, core.defaultSkin); + musicSelection = new MusicSelectionPage(core); stage.addActor(musicSelection); statusText = new Label(null, core.defaultSkin); diff --git a/core/src/zero1hd/polyjet/ui/MusicSelectionPage.java b/core/src/zero1hd/polyjet/ui/MusicSelectionPage.java index 6740107..56733bc 100755 --- a/core/src/zero1hd/polyjet/ui/MusicSelectionPage.java +++ b/core/src/zero1hd/polyjet/ui/MusicSelectionPage.java @@ -2,17 +2,17 @@ package zero1hd.polyjet.ui; import com.badlogic.gdx.scenes.scene2d.actions.Actions; import com.badlogic.gdx.scenes.scene2d.ui.Image; -import com.badlogic.gdx.scenes.scene2d.ui.Skin; import zero1hd.polyjet.Polyjet; public class MusicSelectionPage extends Page { Image loading; + + public MusicSelectionPage(final Polyjet core) { + super("Select music", core.defaultSkin); - public MusicSelectionPage(Polyjet core, Skin skin) { - super("Select music", skin); - loading = new Image(skin, "loading"); + loading = new Image(core.defaultSkin, "loading"); loading.setPosition((getWidth()-loading.getWidth())/2, (getHeight()-loading.getHeight())/2); loading.setOrigin(loading.getWidth()/2, loading.getHeight()/2); loading.addAction(Actions.forever(Actions.rotateBy(-360f, 2f)));