diff --git a/ShootingStars/assets/Gui/Button.xml b/ShootingStars/assets/Gui/Button.xml
deleted file mode 100644
index 5d4645b..0000000
--- a/ShootingStars/assets/Gui/Button.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ShootingStars/assets/Gui/Button/Button.xml b/ShootingStars/assets/Gui/Button/Button.xml
new file mode 100644
index 0000000..adf41d7
--- /dev/null
+++ b/ShootingStars/assets/Gui/Button/Button.xml
@@ -0,0 +1,192 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ShootingStars/assets/Gui/Button/button.png b/ShootingStars/assets/Gui/Button/button.png
new file mode 100644
index 0000000..f3444f1
Binary files /dev/null and b/ShootingStars/assets/Gui/Button/button.png differ
diff --git a/ShootingStars/assets/Gui/button.png b/ShootingStars/assets/Gui/Button/buttonalt.png
similarity index 100%
rename from ShootingStars/assets/Gui/button.png
rename to ShootingStars/assets/Gui/Button/buttonalt.png
diff --git a/ShootingStars/assets/Gui/Menu/Menu.xml b/ShootingStars/assets/Gui/Menu/Menu.xml
new file mode 100644
index 0000000..a6c9ab0
--- /dev/null
+++ b/ShootingStars/assets/Gui/Menu/Menu.xml
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ShootingStars/assets/Gui/Scrolling/Scrolling.xml b/ShootingStars/assets/Gui/Scrolling/Scrolling.xml
new file mode 100644
index 0000000..26a004e
--- /dev/null
+++ b/ShootingStars/assets/Gui/Scrolling/Scrolling.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ShootingStars/assets/Gui/Scrolling/scroll_track_x.png b/ShootingStars/assets/Gui/Scrolling/scroll_track_x.png
new file mode 100644
index 0000000..31b14b6
Binary files /dev/null and b/ShootingStars/assets/Gui/Scrolling/scroll_track_x.png differ
diff --git a/ShootingStars/assets/Gui/Window/Window.xml b/ShootingStars/assets/Gui/Window/Window.xml
new file mode 100644
index 0000000..77796da
--- /dev/null
+++ b/ShootingStars/assets/Gui/Window/Window.xml
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ShootingStars/assets/Gui/Window/panel_x.png b/ShootingStars/assets/Gui/Window/panel_x.png
new file mode 100644
index 0000000..435db20
Binary files /dev/null and b/ShootingStars/assets/Gui/Window/panel_x.png differ
diff --git a/ShootingStars/assets/Gui/Window/panel_x_inner.png b/ShootingStars/assets/Gui/Window/panel_x_inner.png
new file mode 100644
index 0000000..435db20
Binary files /dev/null and b/ShootingStars/assets/Gui/Window/panel_x_inner.png differ
diff --git a/ShootingStars/assets/Gui/style_map.xml b/ShootingStars/assets/Gui/style_map.xml
index b9002a1..43cd46b 100644
--- a/ShootingStars/assets/Gui/style_map.xml
+++ b/ShootingStars/assets/Gui/style_map.xml
@@ -1,5 +1,21 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ShootingStars/src/org/wyrez/shootingstars/ShootingStars.java b/ShootingStars/src/org/wyrez/shootingstars/ShootingStars.java
index e018380..ad604bf 100644
--- a/ShootingStars/src/org/wyrez/shootingstars/ShootingStars.java
+++ b/ShootingStars/src/org/wyrez/shootingstars/ShootingStars.java
@@ -54,6 +54,7 @@ public class ShootingStars extends SimpleApplication {
private PersiJContainer container;
private StateManager sManager;
private OptionSettings optionSettings;
+ private Screen screen;
public ShootingStars(OptionSettings optionSettings) {
super((AppState) null);
@@ -67,6 +68,9 @@ public class ShootingStars extends SimpleApplication {
@Override
public void simpleInitApp() {
+ //screen = new Screen(this);
+ screen = new Screen(this, "Gui/style_map.xml");
+
registerTypes();
initGUI();
initKeys();
@@ -77,8 +81,7 @@ public class ShootingStars extends SimpleApplication {
cam.setFrustumFar(2500f);
sManager = container.resolve(StateManager.class);
sManager.setState(State.START);
- //screen = new Screen(this, "Gui/style_map.xml");
-
+
BackgroundMusic music = container.resolve(BackgroundMusic.class);
rootNode.attachChild(music);
}
@@ -98,12 +101,13 @@ public class ShootingStars extends SimpleApplication {
container.registerSingleton(AssetManager.class, assetManager);
container.registerSingleton(ViewPort.class, viewPort);
container.registerSingleton(OptionSettings.class, optionSettings);
+ container.registerSingleton(Screen.class, screen);
container.registerType(GameSettings.class, true);
container.registerType(StateManager.class, true);
container.registerType(SQLiteConnector.class);
container.registerType(ScoreComparator.class);
- container.registerType(HighscoreManager.class, true);
- container.registerType(Screen.class, true);
+ container.registerType(HighscoreManager.class, true);
+ //container.registerType(Screen.class, true);
container.registerType(ScreenHelper.class, true);
container.registerType(AudioDataManager.class, true);
container.registerType(YTDownloader.class);