Skip to content

Fix SystemHeatOverlay NREs when deleting editor parts #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Aebestach wants to merge 1 commit into
base: master
Choose a base branch
from
+126 −47
Open

Fix SystemHeatOverlay NREs when deleting editor parts #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Source/UI/Overlay/OverlayPanel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public void SetupComponents()

public void LateUpdate()
{
if (active && loop != null && heatModule != null)
if (active && loop != null && heatModule != null && heatModule.part != null && Camera.main != null && parentCanvas != null)
{
float nominalLoopTempDelta = loop.NominalTemperature - heatModule.systemNominalTemperature;
float nominalSystemTempDelta = loop.Temperature - heatModule.systemNominalTemperature;
Expand Down Expand Up @@ -170,7 +170,7 @@ public void LateUpdate()
RectTransformUtility.ScreenPointToLocalPointInRectangle(parentCanvas.GetComponent<RectTransform>(), screenPoint, parentCanvas.worldCamera, out localPoint);
transform.localPosition = localPoint;
}
if (heatModule == null)
if (heatModule == null || heatModule.part == null)
{
Destroy(this.gameObject);
}
Expand Down
169 changes: 124 additions & 45 deletions Source/UI/Overlay/SystemHeatOverlay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,34 +134,62 @@ protected void onSceneChange(GameScenes scene)
}

protected void onEditorPartDeleted(Part part)
{
RemoveOverlayObjectsForPart(part);
}
protected void onEditorPartPicked(Part part)
{
RemoveOverlayObjectsForPart(part);
}

private void RemoveOverlayObjectsForPart(Part part)
{
if (overlayPanels != null)
{
for (int i = overlayPanels.Count - 1; i >= 0; i--)
{
if (overlayPanels[i].heatModule.part == part)
OverlayPanel panel = overlayPanels[i];
ModuleSystemHeat heatModule = panel != null ? panel.heatModule : null;
if (panel == null || heatModule == null || heatModule.part == null || heatModule.part == part)
{

Utils.Log(String.Format("[SystemHeatOverlay]: Destroying unusued overlay panel because it was deleted"), LogType.Overlay);

Destroy(overlayPanels[i].gameObject);
Utils.Log("[SystemHeatOverlay]: Destroying unused overlay panel", LogType.Overlay);
if (panel != null)
Destroy(panel.gameObject);
overlayPanels.RemoveAt(i);
}
}
}
protected void onEditorPartPicked(Part part)
{
if (overlayPanels != null)
for (int i = overlayPanels.Count - 1; i >= 0; i--)
}

// Rebuild affected loop renderers on the next update. A loop can retain a
// destroyed module for the remainder of the editor deletion event.
if (overlayLoops != null)
{
for (int i = overlayLoops.Count - 1; i >= 0; i--)
{
if (overlayPanels[i].heatModule.part == part)
{
OverlayLoop overlayLoop = overlayLoops[i];
HeatLoop heatLoop = overlayLoop != null ? overlayLoop.heatLoop : null;
bool remove = overlayLoop == null || heatLoop == null || heatLoop.LoopModules == null;

Utils.Log(String.Format("[SystemHeatOverlay]: Destroying unusued overlay panel because it was deleted"), LogType.Overlay);
if (!remove)
{
foreach (ModuleSystemHeat heatModule in heatLoop.LoopModules)
{
if (heatModule == null || heatModule.part == null || heatModule.part == part)
{
remove = true;
break;
}
}
}

Destroy(overlayPanels[i].gameObject);
overlayPanels.RemoveAt(i);
if (remove)
{
if (overlayLoop != null)
overlayLoop.Destroy();
overlayLoops.RemoveAt(i);
}
}
}
}
public void ClearPanels()
{
Expand Down Expand Up @@ -197,10 +225,10 @@ protected void DestroyOverlay()
}
protected void LateUpdate()
{
RemoveInvalidOverlayObjects();

if (simulator != null && !(HighLogic.LoadedSceneIsFlight && MapView.MapIsEnabled))
{

if (simulator.HeatLoops == null || simulator.HeatLoops.Count == 0 && overlayLoops.Count > 0)
{

Expand All @@ -212,8 +240,11 @@ protected void LateUpdate()
// Update each loop, build a new loop when needed
foreach (HeatLoop loop in simulator.HeatLoops)
{
if (!IsValidHeatLoop(loop))
continue;

// if we have an overlay for this loop, update it
OverlayLoop curOverlay = overlayLoops.FirstOrDefault(x => x.heatLoop.ID == loop.ID);
OverlayLoop curOverlay = overlayLoops.FirstOrDefault(x => x != null && x.heatLoop != null && x.heatLoop.ID == loop.ID);
if (curOverlay != null)
{
// if no modules, hide the loop
Expand Down Expand Up @@ -243,7 +274,10 @@ protected void LateUpdate()

foreach (ModuleSystemHeat system in loop.LoopModules)
{
int index = overlayPanels.FindIndex(f => f.heatModule == system);
if (system == null)
continue;

int index = overlayPanels.FindIndex(f => f != null && f.heatModule == system);

if (index == -1)
{
Expand Down Expand Up @@ -283,24 +317,15 @@ protected void LateUpdate()
}


for (int i = overlayPanels.Count - 1; i >= 0; i--)
{
if (overlayPanels[i].heatModule == null)
{

Utils.Log(String.Format("[SystemHeatOverlay]: Destroying unusued overlay panel"), LogType.Overlay);

Destroy(overlayPanels[i].gameObject);
overlayPanels.RemoveAt(i);
}
}
foreach (OverlayLoop l in overlayLoops)
for (int i = overlayLoops.Count - 1; i >= 0; i--)
{
if (!simulator.HasLoop(l.heatLoop.ID))
OverlayLoop overlayLoop = overlayLoops[i];
if (overlayLoop == null || overlayLoop.heatLoop == null || !simulator.HasLoop(overlayLoop.heatLoop.ID))
{
l.SetVisible(false);
if (overlayLoop != null)
overlayLoop.Destroy();
overlayLoops.RemoveAt(i);
}

}
}
}
Expand All @@ -314,6 +339,52 @@ protected void LateUpdate()

}
}

private bool IsValidHeatLoop(HeatLoop heatLoop)
{
if (heatLoop == null || heatLoop.LoopModules == null)
return false;

foreach (ModuleSystemHeat heatModule in heatLoop.LoopModules)
{
if (heatModule == null || heatModule.part == null)
return false;
}

return true;
}

private void RemoveInvalidOverlayObjects()
{
if (overlayPanels != null)
{
for (int i = overlayPanels.Count - 1; i >= 0; i--)
{
OverlayPanel panel = overlayPanels[i];
if (panel == null || panel.heatModule == null || panel.heatModule.part == null)
{
Utils.Log("[SystemHeatOverlay]: Destroying unused overlay panel", LogType.Overlay);
if (panel != null)
Destroy(panel.gameObject);
overlayPanels.RemoveAt(i);
}
}
}

if (overlayLoops != null)
{
for (int i = overlayLoops.Count - 1; i >= 0; i--)
{
OverlayLoop overlayLoop = overlayLoops[i];
if (overlayLoop == null || !IsValidHeatLoop(overlayLoop.heatLoop))
{
if (overlayLoop != null)
overlayLoop.Destroy();
overlayLoops.RemoveAt(i);
}
}
}
}
public void AssignSimulator(SystemHeatSimulator sim)
{
simulator = sim;
Expand All @@ -322,6 +393,7 @@ public void SetVisible(bool visible)
{
Utils.Log(String.Format("[SystemHeatOverlay]: Visibility set to {0}", visible), LogType.Overlay);

RemoveInvalidOverlayObjects();
Drawn = visible;

SetLoopVisiblity(visible);
Expand All @@ -331,6 +403,7 @@ public void SetVisible(bool visible, int loopID)
{
Utils.Log(String.Format("[SystemHeatOverlay]: Visibility of loop {0} set to {1}", loopID, visible), LogType.Overlay);

RemoveInvalidOverlayObjects();
Drawn = visible;

SetLoopVisiblity(visible, loopID);
Expand All @@ -342,12 +415,13 @@ private void SetPanelVisiblity(bool visible)

for (int i = 0; i < overlayPanels.Count; i++)
{
if (overlayPanels[i] != null)
OverlayPanel panel = overlayPanels[i];
if (panel != null && panel.heatModule != null)
{
if (overlayPanels[i].heatModule.moduleUsed)
overlayPanels[i].SetVisibility(visible);
if (panel.heatModule.moduleUsed)
panel.SetVisibility(visible);
else
overlayPanels[i].SetVisibility(false);
panel.SetVisibility(false);
}
}
}
Expand All @@ -356,17 +430,18 @@ private void SetPanelVisiblity(bool visible, int loopID)

for (int i = 0; i < overlayPanels.Count; i++)
{
if (overlayPanels[i] == null) continue;
if (overlayPanels[i].loop.ID == loopID)
OverlayPanel panel = overlayPanels[i];
if (panel == null || panel.loop == null || panel.heatModule == null) continue;
if (panel.loop.ID == loopID)
{
if (overlayPanels[i].heatModule.moduleUsed)
overlayPanels[i].SetVisibility(visible);
if (panel.heatModule.moduleUsed)
panel.SetVisibility(visible);
else
overlayPanels[i].SetVisibility(false);
panel.SetVisibility(false);
}
else
{
Drawn = Drawn || overlayPanels[i].active;
Drawn = Drawn || panel.active;
}
}
}
Expand All @@ -377,14 +452,16 @@ private void SetLoopVisiblity(bool visible)
{
foreach (OverlayLoop loop in overlayLoops)
{
loop.SetVisible(visible);
if (loop != null && loop.heatLoop != null)
loop.SetVisible(visible);
}
}
else
{
foreach (OverlayLoop loop in overlayLoops)
{
loop.SetVisible(false);
if (loop != null && loop.heatLoop != null)
loop.SetVisible(false);
}
}
}
Expand All @@ -394,6 +471,7 @@ private void SetLoopVisiblity(bool visible, int loopID)
{
foreach (OverlayLoop loop in overlayLoops)
{
if (loop == null || loop.heatLoop == null) continue;
if (loop.heatLoop.ID == loopID)
loop.SetVisible(visible);
else
Expand All @@ -409,6 +487,7 @@ public bool CheckLoopVisibility(int loopID)
{
foreach (OverlayLoop loop in overlayLoops)
{
if (loop == null || loop.heatLoop == null) continue;
if (loop.heatLoop.ID == loopID)
return loop.Drawn;
}
Expand Down
Loading