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

Merge branch 'dev' of https://github.com/xen-42/outer-wilds-new-horizons into dev

Browse Source
This commit is contained in:
Nick 2022-07-21 21:58:21 -04:00
commit 5ab573b907
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NewHorizons/Builder/Body/Geometry/CubeSphere.cs
View File

@ -132,7 +132,7 @@ namespace NewHorizons.Builder.Body.Geometry
float sampleX = heightMap.width * longitude / 360f; float sampleX = heightMap.width * longitude / 360f;
float sampleY = heightMap.height * latitude / 180f; float sampleY = heightMap.height * latitude / 180f;
if (sampleX > heightMap.width) sampleX -= heightMap.width; // TODO: find out if this actually doesnt anything if (sampleX > heightMap.width) sampleX -= heightMap.width; // TODO: find out if this actually does anything
float relativeHeight = heightMap.GetPixel((int)sampleX, (int)sampleY).r; float relativeHeight = heightMap.GetPixel((int)sampleX, (int)sampleY).r;

5
NewHorizons/Handlers/PlanetCreationHandler.cs
View File

@ -113,7 +113,7 @@ namespace NewHorizons.Handlers
Logger.Log("Loading Deferred Bodies"); Logger.Log("Loading Deferred Bodies");
// Make a copy of the next pass of bodies so that the array can be edited while we load them // Make a copy of the next pass of bodies so that the array can be edited while we load them
toLoad = _nextPassBodies.Select(x => x).ToList(); toLoad = _nextPassBodies.ToList();
while (_nextPassBodies.Count != 0) while (_nextPassBodies.Count != 0)
{ {
foreach (var body in toLoad) foreach (var body in toLoad)
@ -273,7 +273,8 @@ namespace NewHorizons.Handlers
foreach (var childObj in transforms.Where(x => x.GetPath() == path)) foreach (var childObj in transforms.Where(x => x.GetPath() == path))
{ {
flag = false; flag = false;
childObj.gameObject.SetActive(false); // idk why we wait here but we do
Delay.FireInNUpdates(() => childObj.gameObject.SetActive(false), 2);
} }
if (flag) Logger.LogWarning($"Couldn't find \"{childPath}\"."); if (flag) Logger.LogWarning($"Couldn't find \"{childPath}\".");