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

updating;

core/src/zero1hd/rhythmbullet/InitialScreen.java

@@ -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.

core/src/zero1hd/rhythmbullet/RhythmBullet.java

@@ -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;

core/src/zero1hd/rhythmbullet/audio/MusicController.java

@@ -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;

core/src/zero1hd/rhythmbullet/util/ResizeReadyScreen.java

@@ -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.
 	 */

desktop/src/zero1hd/rhythmbullet/desktop/audio/visualizer/PCMObtainer.java

@@ -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();
 			}
 		}

desktop/src/zero1hd/rhythmbullet/desktop/screens/SplashScreen.java

@@ -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)));

desktop/src/zero1hd/rhythmbullet/desktop/screens/main/MainPage.java

@@ -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.setScale((dhv.getHeight() - 14)/title.getHeight());
-		title.setPosition((getWidth()-title.getWidth())/2f, (getHeight()-title.getHeight())/2f);
+		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);
 	    }
 	}

desktop/src/zero1hd/rhythmbullet/desktop/screens/main/MusicSelectionPage.java

@@ -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());
 			}