diff --git a/android/assets/gradients.atlas b/android/assets/gradients.atlas index 2b4a057..863e694 100755 --- a/android/assets/gradients.atlas +++ b/android/assets/gradients.atlas @@ -3,17 +3,17 @@ size: 128,128 format: RGBA8888 filter: Linear,Linear repeat: none -red-round +round-grad rotate: false xy: 2, 2 - size: 3, 3 - orig: 3, 3 + size: 5, 5 + orig: 5, 5 offset: 0, 0 index: -1 -red-linear +linear-up-grad rotate: false - xy: 8, 2 - size: 3, 3 - orig: 3, 3 + xy: 10, 2 + size: 5, 5 + orig: 5, 5 offset: 0, 0 index: -1 \ No newline at end of file diff --git a/android/assets/gradients.png b/android/assets/gradients.png old mode 100644 new mode 100755 index 184961f..70c1cc9 Binary files a/android/assets/gradients.png and b/android/assets/gradients.png differ diff --git a/android/assets/gradients.png~ b/android/assets/gradients.png~ deleted file mode 100755 index 2ed51fc..0000000 Binary files a/android/assets/gradients.png~ and /dev/null differ diff --git a/core/src/zero1hd/rhythmbullet/audio/analyzer/AudioAnalyzer.java b/core/src/zero1hd/rhythmbullet/audio/analyzer/AudioAnalyzer.java index b809c31..3521a11 100755 --- a/core/src/zero1hd/rhythmbullet/audio/analyzer/AudioAnalyzer.java +++ b/core/src/zero1hd/rhythmbullet/audio/analyzer/AudioAnalyzer.java @@ -15,8 +15,6 @@ public class AudioAnalyzer implements Disposable { private PruneFluxRunnable pfr; private PeakDetectionRunnable pdr; - private MusicManager musicManager; - public AudioAnalyzer(MusicManager musicManager) { exec = Executors.newSingleThreadExecutor(); sfar = new SpectralFluxAnalysisRunnable(musicManager); @@ -24,7 +22,6 @@ public class AudioAnalyzer implements Disposable { pfr = new PruneFluxRunnable(tcr); pdr = new PeakDetectionRunnable(pfr, sfar.getPUID()); - this.musicManager = musicManager; } public void start() { @@ -44,7 +41,6 @@ public class AudioAnalyzer implements Disposable { @Override public void dispose() { stop(); - musicManager.dispose(); exec.shutdown(); } diff --git a/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/AnalysisPage.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/AnalysisPage.java index 66c72a1..490779a 100755 --- a/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/AnalysisPage.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/AnalysisPage.java @@ -33,7 +33,7 @@ public class AnalysisPage extends Page { private Image albumArt; 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)); table = new Table(); table.setFillParent(true); diff --git a/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/KeybindOptionsPage.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/KeybindOptionsPage.java index 9036b03..37e1f43 100755 --- a/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/KeybindOptionsPage.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/KeybindOptionsPage.java @@ -17,7 +17,7 @@ public class KeybindOptionsPage extends Page { private KeyMap keyMap; private TextButton backButton; 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)); keyMap = new KeyMap(assets); controlTable = new ControlOptions(skin, keyMap); diff --git a/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MainPage.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MainPage.java index 73bcad9..f1e2bf1 100755 --- a/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MainPage.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MainPage.java @@ -39,7 +39,7 @@ public class MainPage extends Page implements Observer { public MainPage(RhythmBullet core, final Vector3 targetPosition, MusicListController mlc, final MainMenu mainMenu) { 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)); this.mMenu = mainMenu; titleBar = new TitleBarVisualizer(core.getAssetManager()); diff --git a/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MusicSelectionPage.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MusicSelectionPage.java index e63e760..7fb3b63 100755 --- a/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MusicSelectionPage.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MusicSelectionPage.java @@ -67,7 +67,7 @@ public class MusicSelectionPage extends Page implements Observer { private float scrollTimer, scrollDelay = 0.2f, scrollDelMod, songSelectionTimer; 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)); this.assets = assetManager; this.skin = skin; diff --git a/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/OptionsPage.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/OptionsPage.java index c746fac..e3104bf 100755 --- a/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/OptionsPage.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/OptionsPage.java @@ -27,7 +27,7 @@ public class OptionsPage extends Page { private float musicSearchTimer; public OptionsPage(final RhythmBullet core, final Vector3 targetPosition, KeybindOptionsPage moreOptionsPage, final MusicListController sc) { 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)); //Back button TextButton backButton = new TextButton("Back", core.getDefaultSkin()); diff --git a/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/VideoOptionsPage.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/VideoOptionsPage.java index 7644877..66771d8 100755 --- a/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/VideoOptionsPage.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/VideoOptionsPage.java @@ -20,7 +20,7 @@ public class VideoOptionsPage extends Page { private TextButton backButton; 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)); graphicsTable = new GraphicsOptions(menu, skin, prefs); scrollPane = new ScrollPane(graphicsTable, skin); diff --git a/desktop/src/zero1hd/rhythmbullet/desktop/screens/MainMenu.java b/desktop/src/zero1hd/rhythmbullet/desktop/screens/MainMenu.java index 4389c3c..b61223b 100755 --- a/desktop/src/zero1hd/rhythmbullet/desktop/screens/MainMenu.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/screens/MainMenu.java @@ -145,7 +145,7 @@ public class MainMenu extends ScreenAdapter implements AdvancedResizeScreen { @Override 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); stage.act(delta); if (blurlvl > 0) {