LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.3.1: changes to text scaling, should hopefully make it more consistent, especially at high resolutions.

Browse Source
This commit is contained in:
Evan Debenham 2015-07-02 03:07:54 -04:00 committed by Evan Debenham
parent 20a6f91758
commit e881dcf4f3
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java
View File

@ -158,43 +158,35 @@ public class PixelScene extends Scene {
if (1.5 <= scale && scale < 2) {
font = font25x;
scale = (int)(pt / 14);
} else {
font = font3x;
scale = (int)scale;
}
} else if (pt >= 14) {
scale = pt / 14;
if (1.8 <= scale && scale < 2) {
} else if (1.25 <= scale && scale < 1.5) {
font = font2x;
scale = (int)(pt / 12);
} else {
font = font3x;
//at this point non integer scale values don't cause visual problems
if (scale < 2.25f)
scale = (int)scale;
}
} else if (pt >= 14) {
scale = pt / 14;
font = font25x;
scale = (int)scale;
}
} else if (pt >= 12) {
scale = pt / 12;
if (1.7 <= scale && scale < 2) {
font = font15x;
scale = (int)(pt / 10);
} else {
font = font2x;
scale = (int)scale;
}
} else if (pt >= 10) {
scale = pt / 10;
if (1.4 <= scale && scale < 2) {
font = font1x;
scale = (int)(pt / 7);
} else {
font = font15x;
scale = (int)scale;
}
} else {
@ -202,7 +194,7 @@ public class PixelScene extends Scene {
scale = Math.max( 1, (int)(pt / 7) );
}
scale /= zoom;
}