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

moved options to left of main page

Browse Source
This commit is contained in:
Harrison Deng 2017-10-17 13:31:27 -05:00
parent ca8e4c16d7
commit 2294b0f9f8
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/zero1hd/rhythmbullet/graphics/ui/pages/MainPage.java
View File

@ -55,7 +55,7 @@ public class MainPage extends Page implements OnDifferentSongListener {
playButton.addListener(new ChangeListener() { playButton.addListener(new ChangeListener() {
@Override @Override
public void changed(ChangeEvent event, Actor actor) { public void changed(ChangeEvent event, Actor actor) {
//TODO move to play screen targetPosition.x = Gdx.graphics.getWidth()*1.5f;
} }
}); });
table.add(playButton).width(Gdx.graphics.getWidth()*0.2f); table.add(playButton).width(Gdx.graphics.getWidth()*0.2f);
@ -66,7 +66,7 @@ public class MainPage extends Page implements OnDifferentSongListener {
optionsButton.addListener(new ChangeListener() { optionsButton.addListener(new ChangeListener() {
@Override @Override
public void changed(ChangeEvent event, Actor actor) { public void changed(ChangeEvent event, Actor actor) {
targetPosition.x = Gdx.graphics.getWidth()*1.5f; targetPosition.x = Gdx.graphics.getWidth()*-0.5f;
} }
}); });
table.add(optionsButton).fillX(); table.add(optionsButton).fillX();

12
core/src/zero1hd/rhythmbullet/screens/MainMenu.java
View File

@ -24,6 +24,7 @@ import zero1hd.rhythmbullet.audio.SongListController;
import zero1hd.rhythmbullet.graphics.ui.pages.CreditsPage; import zero1hd.rhythmbullet.graphics.ui.pages.CreditsPage;
import zero1hd.rhythmbullet.graphics.ui.pages.KeybindOptionsPage; import zero1hd.rhythmbullet.graphics.ui.pages.KeybindOptionsPage;
import zero1hd.rhythmbullet.graphics.ui.pages.MainPage; import zero1hd.rhythmbullet.graphics.ui.pages.MainPage;
import zero1hd.rhythmbullet.graphics.ui.pages.MusicSelectionPage;
import zero1hd.rhythmbullet.graphics.ui.pages.OptionsPage; import zero1hd.rhythmbullet.graphics.ui.pages.OptionsPage;
import zero1hd.rhythmbullet.graphics.ui.pages.VideoOptionsPage; import zero1hd.rhythmbullet.graphics.ui.pages.VideoOptionsPage;
import zero1hd.rhythmbullet.util.TransitionAdapter; import zero1hd.rhythmbullet.util.TransitionAdapter;
@ -37,6 +38,8 @@ public class MainMenu extends ScreenAdapter implements TransitionAdapter {
private CreditsPage creditsPage; private CreditsPage creditsPage;
private KeybindOptionsPage keybindPage; private KeybindOptionsPage keybindPage;
private VideoOptionsPage graphicsPage; private VideoOptionsPage graphicsPage;
private MusicSelectionPage musicSelectionPage;
private RhythmBullet core; private RhythmBullet core;
private SongListController sc; private SongListController sc;
@ -81,22 +84,25 @@ public class MainMenu extends ScreenAdapter implements TransitionAdapter {
//End main menu //End main menu
keybindPage = new KeybindOptionsPage(core.getDefaultSkin(), core.getAssetManager(), cameraPosition); keybindPage = new KeybindOptionsPage(core.getDefaultSkin(), core.getAssetManager(), cameraPosition);
keybindPage.setPosition(1f*Gdx.graphics.getWidth(), -1f*Gdx.graphics.getHeight()); keybindPage.setPosition(-1f*Gdx.graphics.getWidth(), -1f*Gdx.graphics.getHeight());
stage.addActor(keybindPage); stage.addActor(keybindPage);
graphicsPage = new VideoOptionsPage(core.getDefaultSkin(), core.getPrefs(), this, core.getAssetManager()); graphicsPage = new VideoOptionsPage(core.getDefaultSkin(), core.getPrefs(), this, core.getAssetManager());
graphicsPage.setPosition(1f*Gdx.graphics.getWidth(), 1f*Gdx.graphics.getHeight()); graphicsPage.setPosition(-1f*Gdx.graphics.getWidth(), 1f*Gdx.graphics.getHeight());
stage.addActor(graphicsPage); stage.addActor(graphicsPage);
optionsPage = new OptionsPage(core, cameraPosition, keybindPage, sc); optionsPage = new OptionsPage(core, cameraPosition, keybindPage, sc);
optionsPage.setPosition(Gdx.graphics.getWidth(), 0); optionsPage.setPosition(-Gdx.graphics.getWidth(), 0);
stage.addActor(optionsPage); stage.addActor(optionsPage);
creditsPage = new CreditsPage(core.getDefaultSkin()); creditsPage = new CreditsPage(core.getDefaultSkin());
creditsPage.setPosition(0, Gdx.graphics.getHeight()); creditsPage.setPosition(0, Gdx.graphics.getHeight());
stage.addActor(creditsPage); stage.addActor(creditsPage);
musicSelectionPage = new MusicSelectionPage(core.getDefaultSkin(), sc.getSongList(), core.getAssetManager());
musicSelectionPage.setPosition(1.5f*Gdx.graphics.getWidth(), 0f);
stage.addActor(musicSelectionPage);
stage.addListener(new InputListener() { stage.addListener(new InputListener() {
@Override @Override