From 7fdbe645e42a5af7fdca6057370f6b8db446c4f9 Mon Sep 17 00:00:00 2001
From: Speiger <Speiger@gmx.net>
Date: Fri, 26 Jul 2024 17:36:08 +0200
Subject: [PATCH] Started the rework of the font system so the system works
 better.

---
 .../speiger/src/coreengine/NewInputTest.java  |  9 ++-
 .../coreengine/rendering/gui/font/Font.java   | 56 +++++++++++++++++++
 .../rendering/gui/font/FontGroup.java         | 37 +++---------
 .../rendering/gui/font/glyth/Glyth.java       | 11 +++-
 .../rendering/gui/font/glyth/GlythData.java   | 31 ++++++----
 .../gui/font/glyth/UnbakedGlyth.java          | 22 ++++++++
 .../gui/font/providers/BitmapProivder.java    | 23 ++++----
 .../gui/font/providers/IFontProvider.java     |  4 +-
 .../font/providers/STBTrueTypeProvider.java   | 18 +++---
 9 files changed, 143 insertions(+), 68 deletions(-)
 create mode 100644 src/main/java/speiger/src/coreengine/rendering/gui/font/Font.java
 create mode 100644 src/main/java/speiger/src/coreengine/rendering/gui/font/glyth/UnbakedGlyth.java

diff --git a/src/main/java/speiger/src/coreengine/NewInputTest.java b/src/main/java/speiger/src/coreengine/NewInputTest.java
index d5b843d..08fee3e 100644
--- a/src/main/java/speiger/src/coreengine/NewInputTest.java
+++ b/src/main/java/speiger/src/coreengine/NewInputTest.java
@@ -14,8 +14,8 @@ import speiger.src.coreengine.assets.base.IAsset;
 import speiger.src.coreengine.assets.base.IAssetPackage;
 import speiger.src.coreengine.assets.base.IAssetProvider;
 import speiger.src.coreengine.rendering.gui.font.glyth.Glyth;
-import speiger.src.coreengine.rendering.gui.font.glyth.GlythData;
-import speiger.src.coreengine.rendering.gui.font.glyth.GlythData.GlythBaker;
+import speiger.src.coreengine.rendering.gui.font.glyth.UnbakedGlyth;
+import speiger.src.coreengine.rendering.gui.font.glyth.UnbakedGlyth.GlythBaker;
 import speiger.src.coreengine.rendering.gui.font.glyth.IGlythSheetInfo;
 import speiger.src.coreengine.rendering.gui.font.providers.IFontProvider;
 import speiger.src.coreengine.rendering.gui.font.providers.STBTrueTypeProvider;
@@ -99,7 +99,7 @@ public class NewInputTest {
 			else if(T.key() == GLFW.GLFW_KEY_Z) {
 				T.cancel();
 				texture.bind();
-				GlythData data = provider.glythData("C".codePointAt(0), 0);
+				UnbakedGlyth data = provider.glythData("C".codePointAt(0), 0);
 				data.bake(new GlythBaker() {
 					@Override
 					public Glyth bake(IGlythSheetInfo info) {
@@ -108,8 +108,7 @@ public class NewInputTest {
 						info.upload(half - (width >> 2), half - (height >> 2));
 						return null;
 					}
-				});
-				System.out.println("Testing: "+data.advance()+", "+bit.getCharacter("C".codePointAt(0), false).getXAdvance());
+				}, 1F, 1F);
 			}
 		});
 		
diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/font/Font.java b/src/main/java/speiger/src/coreengine/rendering/gui/font/Font.java
new file mode 100644
index 0000000..636e7ca
--- /dev/null
+++ b/src/main/java/speiger/src/coreengine/rendering/gui/font/Font.java
@@ -0,0 +1,56 @@
+package speiger.src.coreengine.rendering.gui.font;
+
+import speiger.src.collections.ints.maps.impl.hash.Int2ObjectOpenHashMap;
+import speiger.src.collections.ints.maps.interfaces.Int2ObjectMap;
+import speiger.src.coreengine.rendering.gui.font.glyth.Glyth;
+import speiger.src.coreengine.rendering.gui.font.glyth.GlythData;
+import speiger.src.coreengine.rendering.gui.font.glyth.UnbakedGlyth.GlythBaker;
+
+public class Font {
+	FontGroup fonts;
+	GlythBaker baker;
+	float size;
+	float oversample;
+	GlythCache[] styledCache = new GlythCache[] {new GlythCache(0), new GlythCache(1), new GlythCache(2), new GlythCache(3)};
+	
+	private Font(FontGroup fonts, GlythBaker baker, float size, float oversample) {
+		this.fonts = fonts;
+		this.baker = baker;
+		this.size = size;
+		this.oversample = oversample;
+	}
+	
+	public GlythData data(int codepoint, int style) {
+		return styledCache[style & 0x3].data(codepoint);
+	}
+	
+	public Glyth glyth(int codepoint, int style) {
+		return styledCache[style & 0x3].glyth(codepoint);
+	}
+	
+	private class GlythCache {
+		final int style;
+		Int2ObjectMap<GlythData> data = new Int2ObjectOpenHashMap<>();
+		Int2ObjectMap<Glyth> glyth = new Int2ObjectOpenHashMap<>();
+		
+		public GlythCache(int style) {
+			this.style = style;
+		}
+
+		public GlythData data(int codepoint) {
+			return data.computeIfAbsent(codepoint, this::compute);
+		}
+		
+		public Glyth glyth(int codepoint) {
+			return glyth.computeIfAbsent(codepoint, this::bake);
+		}
+		
+		private GlythData compute(int codepoint) {
+			return new GlythData(fonts.data(codepoint, style), size);
+		}
+		
+		private Glyth bake(int codepoint) {
+			return fonts.data(codepoint, style).bake(baker, size, oversample);
+		}
+	}
+}
diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/font/FontGroup.java b/src/main/java/speiger/src/coreengine/rendering/gui/font/FontGroup.java
index 91451b5..c5136e1 100644
--- a/src/main/java/speiger/src/coreengine/rendering/gui/font/FontGroup.java
+++ b/src/main/java/speiger/src/coreengine/rendering/gui/font/FontGroup.java
@@ -5,31 +5,23 @@ import java.util.List;
 import speiger.src.collections.ints.maps.impl.hash.Int2ObjectOpenHashMap;
 import speiger.src.collections.ints.maps.interfaces.Int2ObjectMap;
 import speiger.src.coreengine.assets.AssetLocation;
-import speiger.src.coreengine.rendering.gui.font.glyth.Glyth;
-import speiger.src.coreengine.rendering.gui.font.glyth.GlythData;
-import speiger.src.coreengine.rendering.gui.font.glyth.GlythData.GlythBaker;
+import speiger.src.coreengine.rendering.gui.font.glyth.UnbakedGlyth;
 import speiger.src.coreengine.rendering.gui.font.providers.IFontProvider;
 
 public class FontGroup {
 	AssetLocation locations;
 	List<IFontProvider> providers;
-	GlythBaker baker;
 	StyledFont[] cache = new StyledFont[] {new StyledFont(0), new StyledFont(1), new StyledFont(2), new StyledFont(3)};
 	
-	public FontGroup(AssetLocation locations, List<IFontProvider> providers, GlythBaker baker) {
+	public FontGroup(AssetLocation locations, List<IFontProvider> providers) {
 		this.locations = locations;
 		this.providers = providers;
-		this.baker = baker;
 	}
 	
-	public GlythData data(int codepoint, int style) {
+	public UnbakedGlyth data(int codepoint, int style) {
 		return cache[style & 0x3].data(codepoint);
 	}
 	
-	public Glyth glyth(int codepoint, int style) {
-		return cache[style & 0x3].glyth(codepoint);
-	}
-	
 	public void close() {
 		providers.forEach(IFontProvider::close);
 		providers.clear();
@@ -37,35 +29,22 @@ public class FontGroup {
 	
 	private class StyledFont {
 		final int style;
-		Int2ObjectMap<Glyth> bakedGlyths = new Int2ObjectOpenHashMap<>();
-		Int2ObjectMap<GlythData> dataGlyths = new Int2ObjectOpenHashMap<>();
+		Int2ObjectMap<UnbakedGlyth> dataGlyths = new Int2ObjectOpenHashMap<>();
 		
 		public StyledFont(int style) {
 			this.style = style;
 		}
 		
-		public GlythData data(int codepoint) { 
+		public UnbakedGlyth data(int codepoint) { 
 			return dataGlyths.computeIfAbsent(codepoint, this::compute);
 		}
-		
-		public Glyth glyth(int codepoint) {
-			return bakedGlyths.computeIfAbsent(codepoint, this::bake);
-		}
-		
-		private GlythData compute(int codepoint) {
+				
+		private UnbakedGlyth compute(int codepoint) {
 			for(int i = 0,m=providers.size();i<m;i++) {
-				GlythData data = providers.get(i).glythData(codepoint, style);
+				UnbakedGlyth data = providers.get(i).glythData(codepoint, style);
 				if(data != null) return data;
 			}
 			return null;
 		}
-		
-		private Glyth bake(int codepoint) {
-			for(int i = 0,m=providers.size();i<m;i++) {
-				GlythData data = providers.get(i).glythData(codepoint, style);
-				if(data != null) return data.bake(baker);
-			}
-			return null;
-		}
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/font/glyth/Glyth.java b/src/main/java/speiger/src/coreengine/rendering/gui/font/glyth/Glyth.java
index a663f24..aa93c76 100644
--- a/src/main/java/speiger/src/coreengine/rendering/gui/font/glyth/Glyth.java
+++ b/src/main/java/speiger/src/coreengine/rendering/gui/font/glyth/Glyth.java
@@ -1,6 +1,13 @@
 package speiger.src.coreengine.rendering.gui.font.glyth;
 
-public record Glyth(int texture, float minU, float minV, float maxU, float maxV) {
-	public static final Glyth EMPTY = new Glyth(-1, 0, 0, 0, 0);
+public record Glyth(int texture, float minU, float minV, float maxU, float maxV, int left, int right, int top, int bottom) {
+	public static final Glyth EMPTY = new Glyth();
 	
+	private Glyth() {
+		this(-1, 0F, 0F, 0F, 0F, 0, 0, 0, 0);
+	}
+	
+	public Glyth(int texture, float minU, float minV, float maxU, float maxV) {
+		this(texture, minU, minV, maxU, maxV, 0, 0, 0, 0);
+	}
 }
diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/font/glyth/GlythData.java b/src/main/java/speiger/src/coreengine/rendering/gui/font/glyth/GlythData.java
index e7bade0..eaaa04e 100644
--- a/src/main/java/speiger/src/coreengine/rendering/gui/font/glyth/GlythData.java
+++ b/src/main/java/speiger/src/coreengine/rendering/gui/font/glyth/GlythData.java
@@ -1,17 +1,26 @@
 package speiger.src.coreengine.rendering.gui.font.glyth;
 
-public interface GlythData {
-	public float advance();
-	public default float shadowOffset() { return 1F; }
-	public Glyth bake(GlythBaker baker);
+import speiger.src.collections.ints.functions.function.Int2FloatFunction;
+import speiger.src.collections.ints.maps.impl.hash.Int2FloatOpenHashMap;
+import speiger.src.collections.ints.maps.interfaces.Int2FloatMap;
+
+public class GlythData {
+	float advance;
+	float shadowOffset;
+	Int2FloatMap kernlings = new Int2FloatOpenHashMap();
+	Int2FloatFunction kernling;
 	
-	
-	public static record EmptyGlythData(float advance) implements GlythData {
-		@Override
-		public Glyth bake(GlythBaker baker) { return Glyth.EMPTY; }
+	public GlythData(float advance, float shadowOffset, Int2FloatFunction kernling) {
+		this.advance = advance;
+		this.shadowOffset = shadowOffset;
+		this.kernling = kernling;
 	}
 	
-	public static interface GlythBaker {
-		Glyth bake(IGlythSheetInfo info);
+	public GlythData(UnbakedGlyth glyth, float size) {
+		this(glyth.advance(size), glyth.shadowOffset(), glyth::kernling);
 	}
-}
\ No newline at end of file
+	
+	public float advance() { return advance; }
+	public float shadowOffset() { return shadowOffset; }
+	public float kernling(int codepoint) { return kernlings.computeFloatIfAbsent(codepoint, kernling); }
+}
diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/font/glyth/UnbakedGlyth.java b/src/main/java/speiger/src/coreengine/rendering/gui/font/glyth/UnbakedGlyth.java
new file mode 100644
index 0000000..89f1ac1
--- /dev/null
+++ b/src/main/java/speiger/src/coreengine/rendering/gui/font/glyth/UnbakedGlyth.java
@@ -0,0 +1,22 @@
+package speiger.src.coreengine.rendering.gui.font.glyth;
+
+public interface UnbakedGlyth {
+	public float advance(float size);
+	public float kernling(int codepoint);
+	public default float shadowOffset() { return 1F; }
+	public Glyth bake(GlythBaker baker, float size, float oversample);
+	
+	
+	public static record EmptyGlythData(float advance) implements UnbakedGlyth {
+		@Override
+		public Glyth bake(GlythBaker baker, float size, float oversample) { return Glyth.EMPTY; }
+		@Override
+		public float advance(float size) { return advance; }
+		@Override
+		public float kernling(int codepoint) { return 0F; }
+	}
+	
+	public static interface GlythBaker {
+		Glyth bake(IGlythSheetInfo info);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/font/providers/BitmapProivder.java b/src/main/java/speiger/src/coreengine/rendering/gui/font/providers/BitmapProivder.java
index 0d85bb9..5fa9699 100644
--- a/src/main/java/speiger/src/coreengine/rendering/gui/font/providers/BitmapProivder.java
+++ b/src/main/java/speiger/src/coreengine/rendering/gui/font/providers/BitmapProivder.java
@@ -1,13 +1,13 @@
 package speiger.src.coreengine.rendering.gui.font.providers;
 
 import speiger.src.coreengine.rendering.gui.font.glyth.Glyth;
-import speiger.src.coreengine.rendering.gui.font.glyth.GlythData;
+import speiger.src.coreengine.rendering.gui.font.glyth.UnbakedGlyth;
 
 public class BitmapProivder implements IFontProvider {
 	
 	
 	@Override
-	public GlythData glythData(int codepoint, int style) {
+	public UnbakedGlyth glythData(int codepoint, int style) {
 		return null;
 	}
 	
@@ -16,23 +16,26 @@ public class BitmapProivder implements IFontProvider {
 		
 	}
 	
-	private static class BitmapGlyth implements GlythData {
+	private static class BitmapGlyth implements UnbakedGlyth {
 		int minX;
 		int minY;
 		int maxX;
 		int maxY;
 		int glyth;
 		
-		
 		@Override
-		public float advance() {
-			return 0;
-		}
-
-		@Override
-		public Glyth bake(GlythBaker baker) {
+		public Glyth bake(GlythBaker baker, float size, float oversample) {
 			return null;
 		}
 		
+		@Override
+		public float advance(float size) {
+			return 0;
+		}
+		
+		@Override
+		public float kernling(int codepoint) {
+			return 0;
+		}
 	}
 }
diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/font/providers/IFontProvider.java b/src/main/java/speiger/src/coreengine/rendering/gui/font/providers/IFontProvider.java
index 60e5abe..1a6585d 100644
--- a/src/main/java/speiger/src/coreengine/rendering/gui/font/providers/IFontProvider.java
+++ b/src/main/java/speiger/src/coreengine/rendering/gui/font/providers/IFontProvider.java
@@ -1,6 +1,6 @@
 package speiger.src.coreengine.rendering.gui.font.providers;
 
-import speiger.src.coreengine.rendering.gui.font.glyth.GlythData;
+import speiger.src.coreengine.rendering.gui.font.glyth.UnbakedGlyth;
 
 public interface IFontProvider extends AutoCloseable {
 	public static final int REGULAR = 0;
@@ -9,7 +9,7 @@ public interface IFontProvider extends AutoCloseable {
 	public static final int ITALIC_BOLD = 3;
 	
 	
-	public GlythData glythData(int codepoint, int style);
+	public UnbakedGlyth glythData(int codepoint, int style);
 	@Override
 	void close();
 }
diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/font/providers/STBTrueTypeProvider.java b/src/main/java/speiger/src/coreengine/rendering/gui/font/providers/STBTrueTypeProvider.java
index 2653d98..b465e9e 100644
--- a/src/main/java/speiger/src/coreengine/rendering/gui/font/providers/STBTrueTypeProvider.java
+++ b/src/main/java/speiger/src/coreengine/rendering/gui/font/providers/STBTrueTypeProvider.java
@@ -18,8 +18,8 @@ import speiger.src.coreengine.assets.base.IAssetProvider;
 import speiger.src.coreengine.assets.parsers.NativeMemoryParser;
 import speiger.src.coreengine.rendering.gui.font.FontTexture;
 import speiger.src.coreengine.rendering.gui.font.glyth.Glyth;
-import speiger.src.coreengine.rendering.gui.font.glyth.GlythData;
-import speiger.src.coreengine.rendering.gui.font.glyth.GlythData.EmptyGlythData;
+import speiger.src.coreengine.rendering.gui.font.glyth.UnbakedGlyth;
+import speiger.src.coreengine.rendering.gui.font.glyth.UnbakedGlyth.EmptyGlythData;
 import speiger.src.coreengine.rendering.gui.font.glyth.IGlythSheetInfo;
 import speiger.src.coreengine.rendering.textures.custom.Drawable;
 import speiger.src.coreengine.utils.helpers.JsonUtil;
@@ -115,7 +115,7 @@ public class STBTrueTypeProvider implements IFontProvider {
 			data = 0L;
 		}
 		
-		public GlythData glythData(int codepoint) {
+		public UnbakedGlyth glythData(int codepoint) {
 			if(skip.contains(codepoint)) return null;
 			int glyth = STBTruetype.nstbtt_FindGlyphIndex(info.address(), codepoint);
 			if(glyth == 0) return null;
@@ -143,7 +143,7 @@ public class STBTrueTypeProvider implements IFontProvider {
 	}
 	
 	@Override
-	public GlythData glythData(int codepoint, int style) {
+	public UnbakedGlyth glythData(int codepoint, int style) {
 		TrueTypeInstance instance = instances[style & 0x3];
 		return instance == null ? null : instance.glythData(codepoint);
 	}
@@ -158,7 +158,7 @@ public class STBTrueTypeProvider implements IFontProvider {
 		instances = null;
 	}
 	
-	private static class STBGlyth implements GlythData {
+	private static class STBGlyth implements UnbakedGlyth {
 		final TrueTypeInstance owner;
 		final int width;
 		final int height;
@@ -174,12 +174,13 @@ public class STBTrueTypeProvider implements IFontProvider {
 		}
 		
 		@Override
-		public float advance() { return advance; }
+		public float advance(float size) { return advance; }
 		@Override
 		public float shadowOffset() { return owner.shadowOffset; }
-		
 		@Override
-		public Glyth bake(GlythBaker baker) {
+		public float kernling(int codepoint) { return STBTruetype.stbtt_GetCodepointKernAdvance(owner.info, codepoint, glyth); }
+		@Override
+		public Glyth bake(GlythBaker baker, float size, float oversample) {
 			return baker.bake(new IGlythSheetInfo() {
 				@Override
 				public int width() { return width; }
@@ -196,6 +197,5 @@ public class STBTrueTypeProvider implements IFontProvider {
 				}
 			});
 		}
-		
 	}
 }