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

ehh stuff isWidescreen

Browse Source
This commit is contained in:
yugecin 2018-10-20 20:39:35 +02:00
parent 425860ca7c
commit 8d6e34faaf
No known key found for this signature in database
GPG Key ID: 2C5AC035A7068E44
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/itdelatrisu/opsu/states/SongMenu.java
View File

@ -404,7 +404,7 @@ public class SongMenu extends ComplexOpsuState {
// selection buttons // selection buttons
// TODO: the origin should be bottomleft or something // TODO: the origin should be bottomleft or something
float selectX = width * (displayContainer.isWidescreen() ? 0.164f : 0.1875f); float selectX = width * (isWidescreen ? 0.164f : 0.1875f);
final float footerButtonWidth = footerHeight * 0.84f; final float footerButtonWidth = footerHeight * 0.84f;
selectModeButton = new MenuButton(SELECTION_MODE_OVERLAY, selectX, footerY); selectModeButton = new MenuButton(SELECTION_MODE_OVERLAY, selectX, footerY);
selectX += footerHeight + 2; selectX += footerHeight + 2;

5
src/yugecin/opsudance/core/DisplayContainer.java
View File

@ -401,6 +401,7 @@ public class DisplayContainer implements ErrorDumpable, SkinChangedListener {
height = displayMode.getHeight(); height = displayMode.getHeight();
width2 = width / 2; width2 = width / 2;
height2 = height / 2; height2 = height / 2;
isWidescreen = width * 1000 / height > 1500; // 1777 = 16:9, 1333 = 4:3
Display.setDisplayMode(displayMode); Display.setDisplayMode(displayMode);
Display.setFullscreen(fullscreen); Display.setFullscreen(fullscreen);
@ -460,10 +461,6 @@ public class DisplayContainer implements ErrorDumpable, SkinChangedListener {
return (Sys.getTime() * 1000) / Sys.getTimerResolution(); return (Sys.getTime() * 1000) / Sys.getTimerResolution();
} }
public boolean isWidescreen() {
return width * 1000 / height > 1500; // 1777 = 16:9, 1333 = 4:3
}
@Override @Override
public void writeErrorDump(StringWriter dump) { public void writeErrorDump(StringWriter dump) {
dump.append("> DisplayContainer dump\n"); dump.append("> DisplayContainer dump\n");

1
src/yugecin/opsudance/core/InstanceContainer.java
View File

@ -79,6 +79,7 @@ public class InstanceContainer {
public static GamePauseMenu pauseState; public static GamePauseMenu pauseState;
public static int width, width2, height, height2; public static int width, width2, height, height2;
public static boolean isWidescreen;
public static int mouseX, mouseY; public static int mouseX, mouseY;
public static int renderDelta; public static int renderDelta;

1
src/yugecin/opsudance/ui/OptionsOverlay.java
View File

@ -218,7 +218,6 @@ public class OptionsOverlay implements ResolutionChangedListener, SkinChangedLis
public void revalidate() { public void revalidate() {
this.dirty = false; this.dirty = false;
boolean isWidescreen = displayContainer.isWidescreen();
targetWidth = (int) (width * (isWidescreen ? 0.4f : 0.5f)); targetWidth = (int) (width * (isWidescreen ? 0.4f : 0.5f));
// calculate positions // calculate positions