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

Null check instead

Browse Source
This commit is contained in:
Noah Pilarski 2022-09-17 14:40:32 -04:00
parent 223b35c066
commit 9599003f87
5 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NewHorizons/Builder/Props/DialogueBuilder.cs
View File

@ -103,7 +103,7 @@ namespace NewHorizons.Builder.Props
conversationZone.transform.parent = planetGO.transform.Find(info.pathToAnimController); conversationZone.transform.parent = planetGO.transform.Find(info.pathToAnimController);
} }
conversationZone.transform.position = planetGO.transform.TransformPoint(info.position); conversationZone.transform.position = planetGO.transform.TransformPoint(info?.position ?? Vector3.zero);
conversationZone.SetActive(true); conversationZone.SetActive(true);
return dialogueTree; return dialogueTree;

2
NewHorizons/Builder/Props/NomaiTextBuilder.cs
View File

@ -147,7 +147,7 @@ namespace NewHorizons.Builder.Props
} }
} }
nomaiWallTextObj.transform.position = planetGO.transform.TransformPoint(info.position); nomaiWallTextObj.transform.position = planetGO.transform.TransformPoint(info?.position ?? Vector3.zero);
if (info.normal != null) if (info.normal != null)
{ {
// In global coordinates (normal was in local coordinates) // In global coordinates (normal was in local coordinates)

2
NewHorizons/Builder/Props/RaftBuilder.cs
View File

@ -54,7 +54,7 @@ namespace NewHorizons.Builder.Props
GameObject raftObject = _prefab.InstantiateInactive(); GameObject raftObject = _prefab.InstantiateInactive();
raftObject.name = "Raft_Body"; raftObject.name = "Raft_Body";
raftObject.transform.parent = sector?.transform ?? planetGO.transform; raftObject.transform.parent = sector?.transform ?? planetGO.transform;
raftObject.transform.position = planetGO.transform.TransformPoint(info.position); raftObject.transform.position = planetGO.transform.TransformPoint(info?.position ?? Vector3.zero);
raftObject.transform.rotation = planetGO.transform.TransformRotation(Quaternion.identity); raftObject.transform.rotation = planetGO.transform.TransformRotation(Quaternion.identity);
StreamingHandler.SetUpStreaming(raftObject, sector); StreamingHandler.SetUpStreaming(raftObject, sector);

2
NewHorizons/Utility/DebugMenu/DebugMenuNomaiText.cs
View File

@ -489,7 +489,7 @@ namespace NewHorizons.Utility.DebugMenu
var planetGO = sectorParent; var planetGO = sectorParent;
var info = conversationMetadata.conversation; var info = conversationMetadata.conversation;
nomaiWallTextObj.transform.position = planetGO.transform.TransformPoint(info.position); nomaiWallTextObj.transform.position = planetGO.transform.TransformPoint(info?.position ?? Vector3.zero);
if (info.normal != null) if (info.normal != null)
{ {
// In global coordinates (normal was in local coordinates) // In global coordinates (normal was in local coordinates)

1
NewHorizons/Utility/MVector3.cs
View File

@ -23,7 +23,6 @@ namespace NewHorizons.Utility
public static implicit operator Vector3(MVector3 vec) public static implicit operator Vector3(MVector3 vec)
{ {
if (vec == null) return Vector3.zero;
return new Vector3(vec.x, vec.y, vec.z); return new Vector3(vec.x, vec.y, vec.z);
} }
} }