From 9629b7edd71ee3019389ea615494b5ed5a4604e8 Mon Sep 17 00:00:00 2001 From: Recrown Date: Mon, 9 Oct 2017 20:04:42 -0500 Subject: [PATCH] added play, option, and quit buttons --- android/assets/particles/beateffect.p | 20 +++---- android/assets/shaders/gaussian_blur.fsh | 5 +- android/assets/uiskin.atlas | 24 ++++++++ android/assets/uiskin.png | Bin 5845 -> 6342 bytes .../zero1hd/rhythmbullet/RhythmBullet.java | 7 ++- .../ui/components/TitleBarVisualizer.java | 2 +- .../graphics/ui/pages/MainPage.java | 52 ++++++++++++++++++ 7 files changed, 94 insertions(+), 16 deletions(-) diff --git a/android/assets/particles/beateffect.p b/android/assets/particles/beateffect.p index 6e7e056..2e18632 100755 --- a/android/assets/particles/beateffect.p +++ b/android/assets/particles/beateffect.p @@ -125,9 +125,9 @@ timeline0: 0.0 active: false - Tint - colorsCount: 3 -colors0: 1.0 -colors1: 0.6627451 -colors2: 0.23921569 +colors0: 0.75686276 +colors1: 0.4117647 +colors2: 0.0 timelineCount: 1 timeline0: 0.0 - Transparency - @@ -137,16 +137,16 @@ highMin: 1.0 highMax: 1.0 relative: false scalingCount: 5 -scaling0: 0.21052632 -scaling1: 0.45614034 -scaling2: 0.54385966 -scaling3: 0.45614034 +scaling0: 0.2982456 +scaling1: 0.40350878 +scaling2: 0.49122807 +scaling3: 0.33333334 scaling4: 0.0 timelineCount: 5 timeline0: 0.0 -timeline1: 0.56164384 -timeline2: 0.67808217 -timeline3: 0.7671233 +timeline1: 0.46575344 +timeline2: 0.7123288 +timeline3: 0.8561644 timeline4: 1.0 - Options - attached: false diff --git a/android/assets/shaders/gaussian_blur.fsh b/android/assets/shaders/gaussian_blur.fsh index b3f4611..2143387 100755 --- a/android/assets/shaders/gaussian_blur.fsh +++ b/android/assets/shaders/gaussian_blur.fsh @@ -15,7 +15,8 @@ uniform float weight[5] = float[] (0.227027, 0.1945946, 0.1216216, 0.054054, 0.0 void main() { vec2 tex_offset = 1.0 / textureSize(u_texture, 0); - vec3 result = texture(u_texture, vTexCoord).rgb * weight[0]; + vec4 color = texture(u_texture, vTexCoord); + vec3 result = color.rgb * weight[0]; if (horizontal == 1) { for (int i = 1; i < 5; ++i) { @@ -29,5 +30,5 @@ void main() { } } - gl_FragColor = vec4(result, 1.0); + gl_FragColor = vec4(result, color.a); } \ No newline at end of file diff --git a/android/assets/uiskin.atlas b/android/assets/uiskin.atlas index 183734c..cdee16f 100755 --- a/android/assets/uiskin.atlas +++ b/android/assets/uiskin.atlas @@ -318,4 +318,28 @@ large-pane split: 4, 4, 13, 13 orig: 9, 27 offset: 0, 0 + index: -1 +rect + rotate: false + xy: 176, 35 + size: 14, 14 + split: 4, 4, 4, 4 + orig: 14, 14 + offset: 0, 0 + index: -1 +rect-down + rotate: false + xy: 191, 35 + size: 14, 14 + split: 4, 4, 4, 4 + orig: 14, 14 + offset: 0, 0 + index: -1 +rect-disabled + rotate: false + xy: 206, 35 + size: 14, 14 + split: 4, 4, 4, 4 + orig: 14, 14 + offset: 0, 0 index: -1 \ No newline at end of file diff --git a/android/assets/uiskin.png b/android/assets/uiskin.png index 1c5bd4988fd5940f3a23195653de109d7cce0bb9..54dd45bd16dfef98a63deae47e8ea745442f99c4 100755 GIT binary patch literal 6342 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 NV*@k&Vm+tme*vi)m$d)@ literal 5845 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 diff --git a/core/src/zero1hd/rhythmbullet/RhythmBullet.java b/core/src/zero1hd/rhythmbullet/RhythmBullet.java index 403db2e..5be7146 100755 --- a/core/src/zero1hd/rhythmbullet/RhythmBullet.java +++ b/core/src/zero1hd/rhythmbullet/RhythmBullet.java @@ -20,6 +20,7 @@ import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator; import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator.FreeTypeFontParameter; import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.scenes.scene2d.ui.CheckBox.CheckBoxStyle; +import com.badlogic.gdx.scenes.scene2d.ui.ImageButton.ImageButtonStyle; import com.badlogic.gdx.scenes.scene2d.ui.Label.LabelStyle; import com.badlogic.gdx.scenes.scene2d.ui.List.ListStyle; import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane.ScrollPaneStyle; @@ -230,11 +231,11 @@ public class RhythmBullet extends Game { getDefaultSkin().add("inverse", Color.BLACK); TextButtonStyle defaultTextButton = new TextButtonStyle(); - defaultTextButton.up = getDefaultSkin().getDrawable("default-round"); - defaultTextButton.down = getDefaultSkin().getDrawable("default-round-down"); + defaultTextButton.up = getDefaultSkin().getDrawable("rect"); + defaultTextButton.down = getDefaultSkin().getDrawable("rect-down"); defaultTextButton.font = getDefaultSkin().getFont("default-font"); defaultTextButton.fontColor = getDefaultSkin().getColor("default"); - defaultTextButton.disabled = getDefaultSkin().getDrawable("default-round-disabled"); + defaultTextButton.disabled = getDefaultSkin().getDrawable("rect-disabled"); getDefaultSkin().add("default", defaultTextButton); TextButtonStyle subTextbutton = new TextButtonStyle(defaultTextButton); diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/components/TitleBarVisualizer.java b/core/src/zero1hd/rhythmbullet/graphics/ui/components/TitleBarVisualizer.java index 40712ce..b091c02 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/components/TitleBarVisualizer.java +++ b/core/src/zero1hd/rhythmbullet/graphics/ui/components/TitleBarVisualizer.java @@ -76,8 +76,8 @@ public class TitleBarVisualizer extends Group implements Disposable { return effect; } }; - } + @Override public void act(float delta) { if (!lastEffect) { diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MainPage.java b/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MainPage.java index bbaf98f..5165174 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MainPage.java +++ b/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MainPage.java @@ -1,8 +1,18 @@ package zero1hd.rhythmbullet.graphics.ui.pages; +import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.math.Vector3; +import com.badlogic.gdx.scenes.scene2d.Actor; +import com.badlogic.gdx.scenes.scene2d.ui.ImageButton; import com.badlogic.gdx.scenes.scene2d.ui.Label; +import com.badlogic.gdx.scenes.scene2d.ui.Table; +import com.badlogic.gdx.scenes.scene2d.ui.TextButton; +import com.badlogic.gdx.scenes.scene2d.ui.ImageButton.ImageButtonStyle; +import com.badlogic.gdx.scenes.scene2d.ui.TextButton.TextButtonStyle; +import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; +import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener.ChangeEvent; +import com.badlogic.gdx.utils.Align; import zero1hd.rhythmbullet.RhythmBullet; import zero1hd.rhythmbullet.audio.MusicManager; @@ -15,6 +25,10 @@ public class MainPage extends Page implements OnDifferentSongListener { private SongListController sc; private TitleBarVisualizer titleBar; + private Table table; + private TextButton playButton; + private TextButton optionsButton; + private TextButton quitButton; public MainPage(RhythmBullet core, Vector3 targetPosition, SongListController sc) { this.sc = sc; @@ -29,6 +43,44 @@ public class MainPage extends Page implements OnDifferentSongListener { core.getDefaultSkin().getColor("default")); versionLabel.setPosition(3, 3); addActor(versionLabel); + + table = new Table(); + table.setSize(getWidth(), titleBar.getY()); + table.align(Align.center); + table.defaults().space(10f); + addActor(table); + + playButton = new TextButton("Start!", core.getDefaultSkin()); + playButton.addListener(new ChangeListener() { + @Override + public void changed(ChangeEvent event, Actor actor) { + //TODO move to play screen + } + }); + table.add(playButton).width(Gdx.graphics.getWidth()*0.2f); + + table.row(); + + optionsButton = new TextButton("Options", core.getDefaultSkin(), "sub"); + optionsButton.addListener(new ChangeListener() { + @Override + public void changed(ChangeEvent event, Actor actor) { + //TODO move to options + } + }); + table.add(optionsButton).fillX(); + + table.row(); + + quitButton = new TextButton("Quit", core.getDefaultSkin(), "sub"); + quitButton.addListener(new ChangeListener() { + @Override + public void changed(ChangeEvent event, Actor actor) { + Gdx.app.exit(); + System.exit(0); + } + }); + table.add(quitButton).fillX(); } @Override