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

Incorporate light intensity into choice of "closest" star

Browse Source
This commit is contained in:
Nick J. Connors 2021-12-31 06:22:39 -05:00
parent 34edaf3547
commit 2b988257e0
3 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
NewHorizons/Builder/Props/PropBuilder.cs
View File

@ -13,15 +13,15 @@ namespace NewHorizons.Builder.Props
{ {
public static class PropBuilder public static class PropBuilder
{ {
public static void Make(GameObject body, string propToClone, Vector3 position, Sector sector) public static GameObject Make(GameObject body, string propToClone, Vector3 position, Sector sector)
{ {
var prefab = GameObject.Find(propToClone); var prefab = GameObject.Find(propToClone);
Make(body, prefab, position, sector); return Make(body, prefab, position, sector);
} }
public static void Make(GameObject body, GameObject prefab, Vector3 position, Sector sector) public static GameObject Make(GameObject body, GameObject prefab, Vector3 position, Sector sector)
{ {
if (prefab == null) return; if (prefab == null) return null;
GameObject prop = GameObject.Instantiate(prefab, sector.transform); GameObject prop = GameObject.Instantiate(prefab, sector.transform);
prop.transform.localPosition = position; prop.transform.localPosition = position;
@ -43,7 +43,6 @@ namespace NewHorizons.Builder.Props
sector.OnOccupantEnterSector += ((SectorDetector sd) => StreamingManager.LoadStreamingAssets(assetBundle)); sector.OnOccupantEnterSector += ((SectorDetector sd) => StreamingManager.LoadStreamingAssets(assetBundle));
} }
/*
foreach(var component in prop.GetComponentsInChildren<Component>()) foreach(var component in prop.GetComponentsInChildren<Component>())
{ {
try try
@ -61,25 +60,13 @@ namespace NewHorizons.Builder.Props
Logger.Log($"Found a _sector field in {component}"); Logger.Log($"Found a _sector field in {component}");
sectorField.SetValue(component, sector); sectorField.SetValue(component, sector);
} }
else
{
if(component is Campfire)
{
Logger.Log("CAMPFIRE");
Campfire campfire = component as Campfire;
if (campfire._sector != null)
campfire._sector.OnSectorOccupantsUpdated -= campfire.OnSectorOccupantsUpdated;
campfire._sector = sector;
campfire._sector.OnSectorOccupantsUpdated += campfire.OnSectorOccupantsUpdated;
}
}
} }
catch (Exception e) { Logger.Log($"{e.Message}, {e.StackTrace}"); } catch (Exception e) { Logger.Log($"{e.Message}, {e.StackTrace}"); }
} }
*/
prop.SetActive(true); prop.SetActive(true);
return prop;
} }
public static void Scatter(GameObject body, PropModule.ScatterInfo[] scatterInfo, float radius, Sector sector) public static void Scatter(GameObject body, PropModule.ScatterInfo[] scatterInfo, float radius, Sector sector)
@ -87,14 +74,16 @@ namespace NewHorizons.Builder.Props
var area = 4f * Mathf.PI * radius * radius; var area = 4f * Mathf.PI * radius * radius;
var points = FibonacciSphere((int)area); var points = FibonacciSphere((int)area);
foreach (var scatterer in scatterInfo) foreach (var propInfo in scatterInfo)
{ {
var prefab = GameObject.Find(scatterer.path); var prefab = GameObject.Find(propInfo.path);
for(int i = 0; i < scatterer.count; i++) for(int i = 0; i < propInfo.count; i++)
{ {
var randomInd = (int)Random.Range(0, points.Count); var randomInd = (int)Random.Range(0, points.Count);
var point = points[randomInd]; var point = points[randomInd];
Make(body, prefab, point.normalized * radius, sector); var prop = Make(body, prefab, point.normalized * radius, sector);
if(propInfo.offset != null) prop.transform.localPosition += prop.transform.TransformVector(propInfo.offset);
if(propInfo.rotation != null) prop.transform.rotation *= Quaternion.Euler(propInfo.rotation);
points.RemoveAt(randomInd); points.RemoveAt(randomInd);
if (points.Count == 0) return; if (points.Count == 0) return;
} }

2
NewHorizons/External/PropModule.cs vendored
View File

@ -16,6 +16,8 @@ namespace NewHorizons.External
{ {
public string path; public string path;
public int count; public int count;
public MVector3 offset;
public MVector3 rotation;
} }
} }
} }

2
NewHorizons/Utility/StarLightController.cs
View File

@ -63,7 +63,7 @@ namespace NewHorizons.Utility
origin = Locator.GetActiveCamera().transform.position; origin = Locator.GetActiveCamera().transform.position;
} }
if ((star.transform.position - origin).sqrMagnitude < (_activeStar.transform.position - origin).sqrMagnitude) if (star.Intensity * (star.transform.position - origin).sqrMagnitude < star.Intensity * (_activeStar.transform.position - origin).sqrMagnitude)
{ {
ChangeActiveStar(star); ChangeActiveStar(star);
break; break;