From f6f10bca2e79fb54d1255398dff24e8ee056986d Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 19 Jul 2015 21:40:11 -0400 Subject: [PATCH] v0.3.1: overhauled font system, now only uses 2 bitmaps with one used in most cases. --- assets/{font3x.png => font.png} | Bin assets/font15x.png | Bin 1605 -> 0 bytes assets/font25x.png | Bin 2295 -> 0 bytes assets/font2x.png | Bin 4485 -> 0 bytes assets/{font1x.png => pixel_font.png} | Bin .../shatteredpixeldungeon/Assets.java | 7 +- .../scenes/PixelScene.java | 118 ++++++------------ .../scenes/RankingsScene.java | 6 +- .../scenes/TitleScene.java | 2 +- .../ui/DangerIndicator.java | 2 +- .../ui/GoldIndicator.java | 2 +- .../shatteredpixeldungeon/ui/ItemSlot.java | 6 +- .../shatteredpixeldungeon/ui/StatusPane.java | 6 +- .../windows/WndJournal.java | 2 +- 14 files changed, 52 insertions(+), 99 deletions(-) rename assets/{font3x.png => font.png} (100%) delete mode 100644 assets/font15x.png delete mode 100644 assets/font25x.png delete mode 100644 assets/font2x.png rename assets/{font1x.png => pixel_font.png} (100%) diff --git a/assets/font3x.png b/assets/font.png similarity index 100% rename from assets/font3x.png rename to assets/font.png diff --git a/assets/font15x.png b/assets/font15x.png deleted file mode 100644 index 068e93d043a208a2bafa53225112029d7d93c56d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1605 zcmV-L2DQN3MF0Q*fPjGi|Nj600Dypi|Ns92 zVIouj000AYQchC<008=S#NGe^1-eN@K~!ko?O1J&>o^YNlP=KRCr}qJ;IP6I7(PL@ z?thi}L4PFg^)7aS!2rQDjl_~n%9dE-mjTXBf{fvWb1_tt!Ds*g7=U4BW}S@;b2c(S zhSTY+3649+D0VYzfSENi8X0iXPtg*&#GOtKtA=w}C#nfD`hy%!+2evgbVz5^_eSH= zVAeSr;H)odT+FOF&CIx1XJas|GhhHP8UV8fJBf=u6L2n(0gO)K)yM!>myj8t=#$~w zI$WNSd;$P4tgCNxZB*ap>f2mhE}v7r&Go!*a~;4iI2!;4j$v@h=Po*TkwZ)_pBm<> zYgkuMF3PvL_D8wnb?1evS(651SfAlZ0M<1c;My0S0RVRauncq|BLn`m1K?cuMJ4hb zF)|o~UwT;pcqVQ_YjZXDPgF`3leQ+{XwmRQR0HlLOopN%@@g z!_vs1OTN-%2~RPuE0C`oG%Q3oJ5@;9RS!}G=Q7}dd7a*8Wp3n{OxY~3q6$Q z6ab9ma55S-Jn2%g@Am!K0&LnXK$(VQ0f3jM>GKRZ2v42>$YdcUvy`8N3yq4?ahsXl z_cP2x?Z|infZ}@q1nzS^n0Ekp5?P>2g5ep!cu4@z%=(-HB_!#R0N41_0(6DTHC&#A zbN9EqH3utra8kR&sN_`eT>#yhnXl6Z=P6?TEB>~q$S>`faqcO~m zz<{;y75I%a_@a=s#~?7S7+^R@iTF1`;IQ+QA5p~dh7$k>BJ%7P0CvkiSr10n{-Q9W zyZ}J*5deoFKrXIaP5@L4@Erh>8s!4`rKcD`jK0SJX4YRa2sE>n89wIW+>~w&DE~dZDP6IXUc-9{?!ugQhZF7C(^KGuf zWqq4#9r_zD08|=i=JXjDX62LaQ~far6ms!x76ANr06YYNOS{i?+~wO0PqzD;061%Q*7=Ulx4p{sRP*XQ zi(d`l_YtClw!+S3a5N>v*T zqhZ)JhNoiAFf)5IGy8n|_3_JoeVAE(Emlx@J8PF8dn@C8yl0rfK0e=o&$oAA3^V)n z_W5SN`dklIyaU6US+my#!2dwFbo&1Z{?{r0rj`7m@!#m%4`wO80Ve=HKd$2MxGKPa z+4FvN-X2#m{?-NkV*vP}e>436;0FLd^aFq&`q$E5M#|FPKHI{ diff --git a/assets/font25x.png b/assets/font25x.png deleted file mode 100644 index 46a2a9876897ab9e89301c6a43c342d2d5e16046..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2295 zcmaKuc{tSj7so%}Sqwsyb*!OOC}k@*8q1)YTbLP3QG*7P7{-L_#(X1bnT#n>DvcP8 zG0AT1T!r?LttgG;mTSGGFj=nq{Qm#_b6&6a^PE4*Pz9~`!NW#P)2+ZodO(B(1Ixj2O@*QDBhHy6Tiniq3m00QuFj6 z;@21!76!xc>gwwMd`%k8O!L+Pis5~TutrdMEi@MZ+3*7{j>Lq)soWvXJ3FQGUii(? zPnFJ9;{bg`-^HR&g}k!l{05U*&zNU5HQ0Y15qj1??byim0tzzFf?2zc_GG=C}-n2Me>Zdz0-zTF2Y(>ysv*gD7}SJC6Yk$ek$Cz5~|1K6qzD#tD2@?3un zhidp5D{{qlx3QMC0J9A}K7~lvB2C{AEI|>Tmzn!mSsbT=9tg^foV|eodAbtZ0NwN+ z{3A_g+0P?{nY^F?o0)%omb1DEz;XV+<~zj&1w&kppBm26Wjly$BLY1++xl)JsHCzd z_H8~i^xn%jBf0pDI68k!p}@*R@oMqTEF&PKvE7YSs4Ue{`9BTc%O=t|VZd-;A)x@% zvyglX!?r^3@8aGaC!yED?gMEwVRCDsTXT2G(3z4popie}hB6YI0?KW_EzTds#{3a} zHbDk-Y|RqPx@-7b+|CgEz2P}!kMSFZzxwlv5d#ew+vj_Ej@cg$bmnt9v~`hxTYbch z6zTmfaFu>BPfcJItXcw^){HiQ@hMamvElbKqUP=^g(V$YxXW2xchNwZx=_9Tq2M14 z?pQ7}62m557K)UdG~fvT5ewD*Q5}%|bUR>EWwfb+-lFrB z4BO^*WjWsmRfig|UVyvhv|z;MJ2PDy^0f|5g!#%`1IC`^xgrVnN#u?cy~P1GRX}e% z%`f={I4Xb?;l^8UV}7X~9&rOF#X*eOY$Q;2^|ffCy$tI3gzh0I2ZW7=x4!{5&JWGl z+0qlNT|TP7I`)Xz>4+>7?}qZLmvf-miS!ko9nmCT{;!jcy~3YfmO;@+H{SB-E9KVi zqIjEMh%(OpeP_)|zrF75()M)#y-9s9#E(x(IFVz+EXpXh_ zKEgZr0pk0!AIZ)+W{2!fd?=>PMJifd?R$~=#yqiXLiWmjmg7!_Q|zsrd1f%ojhvV^$r3?_Ph5$z(3>37XevnV`JA(QA6y0EwZ^&d`H?*?JF|Y{Hq-GkXj>3){M+s+wd_+b2mj!5VA@+mAYCZ60w|1^UAd2N75HfL4a}sch3&;rFDb z;9dJF?9andv&Wznk;flbQ7@y8CbZXHT;dj6?9;JP$U78NZJp_t`)kkbu&$ABq$_7aifv#lcHX1T8I@%r#j*>Xj$^^?9iofL8!+`i*g<&^%^RF%qH*=Gg<4mq6= z?+bb6nFOYmaotvK6Jn-OHfR22sn zy8*r06oQ-h9S{wjc7QBOFR}u9JL`@`>?q{(@-B*^dpb$JLLOPM?Ub+bL6bq5ntL;XZ|9f$`4x zN`Hluqdbe&pJp<5oM43C=k!xp0V42hc|L;ucCa=sVszjNe1vMO2&%NiUe|3SYiMYi zeH1o%JxDUe6$^TAhR*&|P&)AhDe15)$A)@VuxDm6_EV2$vnJfReXN*%TDt2J zud|-Aar`&luc)c~S8?;&$##8G-Sn1g!+Ckq7o&knhx4ZGzYnxbhpf(hGm(kCUVmoC zY|WFJ3ubBohLqrb`G#RV)3mmLSA;2|#Y!kxanF5vd8|c7Lc6+x_h+`=6Y@Rez%0W?5P00^K%(NEB=oBwZEB8+`FQK;fnYcxat@Ao)>Kjc#C HL{9k^p+6aC diff --git a/assets/font2x.png b/assets/font2x.png deleted file mode 100644 index 4bc3c342a4c7ed04eded3b74895ad6985e7ee844..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4485 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 X0naJ!oK2D%00000NkvXXu0mjfq*Xy# diff --git a/assets/font1x.png b/assets/pixel_font.png similarity index 100% rename from assets/font1x.png rename to assets/pixel_font.png diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/Assets.java b/src/com/shatteredpixel/shatteredpixeldungeon/Assets.java index de53fbb3d..678dd2c2f 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/Assets.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/Assets.java @@ -110,11 +110,8 @@ public class Assets { public static final String BUFFS_LARGE = "large_buffs.png"; public static final String SPELL_ICONS = "spell_icons.png"; - public static final String FONTS1X = "font1x.png"; - public static final String FONTS15X = "font15x.png"; - public static final String FONTS2X = "font2x.png"; - public static final String FONTS25X = "font25x.png"; - public static final String FONTS3X = "font3x.png"; + public static final String PIXELFONT = "pixel_font.png"; + public static final String FONT = "font.png"; public static final String THEME = "theme.mp3"; public static final String TUNE = "game.mp3"; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java index 48dc8c835..a2e6bd35e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java @@ -25,6 +25,7 @@ import javax.microedition.khronos.opengles.GL10; import android.opengl.GLES20; import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; +import com.watabou.glwrap.Texture; import com.watabou.input.Touchscreen; import com.watabou.noosa.BitmapText; import com.watabou.noosa.BitmapText.Font; @@ -53,20 +54,18 @@ public class PixelScene extends Scene { public static int maxDefaultZoom = 0; public static float minZoom; public static float maxZoom; - + public static Camera uiCamera; - - public static BitmapText.Font font1x; - public static BitmapText.Font font15x; - public static BitmapText.Font font2x; - public static BitmapText.Font font25x; - public static BitmapText.Font font3x; - + + public static BitmapText.Font pixelFont; + public static BitmapText.Font fontLinear; + public static BitmapText.Font fontNearest; + @Override public void create() { - + super.create(); - + GameScene.scene = null; float minWidth, minHeight; @@ -94,56 +93,41 @@ public class PixelScene extends Scene { minZoom = 1; maxZoom = defaultZoom * 2; - + Camera.reset( new PixelCamera( defaultZoom ) ); - + float uiZoom = defaultZoom; uiCamera = Camera.createFullscreen( uiZoom ); Camera.add( uiCamera ); - - if (font1x == null) { - + + if (pixelFont == null) { + // 3x5 (6) - font1x = Font.colorMarked( - BitmapCache.get( Assets.FONTS1X ), 0x00000000, BitmapText.Font.LATIN_FULL ); - font1x.baseLine = 6; - font1x.tracking = -1; - - // 5x8 (10) - font15x = Font.colorMarked( - BitmapCache.get( Assets.FONTS15X ), 12, 0x00000000, BitmapText.Font.LATIN_FULL ); - font15x.baseLine = 9; - font15x.tracking = -1; - - // 6x10 (12) - font2x = Font.colorMarked( - BitmapCache.get( Assets.FONTS2X ), 14, 0x00000000, BitmapText.Font.LATIN_FULL ); - font2x.baseLine = 11; - font2x.tracking = -1; - - // 7x12 (15) - font25x = Font.colorMarked( - BitmapCache.get( Assets.FONTS25X ), 17, 0x00000000, BitmapText.Font.LATIN_FULL ); - font25x.baseLine = 13; - font25x.tracking = -1; - + pixelFont = Font.colorMarked( + BitmapCache.get( Assets.PIXELFONT), 0x00000000, BitmapText.Font.LATIN_FULL ); + pixelFont.baseLine = 6; + pixelFont.tracking = -1; + // 9x15 (18) - font3x = Font.colorMarked( - BitmapCache.get( Assets.FONTS3X ), 22, 0x00000000, BitmapText.Font.LATIN_FULL ); - font3x.baseLine = 17; - font3x.tracking = -2; + fontLinear = Font.colorMarked( + BitmapCache.get( Assets.FONT), 22, 0x00000000, BitmapText.Font.LATIN_FULL ); + fontNearest = Font.colorMarked( + BitmapCache.get( "2", Assets.FONT), 22, 0x00000000, BitmapText.Font.LATIN_FULL ); + fontLinear.baseLine = fontNearest.baseLine = 17; + fontLinear.tracking = fontNearest.tracking = -2; + fontLinear.texture.filter(Texture.LINEAR, Texture.LINEAR); } } - + @Override public void destroy() { super.destroy(); Touchscreen.event.removeAll(); } - + public static BitmapText.Font font; public static float scale; - + public static void chooseFont( float size ) { chooseFont( size, defaultZoom ); } @@ -152,47 +136,19 @@ public class PixelScene extends Scene { float pt = size * zoom; - if (pt >= 19) { - - scale = pt / 19; - if (1.5 <= scale && scale < 2) { - font = font25x; - scale = (int)(pt / 14); - } else if (1.25 <= scale && scale < 1.5) { - font = font2x; - scale = (int)(pt / 12); - } else { - font = font3x; + if (pt >= 38){ - //at this point non integer scale values don't cause visual problems - if (scale < 2.25f) - scale = (int)scale; - } - - } else if (pt >= 14) { + font = fontNearest; + scale = pt / 19f; - scale = pt / 14; - font = font25x; - scale = (int)scale; - } else if (pt >= 12) { - - scale = pt / 12; - font = font2x; - scale = (int)scale; - - } else if (pt >= 10) { - - scale = pt / 10; - font = font15x; - scale = (int)scale; - + font = fontLinear; + scale = pt / 19f; + } else { - - font = font1x; - scale = Math.max( 1, (int)(pt / 7) ); - + font = pixelFont; + scale = 1f; } scale /= zoom; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java index fc62912c8..a54f6154e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java @@ -240,14 +240,14 @@ public class RankingsScene extends PixelScene { shield = new ItemSprite( ItemSpriteSheet.TOMB, null ); add( shield ); - position = new BitmapText( PixelScene.font1x ); + position = new BitmapText( PixelScene.pixelFont); position.alpha(0.8f); add( position ); desc = createMultiline( 7 ); add( desc ); - depth = new BitmapText( PixelScene.font1x ); + depth = new BitmapText( PixelScene.pixelFont); depth.alpha(0.8f); steps = new Image(); @@ -255,7 +255,7 @@ public class RankingsScene extends PixelScene { classIcon = new Image(); add( classIcon ); - level = new BitmapText( PixelScene.font1x ); + level = new BitmapText( PixelScene.pixelFont); level.alpha(0.8f); } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java index 413cc2ba1..cff468ae6 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java @@ -150,7 +150,7 @@ public class TitleScene extends PixelScene { btnHighscores.setPos( w / 2, btnPlay.top() ); } - BitmapText version = new BitmapText( "v " + Game.version + "", font1x ); + BitmapText version = new BitmapText( "v " + Game.version + "", pixelFont); version.measure(); version.hardlight( 0xCCCCCC ); version.x = w - version.width(); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/DangerIndicator.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/DangerIndicator.java index 490bfdca5..73d7a9e20 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/ui/DangerIndicator.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/DangerIndicator.java @@ -50,7 +50,7 @@ public class DangerIndicator extends Tag { protected void createChildren() { super.createChildren(); - number = new BitmapText( PixelScene.font1x ); + number = new BitmapText( PixelScene.pixelFont); add( number ); icon = Icons.SKULL.get(); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/GoldIndicator.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/GoldIndicator.java index 761de6318..77031925b 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/ui/GoldIndicator.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/GoldIndicator.java @@ -38,7 +38,7 @@ public class GoldIndicator extends Component { @Override protected void createChildren() { - tf = new BitmapText( PixelScene.font1x ); + tf = new BitmapText( PixelScene.pixelFont); tf.hardlight( 0xFFFF00 ); add( tf ); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java index cf8a167a8..f94a6624c 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/ItemSlot.java @@ -99,13 +99,13 @@ public class ItemSlot extends Button { icon = new ItemSprite(); add( icon ); - topLeft = new BitmapText( PixelScene.font1x ); + topLeft = new BitmapText( PixelScene.pixelFont); add( topLeft ); - topRight = new BitmapText( PixelScene.font1x ); + topRight = new BitmapText( PixelScene.pixelFont); add( topRight ); - bottomRight = new BitmapText( PixelScene.font1x ); + bottomRight = new BitmapText( PixelScene.pixelFont); add( bottomRight ); } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/StatusPane.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/StatusPane.java index 2445a0394..9383502e3 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/ui/StatusPane.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/StatusPane.java @@ -104,17 +104,17 @@ public class StatusPane extends Component { exp = new Image( Assets.XP_BAR ); add( exp ); - level = new BitmapText( PixelScene.font1x ); + level = new BitmapText( PixelScene.pixelFont); level.hardlight( 0xFFEBA4 ); add( level ); - depth = new BitmapText( Integer.toString( Dungeon.depth ), PixelScene.font1x ); + depth = new BitmapText( Integer.toString( Dungeon.depth ), PixelScene.pixelFont); depth.hardlight( 0xCACFC2 ); depth.measure(); add( depth ); Dungeon.hero.belongings.countIronKeys(); - keys = new BitmapText( PixelScene.font1x ); + keys = new BitmapText( PixelScene.pixelFont); keys.hardlight( 0xCACFC2 ); add( keys ); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java index 9b3f7b98c..4114ffa8e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java @@ -105,7 +105,7 @@ public class WndJournal extends Window { feature = PixelScene.createText( 9 ); add( feature ); - depth = new BitmapText( PixelScene.font1x ); + depth = new BitmapText( PixelScene.pixelFont); add( depth ); icon = Icons.get( Icons.DEPTH );