From a1d0b6432eff0a716599947ac33585ee76e7205a Mon Sep 17 00:00:00 2001 From: Sinai <49360850+sinai-dev@users.noreply.github.com> Date: Mon, 6 Sep 2021 15:51:40 +1000 Subject: [PATCH] Cleanup --- src/CacheObject/CacheMember.cs | 28 ++++++--------- .../IValues/InteractiveDictionary.cs | 1 - src/Inspectors/InspectUnderMouse.cs | 12 +++---- src/Inspectors/InspectorManager.cs | 36 +++++++++---------- src/Loader/MelonLoader/ExplorerMelonMod.cs | 7 +--- src/UI/Panels/OptionsPanel.cs | 2 -- src/UI/Panels/UIPanel.cs | 6 ++-- 7 files changed, 38 insertions(+), 54 deletions(-) diff --git a/src/CacheObject/CacheMember.cs b/src/CacheObject/CacheMember.cs index 0086f25..9aaf101 100644 --- a/src/CacheObject/CacheMember.cs +++ b/src/CacheObject/CacheMember.cs @@ -61,6 +61,17 @@ namespace UnityExplorer.CacheObject protected abstract void TrySetValue(object value); + /// + /// Evaluate is called when first shown (if ShouldAutoEvaluate), or else when Evaluate button is clicked, or auto-updated. + /// + public void Evaluate() + { + SetValueFromSource(TryEvaluate()); + } + + /// + /// Called when user presses the Evaluate button. + /// public void EvaluateAndSetCell() { Evaluate(); @@ -68,14 +79,6 @@ namespace UnityExplorer.CacheObject SetDataToCell(CellView); } - /// - /// Evaluate when first shown (if ShouldAutoEvaluate), or else when Evaluate button is clicked, or auto-updated. - /// - public void Evaluate() - { - SetValueFromSource(TryEvaluate()); - } - public override void TrySetUserValue(object value) { TrySetValue(value); @@ -85,9 +88,6 @@ namespace UnityExplorer.CacheObject protected override void SetValueState(CacheObjectCell cell, ValueStateArgs args) { base.SetValueState(cell, args); - - //var memCell = cell as CacheMemberCell; - //memCell.UpdateToggle.gameObject.SetActive(ShouldAutoEvaluate); } private static readonly Color evalEnabledColor = new Color(0.15f, 0.25f, 0.15f); @@ -100,7 +100,6 @@ namespace UnityExplorer.CacheObject cell.EvaluateHolder.SetActive(!ShouldAutoEvaluate); if (!ShouldAutoEvaluate) { - //cell.UpdateToggle.gameObject.SetActive(false); cell.EvaluateButton.Component.gameObject.SetActive(true); if (HasArguments) { @@ -119,11 +118,6 @@ namespace UnityExplorer.CacheObject if (!Evaluating) RuntimeProvider.Instance.SetColorBlock(cell.EvaluateButton.Component, evalDisabledColor, evalDisabledColor * 1.3f); } - //else - //{ - // cell.UpdateToggle.gameObject.SetActive(true); - // cell.UpdateToggle.isOn = AutoUpdateWanted; - //} if (State == ValueState.NotEvaluated && !ShouldAutoEvaluate) { diff --git a/src/CacheObject/IValues/InteractiveDictionary.cs b/src/CacheObject/IValues/InteractiveDictionary.cs index b508efb..046b50b 100644 --- a/src/CacheObject/IValues/InteractiveDictionary.cs +++ b/src/CacheObject/IValues/InteractiveDictionary.cs @@ -169,7 +169,6 @@ namespace UnityExplorer.CacheObject.IValues } public int AdjustedWidth => (int)UIRect.rect.width - 80; - //public int AdjustedKeyWidth => HalfWidth - 50; public override void SetLayout() { diff --git a/src/Inspectors/InspectUnderMouse.cs b/src/Inspectors/InspectUnderMouse.cs index 09cdc1c..6ee8d3a 100644 --- a/src/Inspectors/InspectUnderMouse.cs +++ b/src/Inspectors/InspectUnderMouse.cs @@ -46,14 +46,17 @@ namespace UnityExplorer.Inspectors public override bool ShouldSaveActiveState => false; public override bool ShowByDefault => false; - internal static Text objNameLabel; - internal static Text objPathLabel; - internal static Text mousePosLabel; + private static Text objNameLabel; + private static Text objPathLabel; + private static Text mousePosLabel; // Mouse Inspector public static bool Inspecting { get; set; } public static MouseInspectMode Mode { get; set; } + private static Camera MainCamera; + private static GraphicRaycaster[] graphicRaycasters; + private static GameObject lastHitObject; private static Vector3 lastMousePos; @@ -61,9 +64,6 @@ namespace UnityExplorer.Inspectors private static readonly List wasDisabledCanvasGroups = new List(); private static readonly List objectsAddedCastersTo = new List(); - internal static Camera MainCamera; - internal static GraphicRaycaster[] graphicRaycasters; - public void StartInspect(MouseInspectMode mode) { MainCamera = Camera.main; diff --git a/src/Inspectors/InspectorManager.cs b/src/Inspectors/InspectorManager.cs index 4ffd46d..4198d29 100644 --- a/src/Inspectors/InspectorManager.cs +++ b/src/Inspectors/InspectorManager.cs @@ -21,19 +21,6 @@ namespace UnityExplorer public static float PanelWidth; - internal static void CloseAllTabs() - { - if (Inspectors.Any()) - { - for (int i = Inspectors.Count - 1; i >= 0; i--) - Inspectors[i].CloseInspector(); - - Inspectors.Clear(); - } - - UIManager.SetPanelActive(UIManager.Panels.Inspector, false); - } - public static void Inspect(object obj, CacheObjectBase sourceCache = null) { if (obj.IsNullOrDestroyed()) @@ -50,6 +37,11 @@ namespace UnityExplorer CreateInspector(obj, false, sourceCache); } + public static void Inspect(Type type) + { + CreateInspector(type, true); + } + private static bool TryFocusActiveInspector(object target) { foreach (var inspector in Inspectors) @@ -64,11 +56,6 @@ namespace UnityExplorer return false; } - public static void Inspect(Type type) - { - CreateInspector(type, true); - } - public static void SetInspectorActive(InspectorBase inspector) { UnsetActiveInspector(); @@ -87,6 +74,19 @@ namespace UnityExplorer } } + internal static void CloseAllTabs() + { + if (Inspectors.Any()) + { + for (int i = Inspectors.Count - 1; i >= 0; i--) + Inspectors[i].CloseInspector(); + + Inspectors.Clear(); + } + + UIManager.SetPanelActive(UIManager.Panels.Inspector, false); + } + private static void CreateInspector(object target, bool staticReflection = false, CacheObjectBase sourceCache = null) where T : InspectorBase { diff --git a/src/Loader/MelonLoader/ExplorerMelonMod.cs b/src/Loader/MelonLoader/ExplorerMelonMod.cs index b2d95e4..bc2a0f3 100644 --- a/src/Loader/MelonLoader/ExplorerMelonMod.cs +++ b/src/Loader/MelonLoader/ExplorerMelonMod.cs @@ -2,16 +2,11 @@ using System; using System.IO; using MelonLoader; -using UnityEngine; -using UnityEngine.EventSystems; using UnityExplorer; -using UnityExplorer.Core; using UnityExplorer.Core.Config; -using UnityExplorer.Core.Input; using UnityExplorer.Loader.ML; -using HarmonyLib; -[assembly: MelonPlatformDomain(MelonPlatformDomainAttribute.CompatibleDomains.UNIVERSAL)] +[assembly: MelonPlatformDomain(MelonPlatformDomainAttribute.CompatibleDomains.UNIVERSAL)] [assembly: MelonInfo(typeof(ExplorerMelonMod), ExplorerCore.NAME, ExplorerCore.VERSION, ExplorerCore.AUTHOR)] [assembly: MelonGame(null, null)] [assembly: MelonColor(ConsoleColor.DarkCyan)] diff --git a/src/UI/Panels/OptionsPanel.cs b/src/UI/Panels/OptionsPanel.cs index 60f34f3..d4e0253 100644 --- a/src/UI/Panels/OptionsPanel.cs +++ b/src/UI/Panels/OptionsPanel.cs @@ -11,8 +11,6 @@ using UnityExplorer.UI.Widgets; namespace UnityExplorer.UI.Panels { - // TODO move the logic out of this class into ConfigManager - public class OptionsPanel : UIPanel, ICacheObjectController, ICellPoolDataSource { public override string Name => "Options"; diff --git a/src/UI/Panels/UIPanel.cs b/src/UI/Panels/UIPanel.cs index 8bce555..e89e682 100644 --- a/src/UI/Panels/UIPanel.cs +++ b/src/UI/Panels/UIPanel.cs @@ -116,10 +116,8 @@ namespace UnityExplorer.UI.Panels if (NavButtonWanted) { - if (active) - RuntimeProvider.Instance.SetColorBlock(NavButton.Component, UIManager.enabledButtonColor, UIManager.enabledButtonColor * 1.2f); - else - RuntimeProvider.Instance.SetColorBlock(NavButton.Component, UIManager.disabledButtonColor, UIManager.disabledButtonColor * 1.2f); + var color = active ? UIManager.enabledButtonColor : UIManager.disabledButtonColor; + RuntimeProvider.Instance.SetColorBlock(NavButton.Component, color, color * 1.2f); } if (!active)