diff --git a/ShootingStars/assets/Gui/Button/Button.xml b/ShootingStars/assets/Gui/Button/Button.xml
index adf41d7..319a554 100644
--- a/ShootingStars/assets/Gui/Button/Button.xml
+++ b/ShootingStars/assets/Gui/Button/Button.xml
@@ -44,10 +44,36 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ShootingStars/assets/Gui/Button/buttonTransparent.png b/ShootingStars/assets/Gui/Button/buttonTransparent.png
new file mode 100644
index 0000000..ab47c14
Binary files /dev/null and b/ShootingStars/assets/Gui/Button/buttonTransparent.png differ
diff --git a/ShootingStars/assets/Gui/Button/buttonTransparentHover.png b/ShootingStars/assets/Gui/Button/buttonTransparentHover.png
new file mode 100644
index 0000000..59fd7ba
Binary files /dev/null and b/ShootingStars/assets/Gui/Button/buttonTransparentHover.png differ
diff --git a/ShootingStars/assets/Gui/Indicator/Indicator.xml b/ShootingStars/assets/Gui/Indicator/Indicator.xml
new file mode 100644
index 0000000..9af4151
--- /dev/null
+++ b/ShootingStars/assets/Gui/Indicator/Indicator.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ShootingStars/assets/Gui/Indicator/indicator_am_x.png b/ShootingStars/assets/Gui/Indicator/indicator_am_x.png
new file mode 100644
index 0000000..b0fd120
Binary files /dev/null and b/ShootingStars/assets/Gui/Indicator/indicator_am_x.png differ
diff --git a/ShootingStars/assets/Gui/Indicator/indicator_ol_x.png b/ShootingStars/assets/Gui/Indicator/indicator_ol_x.png
new file mode 100644
index 0000000..4a45528
Binary files /dev/null and b/ShootingStars/assets/Gui/Indicator/indicator_ol_x.png differ
diff --git a/ShootingStars/assets/Gui/Scrolling/Scrolling.xml b/ShootingStars/assets/Gui/Scrolling/Scrolling.xml
index 26a004e..e8791cf 100644
--- a/ShootingStars/assets/Gui/Scrolling/Scrolling.xml
+++ b/ShootingStars/assets/Gui/Scrolling/Scrolling.xml
@@ -65,15 +65,12 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/ShootingStars/assets/Gui/style_map.xml b/ShootingStars/assets/Gui/style_map.xml
index 43cd46b..3d67f95 100644
--- a/ShootingStars/assets/Gui/style_map.xml
+++ b/ShootingStars/assets/Gui/style_map.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/ShootingStars/src/org/wyrez/shootingstars/gui/GameGUI.java b/ShootingStars/src/org/wyrez/shootingstars/gui/GameGUI.java
index b56442c..d9e1ab8 100644
--- a/ShootingStars/src/org/wyrez/shootingstars/gui/GameGUI.java
+++ b/ShootingStars/src/org/wyrez/shootingstars/gui/GameGUI.java
@@ -33,6 +33,7 @@ import tonegod.gui.controls.extras.Indicator;
import tonegod.gui.controls.lists.Dial;
import tonegod.gui.controls.text.Label;
import tonegod.gui.controls.windows.Panel;
+import tonegod.gui.controls.windows.Window;
import tonegod.gui.core.Screen;
/**
@@ -51,6 +52,7 @@ public class GameGUI extends Panel implements Gui{
private Label lblRemainingTime;
private ScreenHelper screenHelper;
private AudioDataManager audioDataManager;
+ private Panel pointsTimePanel;
public GameGUI(Screen screen, GameListener listener, ScreenHelper screenHelper, AudioDataManager audioDataManager) {
super(screen, new Vector2f(0f, 0f), new Vector2f(1280f, 720f)); //create for full hd
@@ -67,8 +69,8 @@ public class GameGUI extends Panel implements Gui{
float startPointx = screenHelper.calcX(537f);
float startPointy = screenHelper.calcY(576f);
- float startPointPointsx = screenHelper.calcX(1000f);
- float startPointPointsy = screenHelper.calcY(10f);
+ float startPointPointsx = screenHelper.calcX(1090f);
+ float startPointPointsy = screenHelper.calcY(390f);
float startPointYMenu = screenHelper.calcY(200f);
@@ -120,11 +122,13 @@ public class GameGUI extends Panel implements Gui{
indOverheat.setMaxValue(100f);
updateOverhead(0f);
- lblPoints = new Label(screen, new Vector2f(startPointPointsx, startPointPointsy), new Vector2f(screenHelper.calcX(275f), screenHelper.calcY(180f)));
+ pointsTimePanel = new Panel(screen, new Vector2f(startPointPointsx, startPointPointsy), new Vector2f(screenHelper.calcX(180f), screenHelper.calcY(65f)));
+
+ lblPoints = new Label(screen, new Vector2f(screenHelper.calcX(5f), 0), new Vector2f(screenHelper.calcX(150f), screenHelper.calcY(30f)));
lblPoints.setFontColor(new ColorRGBA(1f, 0f, 0f, 1f));
lblPoints.setFontSize(screenHelper.calcX(30f));
- lblRemainingTime = new Label(screen, new Vector2f(startPointPointsx, startPointPointsy), new Vector2f(screenHelper.calcX(275f), screenHelper.calcY(240f)));
+ lblRemainingTime = new Label(screen, new Vector2f(screenHelper.calcX(5f), screenHelper.calcX(25f)), new Vector2f(screenHelper.calcX(150f), screenHelper.calcY(30f)));
lblRemainingTime.setFontColor(new ColorRGBA(1f, 0f, 0f, 1f));
lblRemainingTime.setFontSize(screenHelper.calcX(30f));
@@ -132,14 +136,14 @@ public class GameGUI extends Panel implements Gui{
this.addChild(btnResume);
this.addChild(btnMenu);
this.addChild(indOverheat);
- this.addChild(lblPoints);
- this.addChild(lblRemainingTime);
+ pointsTimePanel.addChild(lblPoints);
+ pointsTimePanel.addChild(lblRemainingTime);
+ this.addChild(pointsTimePanel);
btnResume.hide();
btnMenu.hide();
indOverheat.hide();
- lblPoints.hide();
- lblRemainingTime.hide();
+ pointsTimePanel.hide();
}
public void setStart() {
@@ -147,8 +151,7 @@ public class GameGUI extends Panel implements Gui{
btnResume.hide();
btnMenu.hide();
indOverheat.show();
- lblPoints.show();
- lblRemainingTime.show();
+ pointsTimePanel.show();
}
public void setWait() {
@@ -156,8 +159,7 @@ public class GameGUI extends Panel implements Gui{
btnResume.hide();
btnMenu.hide();
indOverheat.hide();
- lblPoints.hide();
- lblRemainingTime.hide();
+ pointsTimePanel.hide();
}
public void showMenu() {
@@ -165,8 +167,7 @@ public class GameGUI extends Panel implements Gui{
btnResume.show();
btnMenu.show();
indOverheat.hide();
- lblPoints.hide();
- lblRemainingTime.hide();
+ pointsTimePanel.hide();
}
public void resumeGame() {
@@ -174,8 +175,7 @@ public class GameGUI extends Panel implements Gui{
btnResume.hide();
btnMenu.hide();
indOverheat.show();
- lblPoints.show();
- lblRemainingTime.show();
+ pointsTimePanel.show();
}
public void attach() {
diff --git a/ShootingStars/src/org/wyrez/shootingstars/gui/HighscoreGUI.java b/ShootingStars/src/org/wyrez/shootingstars/gui/HighscoreGUI.java
index 7265fe4..b48b430 100644
--- a/ShootingStars/src/org/wyrez/shootingstars/gui/HighscoreGUI.java
+++ b/ShootingStars/src/org/wyrez/shootingstars/gui/HighscoreGUI.java
@@ -76,8 +76,8 @@ public class HighscoreGUI extends BackgroundedGui implements Gui {
float labelFontSize = screenHelper.calcX(20f);
float buttonHeight = screenHelper.calcY(40f);
- float buttonWidth = screenHelper.calcX(153f);
- float buttonFontSize = screenHelper.calcX(20f);
+ float buttonWidth = screenHelper.calcX(180f);
+ float buttonFontSize = screenHelper.calcX(18f);
List highscores = highscoreManager.getScores();
@@ -99,7 +99,7 @@ public class HighscoreGUI extends BackgroundedGui implements Gui {
drawHighscores(highscores);
- Button btnBack = new ButtonBase(screen, new Vector2f(startPointx + screenHelper.calcX(1060f), startPointy + screenHelper.calcY(622.8f)), new Vector2f(buttonWidth, buttonHeight)) {
+ Button btnBack = new ButtonBase(screen, new Vector2f(startPointx + screenHelper.calcX(1060f), startPointy + screenHelper.calcY(622.8f)), new Vector2f(screenHelper.calcX(153f), buttonHeight)) {
@Override
public void onButtonMouseLeftUp(MouseButtonEvent evt, boolean toggled) {
listener.back();
diff --git a/ShootingStars/src/org/wyrez/shootingstars/gui/LoadingGui.java b/ShootingStars/src/org/wyrez/shootingstars/gui/LoadingGui.java
index abce187..9141e9e 100644
--- a/ShootingStars/src/org/wyrez/shootingstars/gui/LoadingGui.java
+++ b/ShootingStars/src/org/wyrez/shootingstars/gui/LoadingGui.java
@@ -55,9 +55,10 @@ public class LoadingGui extends BackgroundedGui implements Gui {
indProgress = new IndicatorBase(screen, new Vector2f(startPointx, startPointy),
new Vector2f(screenHelper.calcX(200f), screenHelper.calcY(30f)), Indicator.Orientation.HORIZONTAL);
- indProgress.setDisplayValues();
+ indProgress.setIndicatorImage("Gui/Indicator/indicator_ol_x.png");
+ indProgress.setDisplayValues();
indProgress.setMaxValue(LoadingProgress.getProgressCount());
- indProgress.setIndicatorColor(ColorRGBA.Black);
+ indProgress.setIndicatorColor(ColorRGBA.Black);
lblStatus = new Label(screen, new Vector2f(startPointx, startPointy + distancePogressbarLabely), new Vector2f(screenHelper.calcX(200f), screenHelper.calcY(30f)));
lblStatus.setTextAlign(BitmapFont.Align.Center);