From 3845b7495b948b3189618f1f6ace507b5c2c2cef Mon Sep 17 00:00:00 2001 From: Recrown Date: Mon, 9 Oct 2017 20:25:54 -0500 Subject: [PATCH] color adjustements --- android/assets/particles/beateffect.p | 32 ++++-- .../graphics/ui/pages/MainPage.java | 2 +- .../rhythmbullet/screens/MainMenu.java | 101 +++++++++--------- 3 files changed, 73 insertions(+), 62 deletions(-) diff --git a/android/assets/particles/beateffect.p b/android/assets/particles/beateffect.p index 2e18632..fe137d2 100755 --- a/android/assets/particles/beateffect.p +++ b/android/assets/particles/beateffect.p @@ -124,12 +124,24 @@ timeline0: 0.0 - Gravity - active: false - Tint - -colorsCount: 3 -colors0: 0.75686276 -colors1: 0.4117647 +colorsCount: 12 +colors0: 0.6431373 +colors1: 0.0 colors2: 0.0 -timelineCount: 1 +colors3: 0.0 +colors4: 0.12941177 +colors5: 1.0 +colors6: 0.8784314 +colors7: 0.0 +colors8: 1.0 +colors9: 1.0 +colors10: 0.9254902 +colors11: 0.0 +timelineCount: 4 timeline0: 0.0 +timeline1: 0.5094081 +timeline2: 0.7872049 +timeline3: 1.0 - Transparency - lowMin: 0.0 lowMax: 0.0 @@ -138,15 +150,15 @@ highMax: 1.0 relative: false scalingCount: 5 scaling0: 0.2982456 -scaling1: 0.40350878 -scaling2: 0.49122807 -scaling3: 0.33333334 +scaling1: 0.64912283 +scaling2: 0.71929824 +scaling3: 0.36842105 scaling4: 0.0 timelineCount: 5 timeline0: 0.0 -timeline1: 0.46575344 -timeline2: 0.7123288 -timeline3: 0.8561644 +timeline1: 0.28082192 +timeline2: 0.7328767 +timeline3: 0.93835616 timeline4: 1.0 - Options - attached: false diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MainPage.java b/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MainPage.java index 5165174..8ce1d9e 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MainPage.java +++ b/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MainPage.java @@ -65,7 +65,7 @@ public class MainPage extends Page implements OnDifferentSongListener { optionsButton.addListener(new ChangeListener() { @Override public void changed(ChangeEvent event, Actor actor) { - //TODO move to options + targetPosition.x = Gdx.graphics.getWidth()*1.5f; } }); table.add(optionsButton).fillX(); diff --git a/core/src/zero1hd/rhythmbullet/screens/MainMenu.java b/core/src/zero1hd/rhythmbullet/screens/MainMenu.java index 4da4214..e793ff1 100755 --- a/core/src/zero1hd/rhythmbullet/screens/MainMenu.java +++ b/core/src/zero1hd/rhythmbullet/screens/MainMenu.java @@ -68,6 +68,54 @@ public class MainMenu extends ScreenAdapter implements TransitionAdapter { postTransition(); } + @Override + public void postTransition() { + mainPage = new MainPage(core, targetPosition, sc); + mainPage.setPosition(0, 0); + stage.addActor(mainPage); + //End main menu + + moreOptionsPage = new MoreOptionsPage(core, targetPosition); + + optionsPage = new OptionsPage(core, targetPosition, moreOptionsPage, sc); + optionsPage.setPosition(Gdx.graphics.getWidth(), 0); + stage.addActor(optionsPage); + + creditsPage = new CreditsPage(core.getDefaultSkin()); + creditsPage.setPosition(0, Gdx.graphics.getHeight()); + stage.addActor(creditsPage); + + moreOptionsPage.setPosition(1f*Gdx.graphics.getWidth(), -1f*Gdx.graphics.getHeight()); + stage.addActor(moreOptionsPage); + + stage.addListener(new InputListener() { + @Override + public boolean keyUp(InputEvent event, int keycode) { + if (keycode == Keys.ESCAPE) { + stage.unfocusAll(); + if (targetPosition.x != 0.5f*Gdx.graphics.getWidth() || targetPosition.y != 0.5f*Gdx.graphics.getHeight()) { + targetPosition.x = 0.5f*Gdx.graphics.getWidth(); + targetPosition.y = 0.5f*Gdx.graphics.getHeight(); + } + moreOptionsPage.controlUnselect(); + } + return super.keyUp(event, keycode); + } + }); + + stage.addListener(new ClickListener() { + @Override + public void clicked(InputEvent event, float x, float y) { + if (stage.hit(x, y, true) == null) { + stage.unfocusAll(); + moreOptionsPage.controlUnselect(); + } + super.clicked(event, x, y); + } + }); + + Gdx.app.debug("Post Transition", "Beginning screen setup for Main menu."); + } public void loadShaders() { if (core.getPrefs().getBoolean("glow shader")) { Gdx.app.debug("Shader", "using glow shader"); @@ -128,7 +176,7 @@ public class MainMenu extends ScreenAdapter implements TransitionAdapter { @Override public void render(float delta) { - Gdx.gl.glClearColor(0.212f, 0.094f, 0f, 1f); + Gdx.gl.glClearColor(0f, 0f, 0f, 1f); Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); stage.act(delta); blurlvl = 5; @@ -137,7 +185,7 @@ public class MainMenu extends ScreenAdapter implements TransitionAdapter { //Begin drawing a normal version of screen normalBuffer.begin(); - Gdx.gl.glClearColor(0.212f, 0.094f, 0f, 1f); + Gdx.gl.glClearColor(0.22f, 0f, 0f, 1f); Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); stage.draw(); normalBuffer.end(); @@ -218,55 +266,6 @@ public class MainMenu extends ScreenAdapter implements TransitionAdapter { moreOptionsPage.dispose(); } - @Override - public void postTransition() { - mainPage = new MainPage(core, targetPosition, sc); - mainPage.setPosition(0, 0); - stage.addActor(mainPage); - - //End main menu - moreOptionsPage = new MoreOptionsPage(core, targetPosition); - - optionsPage = new OptionsPage(core, targetPosition, moreOptionsPage, sc); - optionsPage.setPosition(Gdx.graphics.getWidth(), 0); - stage.addActor(optionsPage); - - creditsPage = new CreditsPage(core.getDefaultSkin()); - creditsPage.setPosition(0, Gdx.graphics.getHeight()); - stage.addActor(creditsPage); - - moreOptionsPage.setPosition(1f*Gdx.graphics.getWidth(), -1f*Gdx.graphics.getHeight()); - stage.addActor(moreOptionsPage); - - stage.addListener(new InputListener() { - @Override - public boolean keyUp(InputEvent event, int keycode) { - if (keycode == Keys.ESCAPE) { - stage.unfocusAll(); - if (targetPosition.x != 0.5f*Gdx.graphics.getWidth() || targetPosition.y != 0.5f*Gdx.graphics.getHeight()) { - targetPosition.x = 0.5f*Gdx.graphics.getWidth(); - targetPosition.y = 0.5f*Gdx.graphics.getHeight(); - } - moreOptionsPage.controlUnselect(); - } - return super.keyUp(event, keycode); - } - }); - - stage.addListener(new ClickListener() { - @Override - public void clicked(InputEvent event, float x, float y) { - if (stage.hit(x, y, true) == null) { - stage.unfocusAll(); - moreOptionsPage.controlUnselect(); - } - super.clicked(event, x, y); - } - }); - - Gdx.app.debug("Post Transition", "Beginning screen setup for Main menu."); - } - @Override public void show() { Gdx.input.setInputProcessor(stage);