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

Move rename and parent path into MakeDetail

Browse Source
This commit is contained in:
Noah Pilarski 2022-08-20 09:53:48 -04:00
parent ecd9576089
commit 3d92f7a0ce
1 changed files with 15 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,24 +79,6 @@ namespace NewHorizons.Builder.Props
detailGO = newDetailGO; detailGO = newDetailGO;
} }
if (detail.rename != null)
{
detailGO.name = detail.rename;
}
if (!string.IsNullOrEmpty(detail.parentPath))
{
var newParent = go.transform.Find(detail.parentPath);
if (newParent != null)
{
detailGO.transform.parent = newParent.transform;
}
else
{
Logger.LogWarning($"Cannot find parent object at path: {go.name}/{detail.parentPath}");
}
}
detailInfoToCorrespondingSpawnedGameObject[detail] = detailGO; detailInfoToCorrespondingSpawnedGameObject[detail] = detailGO;
} }
@ -152,24 +134,6 @@ namespace NewHorizons.Builder.Props
detailGO = newDetailGO; detailGO = newDetailGO;
} }
if (info.rename != null)
{
detailGO.name = info.rename;
}
if (!string.IsNullOrEmpty(info.parentPath))
{
var newParent = planetGO.transform.Find(info.parentPath);
if (newParent != null)
{
detailGO.transform.parent = newParent.transform;
}
else
{
Logger.LogWarning($"Cannot find parent object at path: {planetGO.name}/{info.parentPath}");
}
}
return detailGO; return detailGO;
} }
} }
@ -179,9 +143,23 @@ namespace NewHorizons.Builder.Props
if (prefab == null) return null; if (prefab == null) return null;
GameObject prop = prefab.InstantiateInactive(); GameObject prop = prefab.InstantiateInactive();
prop.name = prefab.name; prop.name = !string.IsNullOrEmpty(info.rename) ? info.rename : prefab.name;
prop.transform.parent = sector?.transform ?? planetGO.transform; prop.transform.parent = sector?.transform ?? planetGO.transform;
if (!string.IsNullOrEmpty(info.parentPath))
{
var newParent = planetGO.transform.Find(info.parentPath);
if (newParent != null)
{
prop.transform.parent = newParent.transform;
}
else
{
Logger.LogWarning($"Cannot find parent object at path: {planetGO.name}/{info.parentPath}");
}
}
StreamingHandler.SetUpStreaming(prop, sector); StreamingHandler.SetUpStreaming(prop, sector);
var isTorch = prop.GetComponent<VisionTorchItem>() != null; var isTorch = prop.GetComponent<VisionTorchItem>() != null;