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

Non sequential

Browse Source
This commit is contained in:
Nick 2024-06-14 21:43:00 -04:00
parent 5b830ceef1
commit 827bf24339
2 changed files with 145 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,16 +149,45 @@ namespace NewHorizons.Builder.Props
// We can fit 16 slides max into an atlas // We can fit 16 slides max into an atlas
var textures = new Texture2D[slidesCount > 16 ? 16 : slidesCount]; var textures = new Texture2D[slidesCount > 16 ? 16 : slidesCount];
var imageLoader = StartAsyncLoader(mod, info.slides, ref slideCollection); var (invImageLoader, atlasImageLoader, imageLoader) = StartAsyncLoader(mod, info.slides, ref slideCollection);
var key = GetUniqueSlideReelID(mod, info.slides); var key = GetUniqueSlideReelID(mod, info.slides);
// this variable just lets us track how many of the first 15 slides have been loaded. if (invImageLoader != null && atlasImageLoader != null)
// 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 build the slide reel texture. This allows us // Loading directly from cache
// to avoid doing a "is every element in the array `textures` not null" check every time a texture finishes loading invImageLoader.imageLoadedEvent.AddListener(
int displaySlidesLoaded = 0; (Texture2D tex, int index, string originalPath) =>
imageLoader.imageLoadedEvent.AddListener( {
slideCollection.slides[index]._image = tex;
}
);
atlasImageLoader.imageLoadedEvent.AddListener(
(Texture2D tex, int _, string originalPath) =>
{
// all textures required to build the reel's textures have been loaded
var slidesBack = slideReelObj.GetComponentInChildren<TransformAnimator>().transform.Find("Slides_Back").GetComponent<MeshRenderer>();
var slidesFront = slideReelObj.GetComponentInChildren<TransformAnimator>().transform.Find("Slides_Front").GetComponent<MeshRenderer>();
// Now put together the textures into a 4x4 thing for the materials
var reelTexture = tex;
slidesBack.material.mainTexture = reelTexture;
slidesBack.material.SetTexture(EmissionMap, reelTexture);
slidesBack.material.name = reelTexture.name;
slidesFront.material.mainTexture = reelTexture;
slidesFront.material.SetTexture(EmissionMap, reelTexture);
slidesFront.material.name = reelTexture.name;
}
);
}
else
{
// this variable just lets us track how many of the first 15 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 build the slide reel texture. This allows us
// to avoid doing a "is every element in the array `textures` not null" check every time a texture finishes loading
int displaySlidesLoaded = 0;
imageLoader.imageLoadedEvent.AddListener(
(Texture2D tex, int index, string originalPath) => (Texture2D tex, int index, string originalPath) =>
{ {
var time = DateTime.Now; var time = DateTime.Now;
@ -188,8 +217,9 @@ namespace NewHorizons.Builder.Props
} }
NHLogger.LogVerbose($"Slide reel make reel texture {(DateTime.Now - time).TotalMilliseconds}ms"); NHLogger.LogVerbose($"Slide reel make reel texture {(DateTime.Now - time).TotalMilliseconds}ms");
} });
); }
// Else when you put them down you can't pick them back up // Else when you put them down you can't pick them back up
slideReelObj.GetComponent<OWCollider>()._physicsRemoved = false; slideReelObj.GetComponent<OWCollider>()._physicsRemoved = false;
@ -210,58 +240,58 @@ namespace NewHorizons.Builder.Props
switch (model) switch (model)
{ {
case ProjectionInfo.SlideReelType.SixSlides: case ProjectionInfo.SlideReelType.SixSlides:
{
switch (condition)
{ {
case ProjectionInfo.SlideReelCondition.Antique: switch (condition)
default: {
return SlideReel6Prefab; case ProjectionInfo.SlideReelCondition.Antique:
case ProjectionInfo.SlideReelCondition.Pristine: default:
return SlideReel6PristinePrefab; return SlideReel6Prefab;
case ProjectionInfo.SlideReelCondition.Rusted: case ProjectionInfo.SlideReelCondition.Pristine:
return SlideReel6RustedPrefab; return SlideReel6PristinePrefab;
case ProjectionInfo.SlideReelCondition.Rusted:
return SlideReel6RustedPrefab;
}
} }
}
case ProjectionInfo.SlideReelType.SevenSlides: case ProjectionInfo.SlideReelType.SevenSlides:
default: default:
{
switch (condition)
{ {
case ProjectionInfo.SlideReelCondition.Antique: switch (condition)
default: {
return SlideReel7Prefab; case ProjectionInfo.SlideReelCondition.Antique:
case ProjectionInfo.SlideReelCondition.Pristine: default:
return SlideReel7PristinePrefab; return SlideReel7Prefab;
case ProjectionInfo.SlideReelCondition.Rusted: case ProjectionInfo.SlideReelCondition.Pristine:
return SlideReel7RustedPrefab; return SlideReel7PristinePrefab;
case ProjectionInfo.SlideReelCondition.Rusted:
return SlideReel7RustedPrefab;
}
} }
}
case ProjectionInfo.SlideReelType.EightSlides: case ProjectionInfo.SlideReelType.EightSlides:
{
switch (condition)
{ {
case ProjectionInfo.SlideReelCondition.Antique: switch (condition)
default: {
return SlideReel8Prefab; case ProjectionInfo.SlideReelCondition.Antique:
case ProjectionInfo.SlideReelCondition.Pristine: default:
return SlideReel8PristinePrefab; return SlideReel8Prefab;
case ProjectionInfo.SlideReelCondition.Rusted: case ProjectionInfo.SlideReelCondition.Pristine:
return SlideReel8RustedPrefab; return SlideReel8PristinePrefab;
case ProjectionInfo.SlideReelCondition.Rusted:
return SlideReel8RustedPrefab;
}
} }
}
case ProjectionInfo.SlideReelType.Whole: case ProjectionInfo.SlideReelType.Whole:
{
switch (condition)
{ {
case ProjectionInfo.SlideReelCondition.Antique: switch (condition)
default: {
return SlideReelWholePrefab; case ProjectionInfo.SlideReelCondition.Antique:
case ProjectionInfo.SlideReelCondition.Pristine: default:
return SlideReelWholePristinePrefab; return SlideReelWholePrefab;
case ProjectionInfo.SlideReelCondition.Rusted: case ProjectionInfo.SlideReelCondition.Pristine:
return SlideReelWholeRustedPrefab; return SlideReelWholePristinePrefab;
case ProjectionInfo.SlideReelCondition.Rusted:
return SlideReelWholeRustedPrefab;
}
} }
}
} }
} }
@ -314,13 +344,25 @@ namespace NewHorizons.Builder.Props
var slideCollection = new SlideCollection(slidesCount); var slideCollection = new SlideCollection(slidesCount);
slideCollection.streamingAssetIdentifier = string.Empty; // NREs if null slideCollection.streamingAssetIdentifier = string.Empty; // NREs if null
var imageLoader = StartAsyncLoader(mod, info.slides, ref slideCollection); var (invImageLoader, _, imageLoader) = StartAsyncLoader(mod, info.slides, ref slideCollection);
imageLoader.imageLoadedEvent.AddListener((Texture2D tex, int index, string originalPath) => if (invImageLoader != null)
{ {
var time = DateTime.Now; // Loaded directly from cache
slideCollection.slides[index]._image = ImageUtilities.InvertSlideReel(mod, tex, originalPath); invImageLoader.imageLoadedEvent.AddListener((Texture2D tex, int index, string originalPath) =>
NHLogger.LogVerbose($"Slide reel invert time {(DateTime.Now - time).TotalMilliseconds}ms"); {
}); slideCollection.slides[index]._image = tex;
});
}
else
{
// Create the inverted cache from existing images
imageLoader.imageLoadedEvent.AddListener((Texture2D tex, int index, string originalPath) =>
{
var time = DateTime.Now;
slideCollection.slides[index]._image = ImageUtilities.InvertSlideReel(mod, tex, originalPath);
NHLogger.LogVerbose($"Slide reel invert time {(DateTime.Now - time).TotalMilliseconds}ms");
});
}
slideCollectionContainer.slideCollection = slideCollection; slideCollectionContainer.slideCollection = slideCollection;
@ -358,7 +400,7 @@ namespace NewHorizons.Builder.Props
var slideCollection = new SlideCollection(slidesCount); // TODO: uh I think that info.slides[i].playTimeDuration is not being read here... note to self for when I implement support for that: 0.7 is what to default to if playTimeDuration turns out to be 0 var slideCollection = new SlideCollection(slidesCount); // TODO: uh I think that info.slides[i].playTimeDuration is not being read here... note to self for when I implement support for that: 0.7 is what to default to if playTimeDuration turns out to be 0
slideCollection.streamingAssetIdentifier = string.Empty; // NREs if null slideCollection.streamingAssetIdentifier = string.Empty; // NREs if null
var imageLoader = StartAsyncLoader(mod, info.slides, ref slideCollection); var (_, _, imageLoader) = StartAsyncLoader(mod, info.slides, ref slideCollection);
imageLoader.imageLoadedEvent.AddListener((Texture2D tex, int index, string originalPath) => imageLoader.imageLoadedEvent.AddListener((Texture2D tex, int index, string originalPath) =>
{ {
var time = DateTime.Now; var time = DateTime.Now;
@ -411,7 +453,7 @@ namespace NewHorizons.Builder.Props
var slideCollection = new SlideCollection(slidesCount); var slideCollection = new SlideCollection(slidesCount);
slideCollection.streamingAssetIdentifier = string.Empty; // NREs if null slideCollection.streamingAssetIdentifier = string.Empty; // NREs if null
var imageLoader = StartAsyncLoader(mod, slides, ref slideCollection); var (_, _, imageLoader) = StartAsyncLoader(mod, slides, ref slideCollection);
// This variable just lets us track how many of the slides have been loaded. // 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 // This way as soon as the last one is loaded (due to async loading, this may be
@ -454,7 +496,8 @@ namespace NewHorizons.Builder.Props
return standingTorch; return standingTorch;
} }
private static SlideReelAsyncImageLoader StartAsyncLoader(IModBehaviour mod, SlideInfo[] slides, ref SlideCollection slideCollection) private static (SlideReelAsyncImageLoader inverted, SlideReelAsyncImageLoader atlas, SlideReelAsyncImageLoader slides)
StartAsyncLoader(IModBehaviour mod, SlideInfo[] slides, ref SlideCollection slideCollection)
{ {
var invertedImageLoader = new SlideReelAsyncImageLoader(); var invertedImageLoader = new SlideReelAsyncImageLoader();
var atlasImageLoader = new SlideReelAsyncImageLoader(); var atlasImageLoader = new SlideReelAsyncImageLoader();
@ -462,19 +505,15 @@ namespace NewHorizons.Builder.Props
var atlasKey = GetUniqueSlideReelID(mod, slides); var atlasKey = GetUniqueSlideReelID(mod, slides);
// attempt to load atlas guy from disk and precache so theres a cache hit when using ImageUtilities var cacheExists = Directory.Exists(Path.Combine(mod.ModHelper.Manifest.ModFolderPath, ATLAS_SLIDE_CACHE_FOLDER));
atlasImageLoader.PathsToLoad.Add((0, Path.Combine(mod.ModHelper.Manifest.ModFolderPath, ATLAS_SLIDE_CACHE_FOLDER, $"{atlasKey}.png")));
atlasImageLoader.imageLoadedEvent.AddListener((Texture2D t, int i, string s) => NHLogger.Log($"Does cache exist for slide reels? {cacheExists}");
if (cacheExists)
{ {
NHLogger.Log($"SLIDE REEL ATLAS from {slides.First().imagePath}: {s}"); // Load the atlas texture used to draw onto the physical slide reel object
ImageUtilities.TrackCachedTexture(atlasKey, t); atlasImageLoader.PathsToLoad.Add((0, Path.Combine(mod.ModHelper.Manifest.ModFolderPath, ATLAS_SLIDE_CACHE_FOLDER, $"{atlasKey}.png")));
}); }
invertedImageLoader.imageLoadedEvent.AddListener((Texture2D t, int i, string s) =>
{
var path = Path.Combine(mod.ModHelper.Manifest.ModFolderPath, slides[i].imagePath);
var key = $"{ImageUtilities.GetKey(path)} > invert";
ImageUtilities.TrackCachedTexture(key, t);
});
for (int i = 0; i < slides.Length; i++) for (int i = 0; i < slides.Length; i++)
{ {
@ -488,8 +527,11 @@ namespace NewHorizons.Builder.Props
} }
else else
{ {
// attempt to load inverted guy from disk and precache so theres a cache hit when using ImageUtilities if (cacheExists)
invertedImageLoader.PathsToLoad.Add((i, Path.Combine(mod.ModHelper.Manifest.ModFolderPath, INVERTED_SLIDE_CACHE_FOLDER, slideInfo.imagePath))); {
// Load the inverted images used when displaying slide reels to a screen
invertedImageLoader.PathsToLoad.Add((i, Path.Combine(mod.ModHelper.Manifest.ModFolderPath, INVERTED_SLIDE_CACHE_FOLDER, slideInfo.imagePath)));
}
imageLoader.PathsToLoad.Add((i, Path.Combine(mod.ModHelper.Manifest.ModFolderPath, slideInfo.imagePath))); imageLoader.PathsToLoad.Add((i, Path.Combine(mod.ModHelper.Manifest.ModFolderPath, slideInfo.imagePath)));
} }
@ -497,13 +539,25 @@ namespace NewHorizons.Builder.Props
slideCollection.slides[i] = slide; slideCollection.slides[i] = slide;
} }
// Loaders go sequentually - Load the inverted textures to the cache so that ImageUtilities will reuse them later
invertedImageLoader.Start(true);
// Atlas texture next so that the normal iamgeLoader knows not to regenerate them unless they were missing
atlasImageLoader.Start(false);
imageLoader.Start(true);
return imageLoader; if (cacheExists)
{
// This code will execute in order to create the cache
// Loaders go sequentually - Load the inverted textures to the cache so that ImageUtilities will reuse them later
invertedImageLoader.Start(true);
// Atlas texture next so that the normal iamgeLoader knows not to regenerate them unless they were missing
atlasImageLoader.Start(false);
imageLoader.Start(true);
return (invertedImageLoader, atlasImageLoader, imageLoader);
}
else
{
// Will be slow and create the cache
imageLoader.Start(true);
return (null, null, imageLoader);
}
} }
private static void AddModules(SlideInfo slideInfo, ref Slide slide, IModBehaviour mod) private static void AddModules(SlideInfo slideInfo, ref Slide slide, IModBehaviour mod)

5
NewHorizons/Utility/Files/SlideReelAsyncImageLoader.cs
View File

@ -143,6 +143,11 @@ public class SlideReelAsyncImageLoader
public void Load(SlideReelAsyncImageLoader loader) public void Load(SlideReelAsyncImageLoader loader)
{ {
StartCoroutine(loader.DownloadTextures());
return;
// Sequential
_loaders.Enqueue(loader); _loaders.Enqueue(loader);
if (!_isLoading) if (!_isLoading)
{ {