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

minor changes to gradients

Browse Source
This commit is contained in:
Harrison Deng 2018-01-17 22:53:39 -06:00
parent 6c1981d60b
commit 21473bcb0d
11 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
android/assets/gradients.atlas
View File

@ -3,17 +3,17 @@ size: 128,128
format: RGBA8888 format: RGBA8888
filter: Linear,Linear filter: Linear,Linear
repeat: none repeat: none
red-round round-grad
rotate: false rotate: false
xy: 2, 2 xy: 2, 2
size: 3, 3 size: 5, 5
orig: 3, 3 orig: 5, 5
offset: 0, 0 offset: 0, 0
index: -1 index: -1
red-linear linear-up-grad
rotate: false rotate: false
xy: 8, 2 xy: 10, 2
size: 3, 3 size: 5, 5
orig: 3, 3 orig: 5, 5
offset: 0, 0 offset: 0, 0
index: -1 index: -1

BIN
android/assets/gradients.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 862 B

After

Width:  |  Height:  |  Size: 581 B

BIN
android/assets/gradients.png~
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 545 B

4
core/src/zero1hd/rhythmbullet/audio/analyzer/AudioAnalyzer.java
View File

@ -15,8 +15,6 @@ public class AudioAnalyzer implements Disposable {
private PruneFluxRunnable pfr; private PruneFluxRunnable pfr;
private PeakDetectionRunnable pdr; private PeakDetectionRunnable pdr;
private MusicManager musicManager;
public AudioAnalyzer(MusicManager musicManager) { public AudioAnalyzer(MusicManager musicManager) {
exec = Executors.newSingleThreadExecutor(); exec = Executors.newSingleThreadExecutor();
sfar = new SpectralFluxAnalysisRunnable(musicManager); sfar = new SpectralFluxAnalysisRunnable(musicManager);
@ -24,7 +22,6 @@ public class AudioAnalyzer implements Disposable {
pfr = new PruneFluxRunnable(tcr); pfr = new PruneFluxRunnable(tcr);
pdr = new PeakDetectionRunnable(pfr, sfar.getPUID()); pdr = new PeakDetectionRunnable(pfr, sfar.getPUID());
this.musicManager = musicManager;
} }
public void start() { public void start() {
@ -44,7 +41,6 @@ public class AudioAnalyzer implements Disposable {
@Override @Override
public void dispose() { public void dispose() {
stop(); stop();
musicManager.dispose();
exec.shutdown(); exec.shutdown();
} }

2
desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/AnalysisPage.java
View File

@ -33,7 +33,7 @@ public class AnalysisPage extends Page {
private Image albumArt; private Image albumArt;
public AnalysisPage(Skin skin, AssetManager assets, Vector3 cameraPosition) { public AnalysisPage(Skin skin, AssetManager assets, Vector3 cameraPosition) {
setTextureBackground(assets.get("gradients.atlas", TextureAtlas.class).findRegion("red-round")); setTextureBackground(assets.get("gradients.atlas", TextureAtlas.class).findRegion("round-grad"));
setBgColor(Color.toFloatBits(82,111,157, 255)); setBgColor(Color.toFloatBits(82,111,157, 255));
table = new Table(); table = new Table();
table.setFillParent(true); table.setFillParent(true);

2
desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/KeybindOptionsPage.java
View File

@ -17,7 +17,7 @@ public class KeybindOptionsPage extends Page {
private KeyMap keyMap; private KeyMap keyMap;
private TextButton backButton; private TextButton backButton;
public KeybindOptionsPage(Skin skin, AssetManager assets, final Vector3 cameraPosition) { public KeybindOptionsPage(Skin skin, AssetManager assets, final Vector3 cameraPosition) {
setTextureBackground(assets.get("gradients.atlas", TextureAtlas.class).findRegion("red-round")); setTextureBackground(assets.get("gradients.atlas", TextureAtlas.class).findRegion("round-grad"));
setBgColor(Color.toFloatBits(186,238,255, 255)); setBgColor(Color.toFloatBits(186,238,255, 255));
keyMap = new KeyMap(assets); keyMap = new KeyMap(assets);
controlTable = new ControlOptions(skin, keyMap); controlTable = new ControlOptions(skin, keyMap);

2
desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MainPage.java
View File

@ -39,7 +39,7 @@ public class MainPage extends Page implements Observer {
public MainPage(RhythmBullet core, final Vector3 targetPosition, MusicListController mlc, final MainMenu mainMenu) { public MainPage(RhythmBullet core, final Vector3 targetPosition, MusicListController mlc, final MainMenu mainMenu) {
this.mlc = mlc; this.mlc = mlc;
setTextureBackground(core.getAssetManager().get("gradients.atlas", TextureAtlas.class).findRegion("red-linear")); setTextureBackground(core.getAssetManager().get("gradients.atlas", TextureAtlas.class).findRegion("linear-up-grad"));
setBgColor(Color.toFloatBits(83,100,170, 255)); setBgColor(Color.toFloatBits(83,100,170, 255));
this.mMenu = mainMenu; this.mMenu = mainMenu;
titleBar = new TitleBarVisualizer(core.getAssetManager()); titleBar = new TitleBarVisualizer(core.getAssetManager());

2
desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MusicSelectionPage.java
View File

@ -67,7 +67,7 @@ public class MusicSelectionPage extends Page implements Observer {
private float scrollTimer, scrollDelay = 0.2f, scrollDelMod, songSelectionTimer; private float scrollTimer, scrollDelay = 0.2f, scrollDelMod, songSelectionTimer;
public MusicSelectionPage(Skin skin, MusicListController musicListController, MusicInfoController musicInfoController, AssetManager assetManager, final Vector3 cameraTarget, final AnalysisPage ap) { public MusicSelectionPage(Skin skin, MusicListController musicListController, MusicInfoController musicInfoController, AssetManager assetManager, final Vector3 cameraTarget, final AnalysisPage ap) {
setTextureBackground(assetManager.get("gradients.atlas", TextureAtlas.class).findRegion("red-round")); setTextureBackground(assetManager.get("gradients.atlas", TextureAtlas.class).findRegion("round-grad"));
setBgColor(Color.toFloatBits(110,164,193, 255)); setBgColor(Color.toFloatBits(110,164,193, 255));
this.assets = assetManager; this.assets = assetManager;
this.skin = skin; this.skin = skin;

2
desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/OptionsPage.java
View File

@ -27,7 +27,7 @@ public class OptionsPage extends Page {
private float musicSearchTimer; private float musicSearchTimer;
public OptionsPage(final RhythmBullet core, final Vector3 targetPosition, KeybindOptionsPage moreOptionsPage, final MusicListController sc) { public OptionsPage(final RhythmBullet core, final Vector3 targetPosition, KeybindOptionsPage moreOptionsPage, final MusicListController sc) {
super("General", core.getDefaultSkin()); super("General", core.getDefaultSkin());
setTextureBackground(core.getAssetManager().get("gradients.atlas", TextureAtlas.class).findRegion("red-round")); setTextureBackground(core.getAssetManager().get("gradients.atlas", TextureAtlas.class).findRegion("round-grad"));
setBgColor(Color.toFloatBits(93,75,144, 255)); setBgColor(Color.toFloatBits(93,75,144, 255));
//Back button //Back button
TextButton backButton = new TextButton("Back", core.getDefaultSkin()); TextButton backButton = new TextButton("Back", core.getDefaultSkin());

2
desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/VideoOptionsPage.java
View File

@ -20,7 +20,7 @@ public class VideoOptionsPage extends Page {
private TextButton backButton; private TextButton backButton;
public VideoOptionsPage(Skin skin, Preferences prefs, final MainMenu menu, AssetManager assets) { public VideoOptionsPage(Skin skin, Preferences prefs, final MainMenu menu, AssetManager assets) {
setTextureBackground(assets.get("gradients.atlas", TextureAtlas.class).findRegion("red-round")); setTextureBackground(assets.get("gradients.atlas", TextureAtlas.class).findRegion("round-grad"));
setBgColor(Color.toFloatBits(110,164,193, 255)); setBgColor(Color.toFloatBits(110,164,193, 255));
graphicsTable = new GraphicsOptions(menu, skin, prefs); graphicsTable = new GraphicsOptions(menu, skin, prefs);
scrollPane = new ScrollPane(graphicsTable, skin); scrollPane = new ScrollPane(graphicsTable, skin);

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

@ -145,7 +145,7 @@ public class MainMenu extends ScreenAdapter implements AdvancedResizeScreen {
@Override @Override
public void render(float delta) { public void render(float delta) {
Gdx.gl.glClearColor(0.22f, 0f, 0f, 1f); Gdx.gl.glClearColor(0.22f, 0.22f, 0.22f, 1f);
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
stage.act(delta); stage.act(delta);
if (blurlvl > 0) { if (blurlvl > 0) {