From e9f7dc758eab4b24a3c9ed6ff9cd078ac10c1718 Mon Sep 17 00:00:00 2001 From: Collin Smith Date: Sat, 6 Apr 2019 23:46:29 -0700 Subject: [PATCH] Fixes #43 --- core/src/com/riiablo/codec/FontTBL.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/core/src/com/riiablo/codec/FontTBL.java b/core/src/com/riiablo/codec/FontTBL.java index c168ce27..0488c812 100644 --- a/core/src/com/riiablo/codec/FontTBL.java +++ b/core/src/com/riiablo/codec/FontTBL.java @@ -8,6 +8,9 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.glutils.PixmapTextureData; import com.badlogic.gdx.utils.GdxRuntimeException; import com.badlogic.gdx.utils.StreamUtils; +import com.riiablo.codec.util.BBox; +import com.riiablo.graphics.PaletteIndexedPixmap; +import com.riiablo.util.BufferUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringEscapeUtils; @@ -19,12 +22,6 @@ import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import com.riiablo.codec.DC; -import com.riiablo.codec.DC6; -import com.riiablo.codec.util.BBox; -import com.riiablo.graphics.PaletteIndexedPixmap; -import com.riiablo.util.BufferUtils; - public class FontTBL { private static final String TAG = "FontTBL"; private static final boolean DEBUG = true; @@ -77,10 +74,10 @@ public class FontTBL { glyph.srcY = (c / 16) * (charHeight + CHAR_SHEET_PADDING); CharData cData = FontTBL.this.cData[c]; - glyph.width = cData.width; + glyph.width = cData.width + 1; glyph.height = charHeight; // this was {@code charHeight - 1} before, maybe because of no glyph padding in the backing texture glyph.yoffset = -(2 * glyph.height); - glyph.xadvance = glyph.width; + glyph.xadvance = cData.width; // This was messing with //if (glyph.width > 0 && glyph.height > 0 && glyph.yoffset < descent) descent = glyph.yoffset;