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

added a FindChild function to search utilities, disabled standing vision torches until all their textures have loaded

Browse Source
This commit is contained in:
FreezeDriedMangoes 2022-05-25 11:19:26 -04:00
parent 3f4b2fbe88
commit 5943e306ba
3 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,7 +249,12 @@ namespace NewHorizons.Builder.Props
var mindSlideProjector = standingTorch.GetComponent<MindSlideProjector>();
mindSlideProjector._mindProjectorImageEffect = GameObject.Find("Player_Body/PlayerCamera").GetComponent<MindProjectorImageEffect>();
// setup for visually supporting async texture loading
mindSlideProjector.enabled = false;
var visionBeamEffect = SearchUtilities.FindChild(standingTorch, "VisionBeam");
visionBeamEffect.SetActive(false);
//
// set up slides
//
@ -271,7 +276,25 @@ namespace NewHorizons.Builder.Props
slideCollection.slides[i] = slide;
}
imageLoader.imageLoadedEvent.AddListener((Texture2D tex, int index) => { slideCollection.slides[index].textureOverride = tex; });
// this variable just lets us track how many of the slides have been loaded.
// this way as soon as the last one is loaded (due to async loading, this may be
// slide 7, or slide 3, or whatever), we can enable the vision torch. This allows us
// to avoid doing a "is every element in the array `slideCollection.slides` not null" check every time a texture finishes loading
int displaySlidesLoaded = 0;
imageLoader.imageLoadedEvent.AddListener(
(Texture2D tex, int index) =>
{
slideCollection.slides[index].textureOverride = tex;
displaySlidesLoaded++; // threading moment
if (displaySlidesLoaded >= slides.Length)
{
mindSlideProjector.enabled = true;
visionBeamEffect.SetActive(true);
}
}
);
// set up the containers for the slides
var slideCollectionContainer = standingTorch.AddComponent<SlideCollectionContainer>();
@ -281,9 +304,8 @@ namespace NewHorizons.Builder.Props
// make sure that these slides play when the player wanders into the beam
// _slideCollectionItem is actually a reference to a SlideCollectionContainer. Not a slide reel item
standingTorch.GetComponent<MindSlideProjector>()._mindSlideCollection = mindSlideCollection;
mindSlideProjector._mindSlideCollection = mindSlideCollection;
mindSlideProjector._slideCollectionItem = slideCollectionContainer;
mindSlideProjector._mindSlideCollection = mindSlideCollection;
mindSlideProjector.SetMindSlideCollection(mindSlideCollection);

2
NewHorizons/Utility/ImageUtilities.cs
View File

@ -337,7 +337,6 @@ namespace NewHorizons.Utility
IEnumerator DownloadTexture(string url, int index)
{
Logger.Log("loading img " + url);
using (UnityWebRequest uwr = UnityWebRequestTexture.GetTexture(url))
{
yield return uwr.SendWebRequest();
@ -352,7 +351,6 @@ namespace NewHorizons.Utility
{
// Get downloaded asset bundle
var texture = DownloadHandlerTexture.GetContent(uwr);
Logger.Log("Finished loading image " + url);
imageLoadedEvent.Invoke(texture, index);
}
}

12
NewHorizons/Utility/SearchUtilities.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
@ -119,6 +119,16 @@ namespace NewHorizons.Utility
}
*/
public static GameObject FindChild(GameObject g, string childName)
{
foreach(Transform child in g.transform)
{
if (child.gameObject.name == childName) return child.gameObject;
}
return null;
}
public static GameObject Find(string path)
{
if (CachedGameObjects.ContainsKey(path))