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

rename again

Browse Source
This commit is contained in:
JohnCorby 2022-07-09 16:23:29 -07:00
parent 0cbfdb4458
commit efff52cce3
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NewHorizons/Builder/Props/BrambleNodeBuilder.cs
View File

@ -187,7 +187,7 @@ namespace NewHorizons.Builder.Props
var path = config.isSeed ? brambleSeedPrefabPath : brambleNodePrefabPath;
var brambleNode = SearchUtilities.Find(path).InstantiateInactive();
StreamingHandler.HookStreaming(brambleNode);
StreamingHandler.SetUpStreaming(brambleNode);
sector.OnOccupantEnterSector += (sd) => StreamingHandler.OnOccupantEnterSector(brambleNode, sd, sector);
brambleNode.transform.parent = sector.transform;

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

@ -110,7 +110,7 @@ namespace NewHorizons.Builder.Props
prop.SetActive(false);
if (sector != null) sector.OnOccupantEnterSector += (SectorDetector sd) => StreamingHandler.OnOccupantEnterSector(prop, sd, sector);
StreamingHandler.HookStreaming(prop);
StreamingHandler.SetUpStreaming(prop);
foreach (var component in prop.GetComponents<Component>().Concat(prop.GetComponentsInChildren<Component>()))
{

12
NewHorizons/Builder/Props/NomaiTextBuilder.cs
View File

@ -201,8 +201,8 @@ namespace NewHorizons.Builder.Props
AddTranslation(xmlPath);
// Make sure the computer model is loaded
StreamingHandler.HookStreaming(computerObject);
sector.OnOccupantEnterSector.AddListener((x) => StreamingHandler.HookStreaming(computerObject));
StreamingHandler.SetUpStreaming(computerObject);
sector.OnOccupantEnterSector.AddListener((x) => StreamingHandler.SetUpStreaming(computerObject));
computerObject.SetActive(true);
conversationInfoToCorrespondingSpawnedGameObject[info] = computerObject;
@ -249,8 +249,8 @@ namespace NewHorizons.Builder.Props
AddTranslation(xmlPath);
// Make sure the computer model is loaded
StreamingHandler.HookStreaming(cairnObject);
sector.OnOccupantEnterSector.AddListener((x) => StreamingHandler.HookStreaming(cairnObject));
StreamingHandler.SetUpStreaming(cairnObject);
sector.OnOccupantEnterSector.AddListener((x) => StreamingHandler.SetUpStreaming(cairnObject));
conversationInfoToCorrespondingSpawnedGameObject[info] = cairnObject;
break;
}
@ -281,8 +281,8 @@ namespace NewHorizons.Builder.Props
AddTranslation(xmlPath);
// Make sure the recorder model is loaded
StreamingHandler.HookStreaming(recorderObject);
sector.OnOccupantEnterSector.AddListener((x) => StreamingHandler.HookStreaming(recorderObject));
StreamingHandler.SetUpStreaming(recorderObject);
sector.OnOccupantEnterSector.AddListener((x) => StreamingHandler.SetUpStreaming(recorderObject));
recorderObject.SetActive(true);

8
NewHorizons/Builder/Props/ProjectionBuilder.cs
View File

@ -129,8 +129,8 @@ namespace NewHorizons.Builder.Props
// Idk why but it wants reveals to be comma delimited not a list
if (info.reveals != null) slideCollectionContainer._shipLogOnComplete = string.Join(",", info.reveals);
StreamingHandler.HookStreaming(slideReelObj);
sector.OnOccupantEnterSector.AddListener((x) => StreamingHandler.HookStreaming(slideReelObj));
StreamingHandler.SetUpStreaming(slideReelObj);
sector.OnOccupantEnterSector.AddListener((x) => StreamingHandler.SetUpStreaming(slideReelObj));
slideReelObj.SetActive(true);
}
@ -180,8 +180,8 @@ namespace NewHorizons.Builder.Props
slideCollectionContainer.slideCollection = slideCollection;
StreamingHandler.HookStreaming(projectorObj);
sector.OnOccupantEnterSector.AddListener((x) => StreamingHandler.HookStreaming(projectorObj));
StreamingHandler.SetUpStreaming(projectorObj);
sector.OnOccupantEnterSector.AddListener((x) => StreamingHandler.SetUpStreaming(projectorObj));
// Change the picture on the lens
var lens = projectorObj.transform.Find("Spotlight/Prop_IP_SingleSlideProjector/Projector_Lens").GetComponent<MeshRenderer>();

2
NewHorizons/Builder/Props/RaftBuilder.cs
View File

@ -30,7 +30,7 @@ namespace NewHorizons.Builder.Props
raftObject.transform.rotation = planetGO.transform.TransformRotation(Quaternion.identity);
sector.OnOccupantEnterSector += (sd) => StreamingHandler.OnOccupantEnterSector(raftObject, sd, sector);
StreamingHandler.HookStreaming(raftObject);
StreamingHandler.SetUpStreaming(raftObject);
var raftController = raftObject.GetComponent<RaftController>();
// Since awake already ran we have to unhook these events

4
NewHorizons/Builder/Props/TornadoBuilder.cs
View File

@ -136,8 +136,8 @@ namespace NewHorizons.Builder.Props
controller._midBone.localPosition = controller._midStartPos;
controller._topBone.localPosition = controller._topStartPos;
StreamingHandler.HookStreaming(tornadoGO);
sector.OnOccupantEnterSector += (sd) => StreamingHandler.HookStreaming(tornadoGO);
StreamingHandler.SetUpStreaming(tornadoGO);
sector.OnOccupantEnterSector += (sd) => StreamingHandler.SetUpStreaming(tornadoGO);
tornadoGO.GetComponentInChildren<CapsuleShape>().enabled = true;

4
NewHorizons/Handlers/StreamingHandler.cs
View File

@ -19,7 +19,7 @@ namespace NewHorizons.Handlers
public static void OnOccupantEnterSector(GameObject obj, SectorDetector sd, Sector sector)
{
HookStreaming(obj);
SetUpStreaming(obj);
// If its too laggy put this back idk
/*
@ -33,7 +33,7 @@ namespace NewHorizons.Handlers
/// <summary>
/// makes it so that this object's streaming stuff will be connected to the given sector
/// </summary>
public static void HookStreaming(GameObject obj, Sector sector = null)
public static void SetUpStreaming(GameObject obj, Sector sector = null)
{
List<string> assetBundles;
if (_objectCache.ContainsKey(obj))