diff --git a/core/assets/sprites/buttons/play.png b/core/assets/sprites/buttons/play.png deleted file mode 100644 index 5b0b50f..0000000 Binary files a/core/assets/sprites/buttons/play.png and /dev/null differ diff --git a/core/assets/sprites/buttons/playHover.png b/core/assets/sprites/buttons/playHover.png deleted file mode 100644 index dc5d64b..0000000 Binary files a/core/assets/sprites/buttons/playHover.png and /dev/null differ diff --git a/core/src/com/saltosion/gladiator/gui/creators/MainMenuGUICreator.java b/core/src/com/saltosion/gladiator/gui/creators/MainMenuGUICreator.java index 7cb28c6..876e927 100644 --- a/core/src/com/saltosion/gladiator/gui/creators/MainMenuGUICreator.java +++ b/core/src/com/saltosion/gladiator/gui/creators/MainMenuGUICreator.java @@ -3,7 +3,6 @@ package com.saltosion.gladiator.gui.creators; import com.saltosion.gladiator.gui.nodes.ButtonNode; import com.saltosion.gladiator.gui.nodes.TextNode; import com.saltosion.gladiator.util.AppUtil; -import com.saltosion.gladiator.util.Log; import com.saltosion.gladiator.util.Name; import com.saltosion.gladiator.util.SpriteLoader; @@ -17,8 +16,8 @@ public class MainMenuGUICreator implements GUICreator { titleText.setPosition(0.23f, 0.8f); AppUtil.guiManager.getRootNode().addChild(titleText); - ButtonNode playButton = new ButtonNode("Play Button", SpriteLoader.loadSprite(Name.BUTTON_PLAY_HOVER), - SpriteLoader.loadSprite(Name.BUTTON_PLAY)) { + ButtonNode playButton = new ButtonNode("Play Button", SpriteLoader.loadSprite(Name.BUTTON_BIG), + SpriteLoader.loadSprite(Name.BUTTON_BIG_HOVER)) { @Override public void pressed(int x, int y, int mouseButton) { } @@ -29,6 +28,9 @@ public class MainMenuGUICreator implements GUICreator { } }; playButton.setPosition(0.5f, 0.5f); + TextNode playButtonText = new TextNode("Play Button Text", "Play"); + playButtonText.setPosition(-0.0325f, 0.0175f); + playButton.addChild(playButtonText); AppUtil.guiManager.getRootNode().addChild(playButton); } diff --git a/core/src/com/saltosion/gladiator/input/InputHandler.java b/core/src/com/saltosion/gladiator/input/InputHandler.java index e98757c..b05a6c4 100644 --- a/core/src/com/saltosion/gladiator/input/InputHandler.java +++ b/core/src/com/saltosion/gladiator/input/InputHandler.java @@ -104,7 +104,7 @@ public class InputHandler implements InputProcessor { float x1 = node.getPosition().x + width / 2; float y0 = node.getPosition().y - height / 2; float y1 = node.getPosition().y + height / 2; - x += 0.01f; + x += 0.0065f; if (node instanceof InteractiveProperty) { InteractiveProperty interactiveNode = (InteractiveProperty) node; diff --git a/core/src/com/saltosion/gladiator/util/Name.java b/core/src/com/saltosion/gladiator/util/Name.java index a881e16..1a88ccb 100644 --- a/core/src/com/saltosion/gladiator/util/Name.java +++ b/core/src/com/saltosion/gladiator/util/Name.java @@ -11,8 +11,12 @@ public class Name { public static final String WALLIMG = "WALLIMG"; public static final String SWINGHITBOXIMG = "SWINGHITBOXIMG"; - public static final String BUTTON_PLAY = "BUTTON_PLAY"; - public static final String BUTTON_PLAY_HOVER = "BUTTON_PLAY_HOVER"; + public static final String BUTTON_HUGE = "BUTTON_HUGE"; + public static final String BUTTON_HUGE_HOVER = "BUTTON_HUGE_HOVER"; + public static final String BUTTON_BIG = "BUTTON_BIG"; + public static final String BUTTON_BIG_HOVER = "BUTTON_BIG_HOVER"; + public static final String BUTTON_SMALL = "BUTTON_SMALL"; + public static final String BUTTON_SMALL_HOVER = "BUTTON_SMALL_HOVER"; public static final String MOVE_LEFT = "MOVE_LEFT"; public static final String MOVE_RIGHT = "MOVE_RIGHT"; diff --git a/core/src/com/saltosion/gladiator/util/SpriteLoader.java b/core/src/com/saltosion/gladiator/util/SpriteLoader.java index 9bfa6bd..eab96d1 100644 --- a/core/src/com/saltosion/gladiator/util/SpriteLoader.java +++ b/core/src/com/saltosion/gladiator/util/SpriteLoader.java @@ -17,8 +17,12 @@ public class SpriteLoader { loadTexture(Name.GROUNDIMG, "sprites/ground.png"); loadTexture(Name.WALLIMG, "sprites/wall.png"); loadTexture(Name.SWINGHITBOXIMG, "sprites/swinghitbox.png"); - loadTexture(Name.BUTTON_PLAY, "sprites/buttons/play.png"); - loadTexture(Name.BUTTON_PLAY_HOVER, "sprites/buttons/playHover.png"); + loadTexture(Name.BUTTON_HUGE, "sprites/buttons/Button_Huge.png"); + loadTexture(Name.BUTTON_HUGE_HOVER, "sprites/buttons/Button_Huge_Hover.png"); + loadTexture(Name.BUTTON_BIG, "sprites/buttons/Button_Big.png"); + loadTexture(Name.BUTTON_BIG_HOVER, "sprites/buttons/Button_Big_Hover.png"); + loadTexture(Name.BUTTON_SMALL, "sprites/buttons/Button_Small.png"); + loadTexture(Name.BUTTON_SMALL_HOVER, "sprites/buttons/Button_Small_Hover.png"); } /**