From 94d657d7bec47b683c17ade4c723e9e35f5935c1 Mon Sep 17 00:00:00 2001 From: DaniTheSkunk Date: Sun, 9 Oct 2022 02:25:15 +0000 Subject: [PATCH] added monospace functions to fonts --- com/danitheskunk/skunkworks/gfx/font/FontTTF.java | 10 ++++++++++ com/danitheskunk/skunkworks/gfx/font/FontTileset.java | 10 ++++++++++ com/danitheskunk/skunkworks/gfx/font/IFont.java | 2 ++ 3 files changed, 22 insertions(+) diff --git a/com/danitheskunk/skunkworks/gfx/font/FontTTF.java b/com/danitheskunk/skunkworks/gfx/font/FontTTF.java index ff199b6..7771d04 100644 --- a/com/danitheskunk/skunkworks/gfx/font/FontTTF.java +++ b/com/danitheskunk/skunkworks/gfx/font/FontTTF.java @@ -86,6 +86,16 @@ public class FontTTF implements IFont { return false; } + @Override + public boolean isMonospace() { + return false; + } + + @Override + public Vec2i getMonospaceSize() { + throw new RuntimeException("Not a monospace font"); + } + @Override public int getLineHeight(int ch) { cacheChar(ch); diff --git a/com/danitheskunk/skunkworks/gfx/font/FontTileset.java b/com/danitheskunk/skunkworks/gfx/font/FontTileset.java index 9091b30..145a99a 100644 --- a/com/danitheskunk/skunkworks/gfx/font/FontTileset.java +++ b/com/danitheskunk/skunkworks/gfx/font/FontTileset.java @@ -24,6 +24,16 @@ public class FontTileset implements IFont { return true; } + @Override + public boolean isMonospace() { + return true; + } + + @Override + public Vec2i getMonospaceSize() { + return charSize; + } + @Override public int getLineHeight(int ch) { return charSize.getY(); diff --git a/com/danitheskunk/skunkworks/gfx/font/IFont.java b/com/danitheskunk/skunkworks/gfx/font/IFont.java index 86ad09b..f5a8299 100644 --- a/com/danitheskunk/skunkworks/gfx/font/IFont.java +++ b/com/danitheskunk/skunkworks/gfx/font/IFont.java @@ -9,4 +9,6 @@ public interface IFont { ITexture getTexture(int ch); int getXAdvance(int ch); boolean isCP437(); + boolean isMonospace(); + Vec2i getMonospaceSize(); }