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

scaling of textures fixed for various pages; last fix was scroll text

Browse Source 
updating;
This commit is contained in:
Harrison Deng 2018-08-05 22:23:50 -05:00
parent fe1eeecbc1
commit e824fe8b8b
8 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/zero1hd/rhythmbullet/InitialScreen.java
View File

@ -2,7 +2,9 @@ package zero1hd.rhythmbullet;
import com.badlogic.gdx.Screen;
public interface InitialScreen extends Screen {
import zero1hd.rhythmbullet.util.ResizeReadyScreen;
public interface InitialScreen extends ResizeReadyScreen {
/**
* Screen should be created on platform.
* @param gameManager the game manager.

3
core/src/zero1hd/rhythmbullet/RhythmBullet.java
View File

@ -30,9 +30,8 @@ public class RhythmBullet extends Game {
public static int pixels_per_unit;
private boolean initiated;
private boolean resizing;
private boolean completeUILoad;
private int screenWidth, screenHeight;
public static final String VERSION = "(0.1)R1-PreAlpha";
public static final String VERSION = "(1.0.0) R1-PreAlpha";
private AssetManager assetManager = new AssetManager();
private Skin skin;

2
core/src/zero1hd/rhythmbullet/audio/MusicController.java
View File

@ -19,7 +19,7 @@ import com.badlogic.gdx.files.FileHandle;
*/
public class MusicController extends Observable implements OnCompletionListener, Observer {
public final class States {
public final Integer LOADED = 0, PLAYING = 1;
public final Integer LOADED = new Integer(0), PLAYING = new Integer(1);
}
public final States states = new States();
private MusicList musicList;

4
core/src/zero1hd/rhythmbullet/util/ResizeReadyScreen.java
View File

@ -1,6 +1,8 @@
package zero1hd.rhythmbullet.util;
public interface ResizeReadyScreen {
import com.badlogic.gdx.Screen;
public interface ResizeReadyScreen extends Screen {
/**
* called before assets are cleared from memory.
*/

4
desktop/src/zero1hd/rhythmbullet/desktop/audio/visualizer/PCMObtainer.java
View File

@ -212,9 +212,9 @@ public class PCMObtainer implements Observer, Disposable, PCMSystem {
@Override
public void update(Observable o, Object arg) {
if (o == mc) {
if (arg == mc.states.LOADED) {
if (arg.equals(mc.states.LOADED)) {
setMusic();
} else if (arg == mc.states.PLAYING) {
} else if (arg.equals(mc.states.PLAYING)) {
streamReadThread.start();
}
}

7
desktop/src/zero1hd/rhythmbullet/desktop/screens/SplashScreen.java
View File

@ -14,9 +14,8 @@ import com.badlogic.gdx.utils.viewport.ScreenViewport;
import zero1hd.rhythmbullet.InitialScreen;
import zero1hd.rhythmbullet.RhythmBullet;
import zero1hd.rhythmbullet.desktop.screens.main.MainScreen;
import zero1hd.rhythmbullet.util.ResizeReadyScreen;
public class SplashScreen extends ScreenAdapter implements ResizeReadyScreen, InitialScreen {
public class SplashScreen extends ScreenAdapter implements InitialScreen {
private Stage stage;
private Texture splash;
private Image zero1HD;
@ -25,8 +24,6 @@ public class SplashScreen extends ScreenAdapter implements ResizeReadyScreen, In
public void init() {
splash = new Texture(Gdx.files.internal("splashlogo.png"));
zero1HD = new Image(splash);
zero1HD.setScale((Gdx.graphics.getHeight()*0.8f)/zero1HD.getHeight());
zero1HD.setColor(0f,1f,1f,0.1f);
}
@Override
@ -52,7 +49,7 @@ public class SplashScreen extends ScreenAdapter implements ResizeReadyScreen, In
public void postAssetLoad() {
stage = new Stage(new ScreenViewport());
stage.addActor(zero1HD);
zero1HD.setScale((Gdx.graphics.getHeight()*0.8f)/zero1HD.getHeight());
zero1HD.setScale((Gdx.graphics.getHeight()*0.5f)/zero1HD.getHeight()*zero1HD.getScaleY());
zero1HD.setColor(0f,1f,1f,0f);
zero1HD.setPosition((stage.getWidth() - zero1HD.getWidth()*zero1HD.getScaleX())/2f, (stage.getHeight() - zero1HD.getHeight()*zero1HD.getScaleY())/2f);
zero1HD.addAction(Actions.sequence(Actions.color(Color.WHITE, 1f), Actions.fadeOut(0.5f)));

11
desktop/src/zero1hd/rhythmbullet/desktop/screens/main/MainPage.java
View File

@ -43,13 +43,17 @@ public class MainPage extends Page implements Observer {
public MainPage(MusicController musicController, AssetManager assetManager, Skin skin, ChangeListener playButtonListener, ChangeListener optionsButtonListener) {
super(0, 0);
this.mc = musicController;
this.mc.addObserver(this);
dhv = new DoubleHorizontalVisualizer(70, (int) getWidth(), (int) (getHeight()*0.3), 0.3f, mc, new PCMObtainer(mc));
dhv.setPosition(0, (int) ((getHeight() - dhv.getHeight())/2f));
title = new Image(assetManager.get("title.png", Texture.class));
title.setScale(dhv.getHeight()/title.getHeight());
title.setPosition((getWidth()-title.getWidth())/2f, (getHeight()-title.getHeight())/2f);
title.setScale((dhv.getHeight() - 14)/title.getHeight());
if (title.getWidth()*title.getScaleX() > dhv.getWidth() - 30) {
title.setScale((dhv.getWidth() - 30)/title.getWidth()*getScaleX());
}
title.setPosition((getWidth()-title.getWidth()*title.getScaleX())/2f, (getHeight()-title.getHeight()*title.getScaleY())/2f);
addActor(title);
versionLabel = new Label("Version: " + RhythmBullet.VERSION, skin, "sub-font", skin.getColor("default"));
@ -90,6 +94,7 @@ public class MainPage extends Page implements Observer {
scrollText.setWidth(0.5f*getWidth());
scrollText.setPosition(15, getHeight() - scrollText.getHeight()-25f);
addActor(scrollText);
}
@Override
@ -111,7 +116,7 @@ public class MainPage extends Page implements Observer {
@Override
public void update(Observable o, Object arg) {
if (o == mc && arg == mc.states.LOADED) {
if (o == mc) {
scrollText.setText("Currently playing: " + mc.getCurrentSongName(), null);
}
}

2
desktop/src/zero1hd/rhythmbullet/desktop/screens/main/MusicSelectionPage.java
View File

@ -268,7 +268,7 @@ public class MusicSelectionPage extends Page implements Observer {
@Override
public void update(Observable o, Object arg) {
if (o == mc && arg == mc.states.LOADED) {
if (o == mc && arg.equals(mc.states.LOADED)) {
if (selectables.getChecked().getFileHandle() != mc.getCurrentMusicFileHandle()) {
selectables.setChecked(mc.getCurrentlyPlayingIndex());
}