diff --git a/android/assets/1280x720/PolyjetTitle.png b/android/assets/1280x720/PolyjetTitle.png deleted file mode 100755 index 541f39a..0000000 Binary files a/android/assets/1280x720/PolyjetTitle.png and /dev/null differ diff --git a/android/assets/1280x720/title.png b/android/assets/1280x720/title.png new file mode 100755 index 0000000..fb61520 Binary files /dev/null and b/android/assets/1280x720/title.png differ diff --git a/android/assets/1280x800/PolyjetTitle.png b/android/assets/1280x800/PolyjetTitle.png deleted file mode 100755 index e1a57c7..0000000 Binary files a/android/assets/1280x800/PolyjetTitle.png and /dev/null differ diff --git a/android/assets/1280x800/title.png b/android/assets/1280x800/title.png new file mode 100755 index 0000000..0c3eef9 Binary files /dev/null and b/android/assets/1280x800/title.png differ diff --git a/android/assets/1366x768/PolyjetTitle.png b/android/assets/1366x768/PolyjetTitle.png deleted file mode 100755 index ab6d1d7..0000000 Binary files a/android/assets/1366x768/PolyjetTitle.png and /dev/null differ diff --git a/android/assets/1366x768/title.png b/android/assets/1366x768/title.png new file mode 100755 index 0000000..d3fcb0c Binary files /dev/null and b/android/assets/1366x768/title.png differ diff --git a/android/assets/1920x1080/PolyjetTitle.png b/android/assets/1920x1080/PolyjetTitle.png deleted file mode 100755 index 2432c76..0000000 Binary files a/android/assets/1920x1080/PolyjetTitle.png and /dev/null differ diff --git a/android/assets/1920x1080/title.png b/android/assets/1920x1080/title.png new file mode 100755 index 0000000..1a04291 Binary files /dev/null and b/android/assets/1920x1080/title.png differ diff --git a/android/assets/1920x1200/PolyjetTitle.png b/android/assets/1920x1200/PolyjetTitle.png deleted file mode 100755 index e42f38c..0000000 Binary files a/android/assets/1920x1200/PolyjetTitle.png and /dev/null differ diff --git a/android/assets/1920x1200/title.png b/android/assets/1920x1200/title.png new file mode 100755 index 0000000..75916a6 Binary files /dev/null and b/android/assets/1920x1200/title.png differ diff --git a/android/assets/2560x1440/PolyjetTitle.png b/android/assets/2560x1440/PolyjetTitle.png deleted file mode 100755 index 1091f20..0000000 Binary files a/android/assets/2560x1440/PolyjetTitle.png and /dev/null differ diff --git a/android/assets/2560x1440/title.png b/android/assets/2560x1440/title.png new file mode 100755 index 0000000..46736ba Binary files /dev/null and b/android/assets/2560x1440/title.png differ diff --git a/android/assets/3840x2160/PolyjetTitle.png b/android/assets/3840x2160/PolyjetTitle.png deleted file mode 100755 index 477f95d..0000000 Binary files a/android/assets/3840x2160/PolyjetTitle.png and /dev/null differ diff --git a/android/assets/3840x2160/title.png b/android/assets/3840x2160/title.png new file mode 100755 index 0000000..fa18134 Binary files /dev/null and b/android/assets/3840x2160/title.png differ diff --git a/android/assets/800x480/PolyjetTitle.png b/android/assets/800x480/PolyjetTitle.png deleted file mode 100755 index 9183c67..0000000 Binary files a/android/assets/800x480/PolyjetTitle.png and /dev/null differ diff --git a/android/assets/800x480/title.png b/android/assets/800x480/title.png new file mode 100755 index 0000000..b12ec8e Binary files /dev/null and b/android/assets/800x480/title.png differ diff --git a/core/src/zero1hd/rhythmbullet/RhythmBullet.java b/core/src/zero1hd/rhythmbullet/RhythmBullet.java index 4fee2ea..625dea6 100755 --- a/core/src/zero1hd/rhythmbullet/RhythmBullet.java +++ b/core/src/zero1hd/rhythmbullet/RhythmBullet.java @@ -56,6 +56,7 @@ public class RhythmBullet extends Game { Gdx.app.setLogLevel(Application.LOG_DEBUG); prefs = Gdx.app.getPreferences("PolyJet_Preferences"); + setScreen(new MainMenu(this)); if (prefs.getBoolean("fullscreen", true)) { Gdx.graphics.setFullscreenMode(Gdx.graphics.getDisplayMode()); } else { @@ -66,7 +67,6 @@ public class RhythmBullet extends Game { + Gdx.graphics.getWidth() + "x" + Gdx.graphics.getHeight() +"\n" + "Pixel density (PPI): " + Gdx.graphics.getDensity()); - setScreen(new MainMenu(this)); Resolution[] resolution = { new Resolution(800, 480, "800x480"), @@ -117,7 +117,7 @@ public class RhythmBullet extends Game { assetManager.load("standard_thrust.p", ParticleEffect.class); assetManager.load("keyboard.atlas", TextureAtlas.class); assetManager.load("cybercircle3B.png", Texture.class); - assetManager.load("PolyjetTitle.png", Texture.class); + assetManager.load("title.png", Texture.class); assetManager.load("cybercircle1.png", Texture.class); assetManager.load("defaultCover.png", Texture.class); assetManager.load("teleport-cloak.p", ParticleEffect.class); diff --git a/core/src/zero1hd/rhythmbullet/screens/GameScreen.java b/core/src/zero1hd/rhythmbullet/screens/GameScreen.java index d95c8aa..938636c 100755 --- a/core/src/zero1hd/rhythmbullet/screens/GameScreen.java +++ b/core/src/zero1hd/rhythmbullet/screens/GameScreen.java @@ -102,7 +102,7 @@ public class GameScreen extends ScreenAdapter { bgShader.setUniformf("time", music.getPlaybackMusic().getPosition()); } } - bgBatch.draw(background, 0f, 0f, Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); + bgBatch.draw(background, 0f, 0f); bgBatch.end(); diff --git a/core/src/zero1hd/rhythmbullet/ui/pages/MainPage.java b/core/src/zero1hd/rhythmbullet/ui/pages/MainPage.java index 4208555..b0d90bd 100755 --- a/core/src/zero1hd/rhythmbullet/ui/pages/MainPage.java +++ b/core/src/zero1hd/rhythmbullet/ui/pages/MainPage.java @@ -17,8 +17,8 @@ import zero1hd.rhythmbullet.RhythmBullet; import zero1hd.rhythmbullet.screens.PreGameScreen; public class MainPage extends Page { - private Image polyjetTitle; - private Label polyJetVersion; + private Image title; + private Label versionLabel; private TextButton options; private Image cyberCircle; private Label begin; @@ -27,13 +27,13 @@ public class MainPage extends Page { private WidgetGroup playButton; public MainPage(final RhythmBullet core, final Vector3 targetPosition) { - polyjetTitle = new Image(core.getAssetManager().get("PolyjetTitle.png", Texture.class)); - polyjetTitle.setPosition(15, getHeight() - polyjetTitle.getHeight()-15); - addActor(polyjetTitle); - polyJetVersion = new Label("Version: " + RhythmBullet.VERSION, core.getDefaultSkin(), "sub-font", + title = new Image(core.getAssetManager().get("title.png", Texture.class)); + title.setPosition(15, getHeight() - title.getHeight()-15); + addActor(title); + versionLabel = new Label("Version: " + RhythmBullet.VERSION, core.getDefaultSkin(), "sub-font", core.getDefaultSkin().getColor("default")); - polyJetVersion.setPosition(3, 3); - addActor(polyJetVersion); + versionLabel.setPosition(3, 3); + addActor(versionLabel); options = new TextButton(" Options ", core.getDefaultSkin(), "left"); options.addListener(new ChangeListener() { @@ -42,7 +42,7 @@ public class MainPage extends Page { targetPosition.x = 1.5f * getWidth(); } }); - options.setPosition(-options.getWidth(), polyjetTitle.getY() - options.getHeight() - 30); + options.setPosition(-options.getWidth(), title.getY() - options.getHeight() - 30); options.addAction(Actions.sequence(Actions.delay(0.25f), Actions.moveTo(0, options.getY(), 0.5f))); addActor(options); diff --git a/desktop/src/zero1hd/rhythmbullet/desktop/DesktopLauncher.java b/desktop/src/zero1hd/rhythmbullet/desktop/DesktopLauncher.java index 7a0b678..a9b7493 100755 --- a/desktop/src/zero1hd/rhythmbullet/desktop/DesktopLauncher.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/DesktopLauncher.java @@ -12,7 +12,7 @@ public class DesktopLauncher { config.width = 800; config.height = 480; config.resizable = false; -// System.setProperty("org.lwjgl.opengl.Window.undecorated", "true"); + System.setProperty("org.lwjgl.opengl.Window.undecorated", "true"); new LwjglApplication(new RhythmBullet(), config);