drewcassidy/KSP-Conformal-Decals
1
0
Fork 0
mirror of https://github.com/drewcassidy/KSP-Conformal-Decals.git synced 2024-09-01 18:23:54 +00:00
Code Issues Releases Wiki Activity

Revert "Add fallbacks to all fonts, even squad ones"

Browse Source 
This reverts commit ac1289a46e.
This commit is contained in:
Andrew Cassidy
2020-11-13 01:55:42 -08:00
parent d4978b1b3c
commit 981a167864
5 changed files with 18 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Source/ConformalDecals/DecalConfig.cs
View File

@ -13,7 +13,6 @@ namespace ConformalDecals {
private static Dictionary<string, DecalFont> _fontList;
private static int _decalLayer = 31;
private static bool _selectableInFlight;
private static string _fallbackFontName = "NotoSans-Regular SDF";
private struct LegacyShaderEntry {
public string name;
@ -51,8 +50,8 @@ namespace ConformalDecals {
public static bool SelectableInFlight => _selectableInFlight;
public static IEnumerable<DecalFont> Fonts => _fontList.Values;
public static TMP_FontAsset FallbackFont { get; private set; }
public static DecalFont FallbackFont { get; private set; }
public static bool IsBlacklisted(Shader shader) {
return IsBlacklisted(shader.name);
@ -95,27 +94,14 @@ namespace ConformalDecals {
}
var allFonts = Resources.FindObjectsOfTypeAll<TMP_FontAsset>();
ParseUtil.ParseStringIndirect(ref _fallbackFontName, node, "fallbackFont");
FallbackFont = allFonts.First(o => o.name == _fallbackFontName);
if (FallbackFont == null) Logging.LogError($"could not find find fallback font asset named {_fallbackFontName}");
foreach (var fontNode in node.GetNodes("FONT")) {
try {
var name = ParseUtil.ParseString(fontNode, "name");
if (string.IsNullOrEmpty(name)) throw new FormatException();
var fontAsset = allFonts.First(o => o.name == name);
if (fontAsset == null) throw new FormatException($"Could not find font asset named {name}");
if (!fontAsset.fallbackFontAssets.Contains(FallbackFont)) {
fontAsset.fallbackFontAssets.Add(FallbackFont);
}
var font = new DecalFont(name, fontNode, fontAsset);
var font = new DecalFont(fontNode, allFonts);
_fontList.Add(font.Name, font);
}
catch (Exception e) {
Logging.LogException($"Exception parsing font node:\n{fontNode.ToString()}\n", e);
Debug.LogException(e);
}
}
}