drewcassidy/ReStocked
1
0
Fork 0
mirror of https://github.com/PorktoberRevolution/ReStocked synced 2024-09-01 17:34:42 +00:00
Code Issues Releases Wiki Activity

Fix NRE when ModuleRestockHeatEffects encounters a missing renderer

Browse Source
This commit is contained in:
Andrew Cassidy 2024-08-14 23:43:45 -07:00
parent 7f266364f4
commit bad7196a0f
2 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Distribution/Restock/GameData/ReStock/Plugins/Restock.dll
View File

Binary file not shown.

47
Source/Restock/ModuleRestockHeatEffects.cs
View File

@ -43,6 +43,7 @@ namespace Restock
[KSPField] public bool disableBlackbody = false; [KSPField] public bool disableBlackbody = false;
public List<Renderer> renderers = new List<Renderer>(); public List<Renderer> renderers = new List<Renderer>();
public List<string> excludedRendererNames = new List<string>();
private readonly string _shaderBlackbody = "_TemperatureColor"; private readonly string _shaderBlackbody = "_TemperatureColor";
@ -103,22 +104,12 @@ namespace Restock
{ {
if (HighLogic.LoadedSceneIsEditor || HighLogic.LoadedSceneIsFlight) return; if (HighLogic.LoadedSceneIsEditor || HighLogic.LoadedSceneIsFlight) return;
renderers = base.part.FindModelComponents<Renderer>();
if (node.HasValue("excludedRenderer")) if (node.HasValue("excludedRenderer"))
{ {
var excludedRenderers = new List<string>(); excludedRendererNames = new List<string>(node.GetValues("excludedRenderer"));
excludedRenderers.AddRange(node.GetValues("excludedRenderer"));
for (int i = renderers.Count - 1; i >= 0; i--)
{
if (renderers[i] == null || excludedRenderers.Contains(renderers[i].name))
{
renderers.RemoveAt(i);
}
}
} }
FindRenderers();
} }
public void LateUpdate() public void LateUpdate()
@ -140,7 +131,7 @@ namespace Restock
temp = useSkinTemp ? base.part.skinTemperature : base.part.temperature; temp = useSkinTemp ? base.part.skinTemperature : base.part.temperature;
} }
var temp2 = (float) ((temp - draperPoint) / _lerpRange); var temp2 = (float)((temp - draperPoint) / _lerpRange);
temp2 = Mathf.Clamp01(temp2); temp2 = Mathf.Clamp01(temp2);
_emissiveColor.r = redCurve.Evaluate(temp2); _emissiveColor.r = redCurve.Evaluate(temp2);
@ -156,9 +147,35 @@ namespace Restock
_propertyBlock.SetColor(_shaderBlackbodyID, Color.black); _propertyBlock.SetColor(_shaderBlackbodyID, Color.black);
} }
try
{
UpdateRenderers(_propertyBlock);
} catch(NullReferenceException)
{
// if any renderers are null, rebuild renderer list
// any bonus renderers will just have to be ignored I guess
FindRenderers();
UpdateRenderers(_propertyBlock);
}
}
private void UpdateRenderers(MaterialPropertyBlock mpb)
{
for (var i = 0; i < renderers.Count; i++) for (var i = 0; i < renderers.Count; i++)
{ {
renderers[i].SetPropertyBlock(_propertyBlock); renderers[i].SetPropertyBlock(mpb);
}
}
private void FindRenderers()
{
renderers= part.FindModelComponents<Renderer>();
renderers.RemoveAll(renderer => renderer == null);
if( excludedRendererNames.Count != 0)
{
renderers.RemoveAll(renderer => excludedRendererNames.Contains(renderer.name));
} }
} }
} }