Fixes #18

rds1983 · Jan 4, 2020 · aa43c86 · aa43c86
1 parent b85c44a
commit aa43c86
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 14 deletions.
diff --git a/samples/SpriteFontPlus.Samples.DynamicSpriteFont/Game1.cs b/samples/SpriteFontPlus.Samples.DynamicSpriteFont/Game1.cs
@@ -18,7 +18,7 @@ public class Game1 : Game
 		private int _fontIdJapanese, _fontIdEmojis;
 		private Texture2D _white;
 		private bool _drawBackground = false;
-		private bool _wasSpaceDown;
+		private bool _wasSpaceDown, _wasEnterDown;
 
 		public Game1()
 		{
@@ -60,13 +60,20 @@ protected override void Update(GameTime gameTime)
 			var state = Keyboard.GetState();
 
 			var isSpaceDown = state.IsKeyDown(Keys.Space);
-
 			if (isSpaceDown && !_wasSpaceDown)
 			{
 				_drawBackground = !_drawBackground;
 			}
 
 			_wasSpaceDown = isSpaceDown;
+
+			var isEnterDown = state.IsKeyDown(Keys.Enter);
+			if (isEnterDown && !_wasEnterDown)
+			{
+				_font.UseKernings = !_font.UseKernings;
+			}
+
+			_wasEnterDown = isEnterDown;
 		}
 
 		private void DrawString(string text, int y, Color color)
@@ -111,25 +118,25 @@ protected override void Draw(GameTime gameTime)
 			DrawString("Sævör grét áðan því úlpan var ónýt, P: Pchnąć w tę łódź jeża lub osiem skrzyń fig", 90);
 
 			_font.Size = 26;
-			DrawString("Příliš žluťoučký kůň úpěl ďábelské kódy, R: В чащах юга жил-был цитрус? Да, но фальшивый экземпляр! ёъ.", 120);
+			DrawString("Příliš žluťoučký kůň úpěl ďábelské kódy,\nR: В чащах юга жил-был цитрус?\nДа, но фальшивый экземпляр! ёъ.", 120);
 
 			_font.Size = 28;
-			DrawString("kilómetros y frío, añoraba,\nP: vôo à noite, F: Les naïfs ægithales\nhâtifs pondant à Noël où", 150);
+			DrawString("kilómetros y frío, añoraba,\nP: vôo à noite, F: Les naïfs ægithales\nhâtifs pondant à Noël où", 210);
 
 			_font.FontId = _fontIdJapanese;
 			_font.Size = 30;
-			DrawString("いろはにほへど", 250);
+			DrawString("いろはにほへど", 310);
 
 			_font.FontId = _fontIdEmojis;
 			_font.Size = 32;
-			DrawString("🙌📦👏🔥👍😻😂🎉💻😍🚀😁🙈🇧🇪👩😉🍻🎶🏆👀👉👶💕😎😱🌌🌻🍺🏀👇👯💁💝💩😃😅🙏🚄🇫🌧🌾🍀🍁🍓🍕🎾🏈", 280, Color.Gold);
+			DrawString("🙌📦👏🔥👍😻😂🎉💻😍🚀😁🙈🇧🇪👩😉🍻🎶🏆👀👉👶💕😎😱🌌🌻🍺🏀👇👯💁💝💩😃😅🙏🚄🇫🌧🌾🍀🍁🍓🍕🎾🏈", 340, Color.Gold);
 
 			_font.FontId = _font.DefaultFontId;
 			_font.Size = 26;
-			DrawString("Texture:", 320);
+			DrawString("Texture:", 380);
 
 			var texture = _font.Textures.First();
-			_spriteBatch.Draw(texture, new Vector2(0, 350), Color.White);
+			_spriteBatch.Draw(texture, new Vector2(0, 410), Color.White);
 
 			_spriteBatch.End();
 

diff --git a/src/SpriteFontPlus/DynamicSpriteFont.cs b/src/SpriteFontPlus/DynamicSpriteFont.cs
@@ -102,6 +102,19 @@ public int DefaultFontId
 			}
 		}
 
+		public bool UseKernings
+		{
+			get
+			{
+				return _fontSystem.UseKernings;
+			}
+
+			set
+			{
+				_fontSystem.UseKernings = value;
+			}
+		}
+
 		public event EventHandler CurrentAtlasFull
 		{
 			add

diff --git a/src/SpriteFontPlus/FontStashSharp/Font.cs b/src/SpriteFontPlus/FontStashSharp/Font.cs
@@ -14,6 +14,7 @@ internal class Font
 		public float Ascender;
 		public float Descender;
 		public float LineHeight;
+		private readonly Dictionary<ulong, int> _kernings = new Dictionary<ulong, int>();
 
 		public Dictionary<ulong, FontGlyph> Glyphs
 		{
@@ -44,5 +45,21 @@ public void SetGlyph(int codePoint, int size, int blur, FontGlyph glyph)
 			var key = BuildKey(codePoint, size, blur);
 			_glyphs[key] = glyph;
 		}
+
+		public int GetKerning(int glyphIndex1, int glyphIndex2)
+		{
+			ulong key = (uint)glyphIndex1 << 32;
+			key |= (uint)glyphIndex2;
+
+			int result;
+			if (_kernings.TryGetValue(key, out result))
+			{
+				return result;
+			}
+			result = stbtt_GetGlyphKernAdvance(_font, glyphIndex1, glyphIndex2);
+			_kernings[key] = result;
+
+			return result;
+		}
 	}
 }
diff --git a/src/SpriteFontPlus/FontStashSharp/FontSystem.cs b/src/SpriteFontPlus/FontStashSharp/FontSystem.cs
@@ -24,6 +24,7 @@ internal unsafe class FontSystem
 		public float BlurValue;
 		public float Spacing;
 		public Vector2 Scale;
+		public bool UseKernings = true;
 
 		public FontAtlas CurrentAtlas
 		{
@@ -155,6 +156,7 @@ public float DrawText(SpriteBatch batch, float x, float y, StringSegment str, fl
 				{
 					originX = 0.0f;
 					originY += lineHeight;
+					prevGlyphIndex = -1;
 					continue;
 				}
 
@@ -228,6 +230,7 @@ public float TextBounds(float x, float y, StringSegment str, ref Bounds bounds)
 				{
 					x = startx;
 					y += lineHeight;
+					prevGlyphIndex = -1;
 					continue;
 				}
 
@@ -451,7 +454,11 @@ private void GetQuad(Font font, int prevGlyphIndex, FontGlyph glyph, float scale
 		{
 			if (prevGlyphIndex != -1)
 			{
-				var adv = font._font.fons__tt_getGlyphKernAdvance(prevGlyphIndex, glyph.Index) * scale;
+				float adv = 0;
+				if (UseKernings)
+				{
+					adv = font.GetKerning(prevGlyphIndex, glyph.Index) * scale;
+				}
 				x += (int)(adv + spacing + 0.5f);
 			}
 

diff --git a/src/SpriteFontPlus/StbTrueTypeExtensions.cs b/src/SpriteFontPlus/StbTrueTypeExtensions.cs
@@ -30,10 +30,5 @@ public static void fons__tt_renderGlyphBitmap(this stbtt_fontinfo font, byte* ou
 		{
 			stbtt_MakeGlyphBitmap(font, output, (int)(outWidth), (int)(outHeight), (int)(outStride), (float)(scaleX), (float)(scaleY), (int)(glyph));
 		}
-
-		public static int fons__tt_getGlyphKernAdvance(this stbtt_fontinfo font, int glyph1, int glyph2)
-		{
-			return (int)(stbtt_GetGlyphKernAdvance(font, (int)(glyph1), (int)(glyph2)));
-		}
 	}
 }