From 52b69b50e420f6bee58059c2dc100e24761b4540 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 2 Mar 2016 20:50:52 -0500 Subject: [PATCH] v0.3.4c: removed font zoom cap --- .../shatteredpixeldungeon/scenes/PixelScene.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java index d18742c0e..e7e50580f 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java @@ -26,7 +26,6 @@ import com.shatteredpixel.shatteredpixeldungeon.Badges; import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; import com.shatteredpixel.shatteredpixeldungeon.effects.BadgeBanner; import com.shatteredpixel.shatteredpixeldungeon.ui.RenderedTextMultiline; -import com.shatteredpixel.shatteredpixeldungeon.ui.Window; import com.watabou.glwrap.Texture; import com.watabou.input.Touchscreen; import com.watabou.noosa.BitmapText; @@ -60,8 +59,6 @@ public class PixelScene extends Scene { public static Camera uiCamera; - public static Class windowOnCreate; - //stylized pixel font public static BitmapText.Font pixelFont; //These represent various mipmaps of the same font @@ -198,11 +195,8 @@ public class PixelScene extends Scene { } public static RenderedText renderText( String text, int size ) { - //rendering above 6x is a waste of resources, can just scale from there. - int zoom = Math.min(defaultZoom, 6); - RenderedText result = new RenderedText( text, size*zoom); - //adding 0.001f helps with smoothness on lower resolution devices. - result.scale.set(1/(float)zoom); + RenderedText result = new RenderedText( text, size*defaultZoom); + result.scale.set(1/(float)defaultZoom); return result; } @@ -211,9 +205,8 @@ public class PixelScene extends Scene { } public static RenderedTextMultiline renderMultiline( String text, int size ){ - int zoom = Math.min(defaultZoom, 6); - RenderedTextMultiline result = new RenderedTextMultiline( text, size*zoom); - result.zoom(1/(float)zoom); + RenderedTextMultiline result = new RenderedTextMultiline( text, size*defaultZoom); + result.zoom(1/(float)defaultZoom); return result; }