From 292b49deb547d642b923f2b50294f3e71b2a3a34 Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Tue, 28 Dec 2021 21:25:25 -0800 Subject: [PATCH] destroy debug actions/gui if we're not debugging --- .../TransformSync/AnglerTransformSync.cs | 6 +++--- .../RemoteThrusterFlameController.cs | 2 +- .../TransformSync/JellyfishTransformSync.cs | 5 +++-- .../TransformSync/PlayerTransformSync.cs | 4 ++-- QSB/QuantumSync/QuantumManager.cs | 2 +- QSB/Syncs/SyncBase.cs | 10 +++++++-- .../TranslatorTool/QSBTranslatorScanBeam.cs | 2 +- QSB/Utility/DebugActions.cs | 7 +++++-- QSB/Utility/DebugGUI.cs | 21 +++++++++---------- 9 files changed, 34 insertions(+), 25 deletions(-) diff --git a/QSB/Anglerfish/TransformSync/AnglerTransformSync.cs b/QSB/Anglerfish/TransformSync/AnglerTransformSync.cs index 0e0f6e34..7bbecba3 100644 --- a/QSB/Anglerfish/TransformSync/AnglerTransformSync.cs +++ b/QSB/Anglerfish/TransformSync/AnglerTransformSync.cs @@ -93,10 +93,10 @@ namespace QSB.Anglerfish.TransformSync protected override void OnRenderObject() { - if (!WorldObjectManager.AllObjectsReady - || !QSBCore.ShowLinesInDebug + if (!QSBCore.ShowLinesInDebug + || !WorldObjectManager.AllObjectsReady || !IsReady - || ReferenceTransform == null + || AttachedObject == null || AttachedObject.IsSuspended()) { return; diff --git a/QSB/Animation/Player/Thrusters/RemoteThrusterFlameController.cs b/QSB/Animation/Player/Thrusters/RemoteThrusterFlameController.cs index ea9e43fb..354a0666 100644 --- a/QSB/Animation/Player/Thrusters/RemoteThrusterFlameController.cs +++ b/QSB/Animation/Player/Thrusters/RemoteThrusterFlameController.cs @@ -86,7 +86,7 @@ namespace QSB.Animation.Player.Thrusters private void OnRenderObject() { - if (!WorldObjectManager.AllObjectsReady || !QSBCore.ShowLinesInDebug) + if (!QSBCore.ShowLinesInDebug || !WorldObjectManager.AllObjectsReady) { return; } diff --git a/QSB/JellyfishSync/TransformSync/JellyfishTransformSync.cs b/QSB/JellyfishSync/TransformSync/JellyfishTransformSync.cs index 76ab390c..c0c2fe1f 100644 --- a/QSB/JellyfishSync/TransformSync/JellyfishTransformSync.cs +++ b/QSB/JellyfishSync/TransformSync/JellyfishTransformSync.cs @@ -141,9 +141,10 @@ namespace QSB.JellyfishSync.TransformSync protected override void OnRenderObject() { - if (!WorldObjectManager.AllObjectsReady - || !QSBCore.ShowLinesInDebug + if (!QSBCore.ShowLinesInDebug + || !WorldObjectManager.AllObjectsReady || !IsReady + || AttachedObject == null || ReferenceTransform == null || AttachedObject.IsSuspended()) { diff --git a/QSB/Player/TransformSync/PlayerTransformSync.cs b/QSB/Player/TransformSync/PlayerTransformSync.cs index 191ed6a5..ce7b0389 100644 --- a/QSB/Player/TransformSync/PlayerTransformSync.cs +++ b/QSB/Player/TransformSync/PlayerTransformSync.cs @@ -262,8 +262,8 @@ namespace QSB.Player.TransformSync { base.OnRenderObject(); - if (!WorldObjectManager.AllObjectsReady - || !QSBCore.ShowLinesInDebug + if (!QSBCore.ShowLinesInDebug + || !WorldObjectManager.AllObjectsReady || !IsReady || ReferenceTransform == null) { diff --git a/QSB/QuantumSync/QuantumManager.cs b/QSB/QuantumSync/QuantumManager.cs index 681bd26c..30501ae4 100644 --- a/QSB/QuantumSync/QuantumManager.cs +++ b/QSB/QuantumSync/QuantumManager.cs @@ -64,7 +64,7 @@ namespace QSB.QuantumSync public void OnRenderObject() { - if (!AllObjectsReady || !QSBCore.ShowLinesInDebug) + if (!QSBCore.ShowLinesInDebug || !AllObjectsReady) { return; } diff --git a/QSB/Syncs/SyncBase.cs b/QSB/Syncs/SyncBase.cs index 0920d961..0576a13c 100644 --- a/QSB/Syncs/SyncBase.cs +++ b/QSB/Syncs/SyncBase.cs @@ -273,9 +273,10 @@ namespace QSB.Syncs protected virtual void OnRenderObject() { - if (!WorldObjectManager.AllObjectsReady - || !QSBCore.ShowLinesInDebug + if (!QSBCore.ShowLinesInDebug + || !WorldObjectManager.AllObjectsReady || !IsReady + || AttachedObject == null || ReferenceTransform == null) { return; @@ -297,6 +298,11 @@ namespace QSB.Syncs private void OnGUI() { + if (!QSBCore.ShowDebugLabels) + { + return; + } + if (AttachedObject != null) { DebugGUI.DrawLabel(AttachedObject.transform, LogName); diff --git a/QSB/Tools/TranslatorTool/QSBTranslatorScanBeam.cs b/QSB/Tools/TranslatorTool/QSBTranslatorScanBeam.cs index 3f498900..a1d75f92 100644 --- a/QSB/Tools/TranslatorTool/QSBTranslatorScanBeam.cs +++ b/QSB/Tools/TranslatorTool/QSBTranslatorScanBeam.cs @@ -77,7 +77,7 @@ namespace QSB.Tools.TranslatorTool private void OnRenderObject() { - if (!WorldObjectManager.AllObjectsReady || !QSBCore.ShowLinesInDebug) + if (!QSBCore.ShowLinesInDebug || !WorldObjectManager.AllObjectsReady) { return; } diff --git a/QSB/Utility/DebugActions.cs b/QSB/Utility/DebugActions.cs index 4689fd49..d93cc446 100644 --- a/QSB/Utility/DebugActions.cs +++ b/QSB/Utility/DebugActions.cs @@ -31,13 +31,16 @@ namespace QSB.Utility private void DamageShipElectricalSystem() => ShipManager.Instance.ShipElectricalComponent.SetDamaged(true); - public void Update() + private void Awake() { if (!QSBCore.DebugMode) { - return; + Destroy(this); } + } + public void Update() + { /* * 1 - Warp to first player * 2 - Set time flowing diff --git a/QSB/Utility/DebugGUI.cs b/QSB/Utility/DebugGUI.cs index 24b53a85..d7559f1d 100644 --- a/QSB/Utility/DebugGUI.cs +++ b/QSB/Utility/DebugGUI.cs @@ -30,7 +30,16 @@ namespace QSB.Utility private readonly GUIStyle guiGUIStyle = new(); private static readonly GUIStyle labelGUIStyle = new(); - private void Awake() => guiGUIStyle.fontSize = 9; + private void Awake() + { + if (!QSBCore.DebugMode) + { + Destroy(this); + return; + } + + guiGUIStyle.fontSize = 9; + } private void WriteLine(int columnID, string text) { @@ -72,11 +81,6 @@ namespace QSB.Utility public void OnGUI() { - if (!QSBCore.DebugMode) - { - return; - } - guiGUIStyle.normal.textColor = Color.white; GUI.contentColor = Color.white; @@ -247,11 +251,6 @@ namespace QSB.Utility public static void DrawLabel(Transform obj, string label) { - if (!QSBCore.ShowDebugLabels) - { - return; - } - var camera = Locator.GetPlayerCamera(); if (camera == null)