From 96c625f6f2f858201f9a47ea4bb281f7ef305534 Mon Sep 17 00:00:00 2001
From: drewcassidy <drewcassidy@me.com>
Date: Fri, 19 Jun 2020 10:36:13 -0700
Subject: [PATCH] changes

---
 Source/ConformalDecals/ModuleConformalText.cs |  2 --
 Source/ConformalDecals/Text/DecalFont.cs      |  8 -------
 Source/ConformalDecals/Text/FontLoader.cs     | 21 +++++++++++--------
 3 files changed, 12 insertions(+), 19 deletions(-)
 delete mode 100644 Source/ConformalDecals/Text/DecalFont.cs

diff --git a/Source/ConformalDecals/ModuleConformalText.cs b/Source/ConformalDecals/ModuleConformalText.cs
index 659b694..12953a6 100644
--- a/Source/ConformalDecals/ModuleConformalText.cs
+++ b/Source/ConformalDecals/ModuleConformalText.cs
@@ -22,8 +22,6 @@ namespace ConformalDecals {
         }
 
         private void SetText(string newText) {
-            if (!HighLogic.LoadedSceneIsEditor) return;
-            
             this.Log("Rendering text for part");
             var fonts = Resources.FindObjectsOfTypeAll<TMP_FontAsset>();
 
diff --git a/Source/ConformalDecals/Text/DecalFont.cs b/Source/ConformalDecals/Text/DecalFont.cs
deleted file mode 100644
index b61d2bb..0000000
--- a/Source/ConformalDecals/Text/DecalFont.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using UnityEngine;
-
-namespace ConformalDecals.Text {
-    public class DecalFont : ScriptableObject {
-        [SerializeField] public string foo1;
-        [SerializeField] public string foo2;
-    }
-}
\ No newline at end of file
diff --git a/Source/ConformalDecals/Text/FontLoader.cs b/Source/ConformalDecals/Text/FontLoader.cs
index 7b57228..76351cb 100644
--- a/Source/ConformalDecals/Text/FontLoader.cs
+++ b/Source/ConformalDecals/Text/FontLoader.cs
@@ -2,17 +2,21 @@ using System.IO;
 using System.Collections;
 using System.Collections.Generic;
 using TMPro;
+using UniLinq;
 using UnityEngine;
 
 namespace ConformalDecals.Text {
-    
     [DatabaseLoaderAttrib(new[] {"kspfont"})]
     public class FontLoader : DatabaseLoader<GameDatabase.TextureInfo> {
-        public static List<TMP_FontAsset> fonts;
-        
+        private const  string        FallbackName = "NotoSans-Regular SDF";
+        private static TMP_FontAsset _fallbackFont;
+
         public override IEnumerator Load(UrlDir.UrlFile urlFile, FileInfo fileInfo) {
-            fonts ??= new List<TMP_FontAsset>();
-            
+            if (_fallbackFont == null) {
+                _fallbackFont = Resources.FindObjectsOfTypeAll<TMP_FontAsset>().First(o => o.name == FallbackName);
+                if (_fallbackFont == null) Debug.LogError($"Could not find fallback font '{FallbackName}'");
+            }
+
             Debug.Log($"[ConformalDecals] '{urlFile.fullPath}'");
             var bundle = AssetBundle.LoadFromFile(urlFile.fullPath);
             if (!bundle) {
@@ -21,12 +25,11 @@ namespace ConformalDecals.Text {
             else {
                 var loadedFonts = bundle.LoadAllAssets<TMP_FontAsset>();
                 foreach (var font in loadedFonts) {
-                    Debug.Log($"[ConformalDecals] adding font {font.name}" );
-                    fonts.Add(font);
-                    Debug.Log($"ConformalDecals] isReadable: {font.atlas.isReadable}");
+                    Debug.Log($"[ConformalDecals] adding font {font.name}");
+                    font.fallbackFontAssets.Add(_fallbackFont);
                 }
             }
-            
+
             yield break;
         }
     }