minor changes to gradients
This commit is contained in:
parent
6c1981d60b
commit
21473bcb0d
@ -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
|
BIN
android/assets/gradients.png
Normal file → Executable file
BIN
android/assets/gradients.png
Normal file → Executable file
Binary file not shown.
Before Width: | Height: | Size: 862 B After Width: | Height: | Size: 581 B |
Binary file not shown.
Before Width: | Height: | Size: 545 B |
@ -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();
|
||||
}
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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());
|
||||
|
@ -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;
|
||||
|
@ -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());
|
||||
|
@ -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);
|
||||
|
@ -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) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user