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

bloom shader now works; back buttons on graphics and keybinds page now

Browse Source 
go back to options page;
This commit is contained in:
Harrison Deng 2018-08-05 22:30:06 -05:00
parent e824fe8b8b
commit 83d09ab2b9
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
desktop/src/zero1hd/rhythmbullet/desktop/screens/main/MainScreen.java
View File

@ -80,9 +80,6 @@ public class MainScreen extends ScreenAdapter implements ResizeReadyScreen {
draw(); draw();
} }
draw();
if (stage.getCamera().position.x != cameraPosition.x || stage.getCamera().position.y != cameraPosition.y) { if (stage.getCamera().position.x != cameraPosition.x || stage.getCamera().position.y != cameraPosition.y) {
stage.getCamera().position.lerp(cameraPosition, delta*lerpAlpha); stage.getCamera().position.lerp(cameraPosition, delta*lerpAlpha);
stage.getViewport().apply(); stage.getViewport().apply();
@ -129,10 +126,10 @@ public class MainScreen extends ScreenAdapter implements ResizeReadyScreen {
optionsPage = new OptionsPage(musicController, rhythmBullet.getSkin(), rhythmBullet.getPreferences(), listeners.returnToMainPageListener, listeners.graphicsPageButtonListener, listeners.keybindPageButtonListener); optionsPage = new OptionsPage(musicController, rhythmBullet.getSkin(), rhythmBullet.getPreferences(), listeners.returnToMainPageListener, listeners.graphicsPageButtonListener, listeners.keybindPageButtonListener);
stage.addActor(optionsPage); stage.addActor(optionsPage);
keybindPage = new KeybindPage(rhythmBullet.getAssetManager(), rhythmBullet.getSkin(), listeners.returnToMainPageListener); keybindPage = new KeybindPage(rhythmBullet.getAssetManager(), rhythmBullet.getSkin(), listeners.optionsPageButtonListener);
stage.addActor(keybindPage); stage.addActor(keybindPage);
graphicsPage = new GraphicsPage(rhythmBullet.getSkin(), rhythmBullet.getPreferences(), listeners.returnToMainPageListener, listeners.bloomLevelShaderListener); graphicsPage = new GraphicsPage(rhythmBullet.getSkin(), rhythmBullet.getPreferences(), listeners.optionsPageButtonListener, listeners.bloomLevelShaderListener);
stage.addActor(graphicsPage); stage.addActor(graphicsPage);
creditsPage = new CreditsPage(rhythmBullet.getSkin()); creditsPage = new CreditsPage(rhythmBullet.getSkin());