Gittes-archive/new-horizons
2
0
Fork 0
mirror of https://github.com/Outer-Wilds-New-Horizons/new-horizons.git synced 2025-12-11 20:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

potentially fix cull group map bug

Browse Source
This commit is contained in:
JohnCorby 2023-03-23 16:00:41 -07:00
parent 572702bac0
commit 687151c36b
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
NewHorizons/Builder/Props/DetailBuilder.cs
View File

@ -119,7 +119,7 @@ namespace NewHorizons.Builder.Props
{ {
if (FixUnsectoredComponent(component)) continue; if (FixUnsectoredComponent(component)) continue;
} }
else FixSectoredComponent(component, sector, isTorch); else FixSectoredComponent(component, sector, isTorch, detail.keepLoaded);
FixComponent(component, go); FixComponent(component, go);
} }
@ -214,10 +214,7 @@ namespace NewHorizons.Builder.Props
/// <summary> /// <summary>
/// Fix components that have sectors. Has a specific fix if there is a VisionTorchItem on the object. /// Fix components that have sectors. Has a specific fix if there is a VisionTorchItem on the object.
/// </summary> /// </summary>
/// <param name="component"></param> private static void FixSectoredComponent(Component component, Sector sector, bool isTorch, bool keepLoaded)
/// <param name="sector"></param>
/// <param name="isTorch"></param>
private static void FixSectoredComponent(Component component, Sector sector, bool isTorch = false)
{ {
// fix Sector stuff, eg SectorCullGroup (without this, props that have a SectorCullGroup component will become invisible inappropriately) // fix Sector stuff, eg SectorCullGroup (without this, props that have a SectorCullGroup component will become invisible inappropriately)
if (component is ISectorGroup sectorGroup) if (component is ISectorGroup sectorGroup)
@ -225,6 +222,14 @@ namespace NewHorizons.Builder.Props
sectorGroup.SetSector(sector); sectorGroup.SetSector(sector);
} }
// keepLoaded should remove existing groups
// renderers/colliders get enabled later so we dont have to do that here
if (keepLoaded && component is SectorCullGroup or SectorCollisionGroup or SectorLightsCullGroup)
{
Component.DestroyImmediate(component);
return;
}
// Not doing else if here because idk if any of the classes below implement ISectorGroup // Not doing else if here because idk if any of the classes below implement ISectorGroup
if (component is Sector s) if (component is Sector s)
@ -235,6 +240,12 @@ namespace NewHorizons.Builder.Props
else if (component is SectorCullGroup sectorCullGroup) else if (component is SectorCullGroup sectorCullGroup)
{ {
sectorCullGroup._controllingProxy = null; sectorCullGroup._controllingProxy = null;
// fixes sector cull group deactivating renderers on map view enter and fast foward
// TODO: does this actually work? what? how?
sectorCullGroup._inMapView = false;
sectorCullGroup._isFastForwarding = false;
sectorCullGroup.SetVisible(sectorCullGroup.ShouldBeVisible(), true, false);
} }
else if(component is SectoredMonoBehaviour behaviour) else if(component is SectoredMonoBehaviour behaviour)
@ -265,7 +276,7 @@ namespace NewHorizons.Builder.Props
/// </summary> /// </summary>
private static bool FixUnsectoredComponent(Component component) private static bool FixUnsectoredComponent(Component component)
{ {
if (component is FogLight or SectoredMonoBehaviour) if (component is FogLight or SectoredMonoBehaviour or ISectorGroup)
{ {
GameObject.DestroyImmediate(component); GameObject.DestroyImmediate(component);
return true; return true;
@ -340,15 +351,6 @@ namespace NewHorizons.Builder.Props
else if (component is Renderer renderer && component.gameObject.GetComponent<ElectricityEffect>() == null) renderer.enabled = true; else if (component is Renderer renderer && component.gameObject.GetComponent<ElectricityEffect>() == null) renderer.enabled = true;
else if(component is Shape shape) shape.enabled = true; else if(component is Shape shape) shape.enabled = true;
// fixes sector cull group deactivating renderers on map view enter and fast foward
// TODO: does this actually work? what? how?
else if(component is SectorCullGroup sectorCullGroup)
{
sectorCullGroup._inMapView = false;
sectorCullGroup._isFastForwarding = false;
sectorCullGroup.SetVisible(sectorCullGroup.ShouldBeVisible(), true, false);
}
// If it's not a moving anglerfish make sure the anim controller is regular // If it's not a moving anglerfish make sure the anim controller is regular
else if(component is AnglerfishAnimController && component.GetComponentInParent<AnglerfishController>() == null) else if(component is AnglerfishAnimController && component.GetComponentInParent<AnglerfishController>() == null)
{ {