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

shader now functions with background; fixed shader option not updating live

Browse Source
This commit is contained in:
Harrison Deng 2018-01-29 20:26:45 -06:00
parent 1b7f3233e8
commit c339c61697
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/GraphicsOptions.java
View File

@ -43,8 +43,10 @@ public class GraphicsOptions extends Table {
public void changed(ChangeEvent event, Actor actor) { public void changed(ChangeEvent event, Actor actor) {
save(); save();
if (glowShader.isChecked()) { if (glowShader.isChecked()) {
mainMenu.setBlurlvl(1);
enhancedGlow.setDisabled(false); enhancedGlow.setDisabled(false);
} else { } else {
mainMenu.setBlurlvl(0);
enhancedGlow.setChecked(false); enhancedGlow.setChecked(false);
enhancedGlow.setDisabled(true); enhancedGlow.setDisabled(true);
} }

7
desktop/src/zero1hd/rhythmbullet/desktop/screens/MainMenu.java
View File

@ -162,6 +162,9 @@ public class MainMenu extends ScreenAdapter implements AdvancedResizeScreen {
stage.getViewport().apply(); stage.getViewport().apply();
Gdx.gl.glClearColor(0.2f, 0.2f, 0.2f, 1f); Gdx.gl.glClearColor(0.2f, 0.2f, 0.2f, 1f);
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
screenBatch.begin();
screenBatch.draw(background, 0, 0);
screenBatch.end();
draw(); draw();
normalBuffer.end(); normalBuffer.end();
@ -295,7 +298,9 @@ public class MainMenu extends ScreenAdapter implements AdvancedResizeScreen {
} }
public void unloadShaders() { public void unloadShaders() {
Gdx.app.debug("MainMenu", "shader being unloaded.");
if (core.getPrefs().getBoolean("glow shader")) { if (core.getPrefs().getBoolean("glow shader")) {
if (shaderLoaded) {
brightFilterShader.dispose(); brightFilterShader.dispose();
combineShader.dispose(); combineShader.dispose();
gaussianBlurShader.dispose(); gaussianBlurShader.dispose();
@ -304,6 +309,7 @@ public class MainMenu extends ScreenAdapter implements AdvancedResizeScreen {
vBlur.dispose(); vBlur.dispose();
hBlur.dispose(); hBlur.dispose();
} }
}
brightFilterShader = null; brightFilterShader = null;
combineShader = null; combineShader = null;
@ -350,6 +356,7 @@ public class MainMenu extends ScreenAdapter implements AdvancedResizeScreen {
} }
public void attemptLoadShaders() { public void attemptLoadShaders() {
Gdx.app.debug("MainMenu", "Attempting to load shaders.");
if (core.getPrefs().getBoolean("glow shader", true) && !shaderLoaded) { if (core.getPrefs().getBoolean("glow shader", true) && !shaderLoaded) {
if (core.getPrefs().getBoolean("enhanced glow", false)) { if (core.getPrefs().getBoolean("enhanced glow", false)) {
blurlvl = 5; blurlvl = 5;