mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-02-23 15:40:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/alek/instantiate-inactive' into nebula/0.5.0-cleanup

Browse Source
This commit is contained in:
Mister_Nebula 2020-08-23 09:30:29 +01:00
commit a71486436f
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
QSB/Tools/PlayerToolsManager.cs
View File

@ -1,5 +1,6 @@
using OWML.ModHelper.Events; using OWML.ModHelper.Events;
using System.Linq; using System.Linq;
using QSB.Utility;
using UnityEngine; using UnityEngine;
namespace QSB.Tools namespace QSB.Tools
@ -98,9 +99,7 @@ namespace QSB.Tools
{ {
var original = GameObject.Find("NomaiTranslatorProp"); var original = GameObject.Find("NomaiTranslatorProp");
original.SetActive(false); var translatorRoot = original.InstantiateInactive();
var translatorRoot = Object.Instantiate(original);
original.SetActive(true);
var group = translatorRoot.transform.Find("TranslatorGroup"); var group = translatorRoot.transform.Find("TranslatorGroup");
var model = group.Find("Props_HEA_Translator"); var model = group.Find("Props_HEA_Translator");

5
QSB/TransformSync/PlayerProbeSync.cs
View File

@ -1,4 +1,5 @@
using QSB.Tools; using QSB.Tools;
using QSB.Utility;
using UnityEngine; using UnityEngine;
namespace QSB.TransformSync namespace QSB.TransformSync
@ -35,9 +36,7 @@ namespace QSB.TransformSync
{ {
var probe = GetProbe(); var probe = GetProbe();
probe.gameObject.SetActive(false); var body = probe.InstantiateInactive();
var body = Instantiate(probe);
probe.gameObject.SetActive(true);
Destroy(body.GetComponentInChildren<ProbeAnimatorController>()); Destroy(body.GetComponentInChildren<ProbeAnimatorController>());

14
QSB/Utility/GOExtensions.cs
View File

@ -16,5 +16,19 @@ namespace QSB.Utility
renderer.enabled = isVisible; renderer.enabled = isVisible;
} }
} }
public static GameObject InstantiateInactive(this GameObject original)
{
original.SetActive(false);
var copy = Object.Instantiate(original);
original.SetActive(true);
return copy;
}
public static Transform InstantiateInactive(this Transform original)
{
return original.gameObject.InstantiateInactive().transform;
}
} }
} }