diff --git a/Art/ShootingStars.xcf b/Art/ShootingStars.xcf new file mode 100644 index 0000000..19288ab Binary files /dev/null and b/Art/ShootingStars.xcf differ diff --git a/Art/Waben.xcf b/Art/Waben.xcf new file mode 100644 index 0000000..c146855 Binary files /dev/null and b/Art/Waben.xcf differ diff --git a/Art/ss_field.png b/Art/ss_field.png new file mode 100644 index 0000000..0bff176 Binary files /dev/null and b/Art/ss_field.png differ diff --git a/ShootingStars/src/org/wyrez/shootingstars/gui/BackgroundedGui.java b/ShootingStars/src/org/wyrez/shootingstars/gui/BackgroundedGui.java index 1293749..e6d3f3e 100644 --- a/ShootingStars/src/org/wyrez/shootingstars/gui/BackgroundedGui.java +++ b/ShootingStars/src/org/wyrez/shootingstars/gui/BackgroundedGui.java @@ -31,16 +31,21 @@ public abstract class BackgroundedGui extends Panel implements Gui { protected final AssetManager assetManager; public BackgroundedGui(Screen screen, Vector2f position, Vector2f dimension, AssetManager assetManager) { - super(screen, position, dimension); - this.assetManager = assetManager; - addBackground(); + this(screen, position, dimension, assetManager, "Textures/bg.png"); } - private void addBackground() { + public BackgroundedGui(Screen screen, Vector2f position, Vector2f dimension, + AssetManager assetManager, String texture) { + super(screen, position, dimension); + this.assetManager = assetManager; + addBackground(texture); + } + + private void addBackground(String texture) { Picture bgImage = new Picture("Background"); bgImage.setWidth(screen.getWidth()); bgImage.setHeight(screen.getHeight()); - bgImage.setImage(assetManager, "Textures/bg.png", false); + bgImage.setImage(assetManager, texture, false); Panel bg = new Panel(screen, new Vector2f(0f, 0f)); bg.centerToParent(); bg.attachChild(bgImage); diff --git a/ShootingStars/src/org/wyrez/shootingstars/gui/LoadingGui.java b/ShootingStars/src/org/wyrez/shootingstars/gui/LoadingGui.java index aec43fc..abce187 100644 --- a/ShootingStars/src/org/wyrez/shootingstars/gui/LoadingGui.java +++ b/ShootingStars/src/org/wyrez/shootingstars/gui/LoadingGui.java @@ -31,14 +31,15 @@ import tonegod.gui.core.Screen; * * @author Darth Affe */ -public class LoadingGui extends BackgroundedGui implements Gui{ +public class LoadingGui extends BackgroundedGui implements Gui { private Label lblStatus; private Indicator indProgress; private ScreenHelper screenHelper; public LoadingGui(Screen screen, ScreenHelper screenHelper, AssetManager assetManager) { - super(screen, new Vector2f(0f, 0f), new Vector2f(1280f, 720f), assetManager); //create for full hd + super(screen, new Vector2f(0f, 0f), new Vector2f(1280f, 720f), + assetManager, "Textures/ShootingStars.png"); //create for full hd this.screenHelper = screenHelper; this.setIgnoreMouse(true); this.setIsVisible(false); @@ -46,7 +47,7 @@ public class LoadingGui extends BackgroundedGui implements Gui{ } private void create() { - + float startPointx = screenHelper.calcX(537f); float startPointy = screenHelper.calcY(576f); float distancePogressbarLabely = screenHelper.calcY(36f);