Skip to content

禁用 FontCollection 中的缓存 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wuke32767 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

禁用 FontCollection 中的缓存 #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 1 addition & 37 deletions Velentr.Font/FontCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
Expand Down Expand Up @@ -33,11 +33,6 @@ public class FontCollection : IDisposable
public Font MainFont;
public Font AltFont;

/// <summary>
/// The calculation cache.
/// </summary>
private Dictionary<(string, Rectangle, float, Vector2, Vector2, SpriteEffects, float), List<(Vector2, Glyph)>> _calculationCache = new();

/// <summary>
/// Initializes a new instance of the <see cref="FontCollection"/> class.
/// </summary>
Expand Down Expand Up @@ -117,18 +112,6 @@ public Glyph GenerateGlyph(char character)
/// <param name="color">The color.</param>
/// <param name="lineSpacing">The line spacing.</param>
public void Draw(SpriteBatch spriteBatch, string text, Rectangle boundaries, Color color, int lineSpacing = 0) {
var key = (text, boundaries, 0f, Vector2.Zero, Vector2.One, SpriteEffects.None, lineSpacing);
if (_calculationCache.TryGetValue(key, out var items)) {
foreach (var (position, character) in items) {
float rotation = key.Item3;
var origin = key.Item4;
var scale = key.Item5;
spriteBatch.Draw(character.GlyphCache.Texture, position, character.Boundary, color, rotation, origin, scale, SpriteEffects.None, 0f);
}

return;
}

var warpLine = boundaries.Width > 0;
var offsetX = 0;
var offsetY = 0;
Expand All @@ -141,7 +124,6 @@ public void Draw(SpriteBatch spriteBatch, string text, Rectangle boundaries, Col
var finalCharacterIndex = text.Length - 1;

var currentColor = color;
var infos = new List<(Vector2, Glyph)>();
for (var i = 0; i < text.Length; i++) {
TryGetGlyph(text[i], out var cachedCharacter, out var font);
lineSpacing = lineSpacing is 0 ? cachedCharacter.AdvanceY : lineSpacing;
Expand Down Expand Up @@ -172,8 +154,6 @@ public void Draw(SpriteBatch spriteBatch, string text, Rectangle boundaries, Col

var position = new Vector2(boundaries.X + offsetX, boundaries.Y + offsetY);

infos.Add((position, cachedCharacter));

spriteBatch.Draw(cachedCharacter.GlyphCache.Texture, position, cachedCharacter.Boundary, currentColor, 0f, Vector2.Zero, Vector2.One, SpriteEffects.None, 0f);
offsetX += cachedCharacter.Boundary.Width;

Expand All @@ -189,8 +169,6 @@ public void Draw(SpriteBatch spriteBatch, string text, Rectangle boundaries, Col
}
}
}

_calculationCache.Add(key, infos);
}

/// <summary>
Expand Down Expand Up @@ -219,14 +197,6 @@ public void Draw(SpriteBatch spriteBatch, string text, Vector2 position, Color c
/// <param name="lineSpacing">The line spacing.</param>
public void Draw(SpriteBatch spriteBatch, string text, Rectangle boundaries, Color color, float rotation,
Vector2 origin, Vector2 scale, SpriteEffects effects, float layerDepth, int lineSpacing = 0) {
var key = (text, boundaries, rotation, origin, scale, effects, lineSpacing);
if (_calculationCache.TryGetValue(key, out var items)) {
foreach (var (position, character) in items) {
spriteBatch.Draw(character.GlyphCache.Texture, position, character.Boundary, color, rotation, origin, scale, effects, 0f);
}

return;
}

// calculate the rest of the text position
var warpLine = boundaries.Width > 0;
Expand All @@ -241,7 +211,6 @@ public void Draw(SpriteBatch spriteBatch, string text, Rectangle boundaries, Col
var finalCharacterIndex = text.Length - 1;

var currentColor = color;
var infos = new List<(Vector2, Glyph)>();
for (var i = 0; i < text.Length; i++) {
TryGetGlyph(text[i], out var cachedCharacter, out var font);
lineSpacing = lineSpacing is 0 ? cachedCharacter.AdvanceY : lineSpacing;
Expand Down Expand Up @@ -317,8 +286,6 @@ public void Draw(SpriteBatch spriteBatch, string text, Rectangle boundaries, Col
var characterPosition = new Vector2(offsetX, offsetY);
Vector2.Transform(ref characterPosition, ref transformation, out characterPosition);

infos.Add((characterPosition, cachedCharacter));

spriteBatch.Draw(cachedCharacter.GlyphCache.Texture, characterPosition, cachedCharacter.Boundary,
currentColor, rotation, origin, scale, effects, layerDepth);
offsetX += cachedCharacter.Boundary.Width;
Expand All @@ -335,8 +302,6 @@ public void Draw(SpriteBatch spriteBatch, string text, Rectangle boundaries, Col
}
}
}

_calculationCache.Add(key, infos);
}

/// <summary>
Expand Down Expand Up @@ -442,7 +407,6 @@ public Vector2 MeasureText(string text, int lineSpacing = 0) {

public void Dispose() {
TextCache.Clear();
_calculationCache.Clear();
_glyphCaches.Clear();
CharacterGlyphs.Clear();
}
Expand Down