From 16bbba0e68d5b3657c864f3a24a0e46d504defd6 Mon Sep 17 00:00:00 2001 From: Recrown Date: Thu, 20 Apr 2017 01:06:16 -0500 Subject: [PATCH] organized file structure, cleaned up --- .../src/zero1hd/polyjet/screens/MainMenu.java | 8 ++-- .../polyjet/screens/PreGameScreen.java | 46 +------------------ .../polyjet/ui/MusicSelectionPage.java | 21 --------- .../polyjet/ui/{ => pages}/CreditsPage.java | 2 +- .../polyjet/ui/{ => pages}/MainPage.java | 2 +- .../ui/{ => pages}/MoreOptionsPage.java | 2 +- .../polyjet/ui/pages/MusicSelectionPage.java | 38 +++++++++++++++ .../polyjet/ui/{ => pages}/OptionsPage.java | 2 +- .../zero1hd/polyjet/ui/{ => pages}/Page.java | 2 +- 9 files changed, 48 insertions(+), 75 deletions(-) delete mode 100755 core/src/zero1hd/polyjet/ui/MusicSelectionPage.java rename core/src/zero1hd/polyjet/ui/{ => pages}/CreditsPage.java (96%) rename core/src/zero1hd/polyjet/ui/{ => pages}/MainPage.java (96%) rename core/src/zero1hd/polyjet/ui/{ => pages}/MoreOptionsPage.java (98%) create mode 100755 core/src/zero1hd/polyjet/ui/pages/MusicSelectionPage.java rename core/src/zero1hd/polyjet/ui/{ => pages}/OptionsPage.java (96%) rename core/src/zero1hd/polyjet/ui/{ => pages}/Page.java (92%) diff --git a/core/src/zero1hd/polyjet/screens/MainMenu.java b/core/src/zero1hd/polyjet/screens/MainMenu.java index f84b0a1..956384c 100755 --- a/core/src/zero1hd/polyjet/screens/MainMenu.java +++ b/core/src/zero1hd/polyjet/screens/MainMenu.java @@ -13,10 +13,10 @@ import com.badlogic.gdx.utils.viewport.ScreenViewport; import zero1hd.polyjet.Polyjet; import zero1hd.polyjet.TransitionAdapter; -import zero1hd.polyjet.ui.CreditsPage; -import zero1hd.polyjet.ui.MainPage; -import zero1hd.polyjet.ui.MoreOptionsPage; -import zero1hd.polyjet.ui.OptionsPage; +import zero1hd.polyjet.ui.pages.CreditsPage; +import zero1hd.polyjet.ui.pages.MainPage; +import zero1hd.polyjet.ui.pages.MoreOptionsPage; +import zero1hd.polyjet.ui.pages.OptionsPage; diff --git a/core/src/zero1hd/polyjet/screens/PreGameScreen.java b/core/src/zero1hd/polyjet/screens/PreGameScreen.java index 936709d..b6a9a18 100755 --- a/core/src/zero1hd/polyjet/screens/PreGameScreen.java +++ b/core/src/zero1hd/polyjet/screens/PreGameScreen.java @@ -17,11 +17,10 @@ import zero1hd.polyjet.TransitionAdapter; import zero1hd.polyjet.audio.AudioAnalyzer; import zero1hd.polyjet.audio.WavAudioData; import zero1hd.polyjet.maps.RhythmMap; -import zero1hd.polyjet.ui.MusicSelectionPage; +import zero1hd.polyjet.ui.pages.MusicSelectionPage; public class PreGameScreen extends ScreenAdapter implements TransitionAdapter { - byte phase = 0; Polyjet core; Stage stage; Label statusText; @@ -85,49 +84,6 @@ public class PreGameScreen extends ScreenAdapter implements TransitionAdapter { stage.getViewport().apply(); stage.act(); stage.draw(); - switch (phase) { - case 1: - if (stage.getCamera().position.x != cameraTarget.x) { - stage.getCamera().position.lerp(cameraTarget, 0.25f); - } - if (analyzer.containsData()) { - phase++; - statusText.setText("Mapping beats"); - //TODO MAP GENERATION - } - break; - case 2: - //finish map generation - if (true) { - statusText.setText("Loading assets"); - statusText.setPosition(1.5f*Gdx.graphics.getWidth(), (Gdx.graphics.getHeight()-statusText.getHeight())/2); - - //list of assets needed for game screen exclusively - Gdx.app.debug("PreGameScreen Phase", String.valueOf(phase)); - phase++; - } - break; - case 3: - //Resource loading... - if (core.assetManager.update()) { - Gdx.app.debug("PreGameScreen Phase", String.valueOf(phase)); - phase++; - Gdx.app.debug("PreGameScreen Phase", String.valueOf(phase)); - cameraTarget.x = 2.5f*Gdx.graphics.getWidth(); - } - break; - case 4: - if (stage.getCamera().position.x != cameraTarget.x) { - stage.getCamera().position.lerp(cameraTarget, 0.25f); - } - - if (lastStatement == null) { - lastStatement = new Label("Are you ready?", core.defaultSkin); - lastStatement.setPosition(2.5f*Gdx.graphics.getWidth()-lastStatement.getWidth()/2, (Gdx.graphics.getHeight()-lastStatement.getHeight())/2); - stage.addActor(lastStatement); - } - break; - } super.render(delta); } diff --git a/core/src/zero1hd/polyjet/ui/MusicSelectionPage.java b/core/src/zero1hd/polyjet/ui/MusicSelectionPage.java deleted file mode 100755 index 56733bc..0000000 --- a/core/src/zero1hd/polyjet/ui/MusicSelectionPage.java +++ /dev/null @@ -1,21 +0,0 @@ -package zero1hd.polyjet.ui; - -import com.badlogic.gdx.scenes.scene2d.actions.Actions; -import com.badlogic.gdx.scenes.scene2d.ui.Image; - -import zero1hd.polyjet.Polyjet; - -public class MusicSelectionPage extends Page { - Image loading; - - public MusicSelectionPage(final Polyjet core) { - super("Select music", core.defaultSkin); - - - 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))); - addActor(loading); - } -} diff --git a/core/src/zero1hd/polyjet/ui/CreditsPage.java b/core/src/zero1hd/polyjet/ui/pages/CreditsPage.java similarity index 96% rename from core/src/zero1hd/polyjet/ui/CreditsPage.java rename to core/src/zero1hd/polyjet/ui/pages/CreditsPage.java index 7c2a0d4..c5d816a 100755 --- a/core/src/zero1hd/polyjet/ui/CreditsPage.java +++ b/core/src/zero1hd/polyjet/ui/pages/CreditsPage.java @@ -1,4 +1,4 @@ -package zero1hd.polyjet.ui; +package zero1hd.polyjet.ui.pages; import com.badlogic.gdx.scenes.scene2d.ui.Label; import com.badlogic.gdx.scenes.scene2d.ui.Skin; diff --git a/core/src/zero1hd/polyjet/ui/MainPage.java b/core/src/zero1hd/polyjet/ui/pages/MainPage.java similarity index 96% rename from core/src/zero1hd/polyjet/ui/MainPage.java rename to core/src/zero1hd/polyjet/ui/pages/MainPage.java index bfefa43..6ed5cf1 100755 --- a/core/src/zero1hd/polyjet/ui/MainPage.java +++ b/core/src/zero1hd/polyjet/ui/pages/MainPage.java @@ -1,4 +1,4 @@ -package zero1hd.polyjet.ui; +package zero1hd.polyjet.ui.pages; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Texture; diff --git a/core/src/zero1hd/polyjet/ui/MoreOptionsPage.java b/core/src/zero1hd/polyjet/ui/pages/MoreOptionsPage.java similarity index 98% rename from core/src/zero1hd/polyjet/ui/MoreOptionsPage.java rename to core/src/zero1hd/polyjet/ui/pages/MoreOptionsPage.java index 5077b6a..76b9c1f 100755 --- a/core/src/zero1hd/polyjet/ui/MoreOptionsPage.java +++ b/core/src/zero1hd/polyjet/ui/pages/MoreOptionsPage.java @@ -1,4 +1,4 @@ -package zero1hd.polyjet.ui; +package zero1hd.polyjet.ui.pages; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.math.Vector3; diff --git a/core/src/zero1hd/polyjet/ui/pages/MusicSelectionPage.java b/core/src/zero1hd/polyjet/ui/pages/MusicSelectionPage.java new file mode 100755 index 0000000..c30775b --- /dev/null +++ b/core/src/zero1hd/polyjet/ui/pages/MusicSelectionPage.java @@ -0,0 +1,38 @@ +package zero1hd.polyjet.ui.pages; + +import com.badlogic.gdx.scenes.scene2d.Actor; +import com.badlogic.gdx.scenes.scene2d.Touchable; +import com.badlogic.gdx.scenes.scene2d.actions.Actions; +import com.badlogic.gdx.scenes.scene2d.ui.Button; +import com.badlogic.gdx.scenes.scene2d.ui.Image; +import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; + +import zero1hd.polyjet.Polyjet; +import zero1hd.polyjet.screens.MainMenu; + +public class MusicSelectionPage extends Page { + Image loading; + Button back; + + public MusicSelectionPage(final Polyjet core) { + super("Select music", core.defaultSkin); + + back = new Button(core.defaultSkin, "arrow-button"); + back.setPosition(15f, (getHeight()-back.getHeight())/2 -15); + back.addListener(new ChangeListener() { + + @Override + public void changed(ChangeEvent event, Actor actor) { + core.setScreen(new MainMenu(core)); + + } + }); + addActor(back); + + 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))); + addActor(loading); + } +} diff --git a/core/src/zero1hd/polyjet/ui/OptionsPage.java b/core/src/zero1hd/polyjet/ui/pages/OptionsPage.java similarity index 96% rename from core/src/zero1hd/polyjet/ui/OptionsPage.java rename to core/src/zero1hd/polyjet/ui/pages/OptionsPage.java index fd9364c..9c8c002 100755 --- a/core/src/zero1hd/polyjet/ui/OptionsPage.java +++ b/core/src/zero1hd/polyjet/ui/pages/OptionsPage.java @@ -1,4 +1,4 @@ -package zero1hd.polyjet.ui; +package zero1hd.polyjet.ui.pages; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input.Keys; diff --git a/core/src/zero1hd/polyjet/ui/Page.java b/core/src/zero1hd/polyjet/ui/pages/Page.java similarity index 92% rename from core/src/zero1hd/polyjet/ui/Page.java rename to core/src/zero1hd/polyjet/ui/pages/Page.java index fce6df9..d191bee 100755 --- a/core/src/zero1hd/polyjet/ui/Page.java +++ b/core/src/zero1hd/polyjet/ui/pages/Page.java @@ -1,4 +1,4 @@ -package zero1hd.polyjet.ui; +package zero1hd.polyjet.ui.pages; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.scenes.scene2d.Group;