Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix menu buttons vertical offset

Browse Source
This commit is contained in:
yugecin 2018-07-07 23:14:39 +02:00
parent c2f354a397
commit 2506a0b989
No known key found for this signature in database
GPG Key ID: 2C5AC035A7068E44
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/itdelatrisu/opsu/states/MainMenu.java
View File

@ -258,10 +258,10 @@ public class MainMenu extends BaseOpsuState {
this.buttonPositions[1] = new ImagePosition(MENU_OPTIONS.getImage()); this.buttonPositions[1] = new ImagePosition(MENU_OPTIONS.getImage());
this.buttonPositions[2] = new ImagePosition(MENU_EXIT.getImage()); this.buttonPositions[2] = new ImagePosition(MENU_EXIT.getImage());
final int basey = displayContainer.height / 2 - MENU_OPTIONS.getImage().getHeight() / 2; final int basey = displayContainer.height / 2 - MENU_OPTIONS.getImage().getHeight() / 2;
final float halfradius = MENU_LOGO.getImage().getHeight() * 0.44498f / 2f; final float yoffset = MENU_LOGO.getImage().getHeight() * 0.196378f;
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
this.buttonPositions[i].width = MENU_OPTIONS.getImage().getWidth(); this.buttonPositions[i].width = MENU_OPTIONS.getImage().getWidth();
this.buttonPositions[i].y = (int) (basey + (i - 1f) * halfradius); this.buttonPositions[i].y = (int) (basey + (i - 1f) * yoffset);
this.buttonPositions[i].height = MENU_OPTIONS.getImage().getHeight(); this.buttonPositions[i].height = MENU_OPTIONS.getImage().getHeight();
} }
} }
@ -348,13 +348,13 @@ public class MainMenu extends BaseOpsuState {
MENU_EXIT.getImage() MENU_EXIT.getImage()
}; };
final float circleradius = MENU_LOGO.getImage().getHeight() * 0.44498f; final float circleradius = MENU_LOGO.getImage().getHeight() * 0.44498f;
final float halfradius = circleradius / 2f; final float yoffset = MENU_LOGO.getImage().getHeight() * 0.196378f;
final float cr = circleradius * totalLogoScale; final float cr = circleradius * totalLogoScale;
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
final float hoverprogress = this.buttonAnimations[i].getValue(); final float hoverprogress = this.buttonAnimations[i].getValue();
final int bx = x + (int) (btnwidth * 0.075f * hoverprogress); final int bx = x + (int) (btnwidth * 0.075f * hoverprogress);
this.buttonPositions[i].x = bx; this.buttonPositions[i].x = bx;
final float yoff = (i - 1f) * halfradius; final float yoff = (i - 1f) * yoffset;
final double cliptop = cr * cos(asin((yoff - btnhalfheight) / cr)); final double cliptop = cr * cos(asin((yoff - btnhalfheight) / cr));
final double clipbot = cr * cos(asin((yoff + btnhalfheight) / cr)); final double clipbot = cr * cos(asin((yoff + btnhalfheight) / cr));
final float clipxstart = bx - this.logo.middleX(); final float clipxstart = bx - this.logo.middleX();