switch to KSPAddon

Author: al2me6

Source/DynamicProperties/CompiledProps.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using KSPBuildTools;
 using UnityEngine;
 
 namespace Shabby.DynamicProperties;
@@ -21,9 +22,10 @@ internal class CompiledProps
 	private static readonly Dictionary<SortedSet<Props>, MpbCacheEntry> MpbCache =
 		new(CascadeKeyComparer);
 
-	internal static void Clear() => MpbCache.Clear();
+	internal static void ClearCache() => MpbCache.Clear();
 
 	private readonly SortedSet<Props> cascade = new(Props.PriorityComparer);
+	private MpbCacheEntry? cacheEntry = null;
 
 	internal bool Add(Props props)
 	{
@@ -39,21 +41,19 @@ internal bool Remove(Props props)
 		return removed;
 	}
 
-	private MpbCacheEntry? cacheEntry = null;
-
 	// Should this be a hashset?
 	private static readonly List<Props> _changedProps = [];
 
 	internal static void RefreshChangedProps()
 	{
-		foreach (var (cascade, cache) in MpbCache) {
-			cache.Changed = false;
+		foreach (var (cascade, cacheEntry) in MpbCache) {
+			cacheEntry.Changed = false;
 			foreach (var props in cascade) {
 				if (!props.Changed) continue;
-				cache.Changed = true;
+				cacheEntry.Changed = true;
 				_changedProps.Add(props);
-				foreach (var managedId in cache.ManagedIds[props]) {
-					props.Write(managedId, cache.Mpb);
+				foreach (var managedId in cacheEntry.ManagedIds[props]) {
+					props.Write(managedId, cacheEntry.Mpb);
 				}
 			}
 		}
@@ -90,16 +90,24 @@ internal bool GetIfChanged(out MaterialPropertyBlock? mpb)
 	{
 		if (cacheEntry != null) {
 			mpb = cacheEntry.Changed ? cacheEntry.Mpb : null;
+			// if (cacheEntry.Changed && HighLogic.LoadedSceneIsEditor) {
+			// 	Debug.Log(cascade.Aggregate("props:\n", (current, props) => current + props));
+			// }
+
 			return cacheEntry.Changed;
 		}
 
 		if (!MpbCache.TryGetValue(cascade, out cacheEntry)) {
-			Debug.Log("cache not hit");
+			MaterialPropertyManager.Instance.LogDebug("building new MPB");
 			cacheEntry = BuildCacheEntry(cascade);
 		} else {
-			Debug.Log("cache hit!");
+			MaterialPropertyManager.Instance.LogDebug("MPB cache hit");
 		}
 
+		// if (HighLogic.LoadedSceneIsEditor) {
+		// 	Debug.Log(cascade.Aggregate("props:\n", (current, props) => current + props));
+		// }
+
 		mpb = cacheEntry.Mpb;
 		return true;
 	}

Source/DynamicProperties/MaterialPropertyManager.cs

@@ -1,12 +1,11 @@
 using System.Collections.Generic;
+using KSPBuildTools;
 using UnityEngine;
 
 namespace Shabby.DynamicProperties;
 
-[KSPScenario(
-	createOptions: ScenarioCreationOptions.AddToAllGames,
-	tgtScenes: [GameScenes.LOADING, GameScenes.EDITOR, GameScenes.FLIGHT])]
-public sealed class MaterialPropertyManager : ScenarioModule
+[KSPAddon(KSPAddon.Startup.EveryScene, false)]
+public sealed class MaterialPropertyManager : MonoBehaviour
 {
 	#region Fields
 
@@ -22,18 +21,26 @@ private MaterialPropertyManager()
 	{
 	}
 
-	public override void OnAwake()
+	private void Awake()
 	{
+		if (Instance != null) {
+			DestroyImmediate(this);
+			return;
+		}
+
 		name = nameof(MaterialPropertyManager);
 		Instance = this;
 	}
 
 	private void LateUpdate() => Refresh();
 
-	public void OnDestroy()
+	private void OnDestroy()
 	{
+		if (Instance != this) return;
+
 		Instance = null;
-		CompiledProps.Clear();
+		CompiledProps.ClearCache();
+		this.LogDebug("destroyed");
 	}
 
 	#endregion
@@ -61,17 +68,20 @@ private void Refresh()
 
 		foreach (var (renderer, compiledProps) in compiledProperties) {
 			if (renderer == null) {
+				this.LogDebug($"dead renderer {renderer.GetHashCode()}");
 				_deadRenderers.Add(renderer);
 				continue;
 			}
 
+			if (!renderer.gameObject.activeInHierarchy) continue;
+
 			if (compiledProps.GetIfChanged(out var mpb)) {
+				this.LogDebug($"set mpb on renderer {renderer.name} {renderer.GetHashCode()}\n");
 				renderer.SetPropertyBlock(mpb);
 			}
 		}
 
-		foreach (var dead in _deadRenderers) {
-			compiledProperties.Remove(dead);
-		}
+		foreach (var dead in _deadRenderers) compiledProperties.Remove(dead);
+		_deadRenderers.Clear();
 	}
 }

Source/DynamicProperties/Patches/PartPatch.cs

@@ -8,20 +8,20 @@ namespace Shabby.DynamicProperties;
 [HarmonyPatch(typeof(Part))]
 internal static class PartPatch
 {
-	private static readonly Dictionary<Part, Props> highlightProperties = [];
+	private static readonly Dictionary<Part, Props> rimHighlightProps = [];
 
 	[HarmonyPostfix]
 	[HarmonyPatch("Awake")]
 	private static void Awake_Postfix(Part __instance)
 	{
-		highlightProperties[__instance] = new Props(int.MinValue + 1);
+		rimHighlightProps[__instance] = new Props(int.MinValue + 1);
 	}
 
 	[HarmonyPostfix]
 	[HarmonyPatch("CreateRendererLists")]
 	private static void CreateRendererLists_Postfix(Part __instance)
 	{
-		var props = highlightProperties[__instance];
+		var props = rimHighlightProps[__instance];
 		props.SetFloat(PropertyIDs._RimFalloff, 2f);
 		props.SetColor(PropertyIDs._RimColor, Part.defaultHighlightNone);
 		foreach (var renderer in __instance.HighlightRenderer) {
@@ -35,13 +35,13 @@ private static bool SetOpacity_Prefix(Part __instance, float opacity)
 	{
 		__instance.CreateRendererLists();
 		__instance.mpb.SetFloat(PropertyIDs._Opacity, opacity);
-		highlightProperties[__instance].SetFloat(PropertyIDs._Opacity, opacity);
+		rimHighlightProps[__instance].SetFloat(PropertyIDs._Opacity, opacity);
 		return false;
 	}
 
 	private static void Highlight_SetRimColor(Part part, Color color)
 	{
-		highlightProperties[part].SetColor(PropertyIDs._RimColor, color);
+		rimHighlightProps[part].SetColor(PropertyIDs._RimColor, color);
 	}
 
 	[HarmonyTranspiler]
@@ -52,7 +52,7 @@ private static IEnumerable<CodeInstruction> Highlight_Transpiler(
 		var MPB_SetColor = AccessTools.Method(
 			typeof(MaterialPropertyBlock),
 			nameof(MaterialPropertyBlock.SetColor),
-			[typeof(int)]);
+			[typeof(int), typeof(Color)]);
 		var Part_get_mpb = AccessTools.PropertyGetter(typeof(Part), nameof(Part.mpb));
 		var Part_highlightRenderer =
 			AccessTools.Field(typeof(Part), nameof(Part.highlightRenderer));
@@ -122,6 +122,6 @@ private static IEnumerable<CodeInstruction> Highlight_Transpiler(
 	[HarmonyPatch("OnDestroy")]
 	private static void OnDestroy_Postfix(Part __instance)
 	{
-		highlightProperties.Remove(__instance);
+		rimHighlightProps.Remove(__instance);
 	}
 }