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

This reverts commit ac1289a46e.

GameData/ConformalDecals/Resources/ConformalDecals.cfg

@@ -21,8 +21,6 @@ CONFORMALDECALS {
     shader = Solid Color (Alpha)
   }
 
-  fallbackFont = NotoSans-Regular SDF
-  
   FONT {
     name = LiberationSans SDF
     title = Liberation Sans

Source/ConformalDecals/DecalConfig.cs

@@ -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);
                 }
             }
         }

Source/ConformalDecals/Text/DecalFont.cs

@@ -40,15 +40,19 @@ namespace ConformalDecals.Text {
         public bool SmallCapsMask => (FontStyleMask & FontStyles.SmallCaps) != 0;
 
 
-        public DecalFont(string name, ConfigNode node, TMP_FontAsset font) {
-            if (name == null) throw new ArgumentNullException(nameof(name));
+        public DecalFont(ConfigNode node, IEnumerable<TMP_FontAsset> fontAssets) {
             if (node == null) throw new ArgumentNullException(nameof(node));
-            if (font == null) throw new ArgumentNullException(nameof(font));
+            if (fontAssets == null) throw new ArgumentNullException(nameof(fontAssets));
+
+            var name = ParseUtil.ParseString(node, "name");
+            FontAsset = fontAssets.First(o => o.name == name);
+            if (FontAsset == null) {
+                throw new FormatException($"Could not find font asset named {name}");
+            }
 
             Title = ParseUtil.ParseString(node, "title", true, name);
             FontStyle = (FontStyles) ParseUtil.ParseInt(node, "style", true);
             FontStyleMask = (FontStyles) ParseUtil.ParseInt(node, "styleMask", true);
-            FontAsset = font;
         }
 
 

Source/ConformalDecals/Text/FontLoader.cs

@@ -11,13 +11,12 @@ namespace ConformalDecals.Text {
     [DatabaseLoaderAttrib(new[] {"decalfont"})]
     public class FontLoader : DatabaseLoader<GameDatabase.TextureInfo> {
         private const  string        FallbackName = "NotoSans-Regular SDF";
-
-        public static TMP_FontAsset FallbackFont { get; private set; }
+        private static TMP_FontAsset _fallbackFont;
 
         public override IEnumerator Load(UrlDir.UrlFile urlFile, FileInfo fileInfo) {
-            if (FallbackFont == null) {
-                FallbackFont = Resources.FindObjectsOfTypeAll<TMP_FontAsset>().First(o => o.name == FallbackName);
-                if (FallbackFont == null) Logging.LogError($"Could not find fallback font '{FallbackName}'");
+            if (_fallbackFont == null) {
+                _fallbackFont = Resources.FindObjectsOfTypeAll<TMP_FontAsset>().First(o => o.name == FallbackName);
+                if (_fallbackFont == null) Logging.LogError($"Could not find fallback font '{FallbackName}'");
             }
 
             Logging.Log($"Loading font file '{urlFile.fullPath}'");
@@ -29,6 +28,7 @@ namespace ConformalDecals.Text {
                 var loadedFonts = bundle.LoadAllAssets<TMP_FontAsset>();
                 foreach (var font in loadedFonts) {
                     Logging.Log($"Adding font {font.name}");
+                    font.fallbackFontAssets.Add(_fallbackFont);
                 }
             }