Skip to content
This repository was archived by the owner on May 9, 2023. It is now read-only.

Commit bd86f09

Browse files
committed
Cleanup and refactor GameObjectControls
Split into proper classes, cleanup ugly code
1 parent b35d6f5 commit bd86f09

File tree

10 files changed

+822
-720
lines changed

10 files changed

+822
-720
lines changed

src/Inspectors/GameObjectInspector.cs

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ namespace UnityExplorer.Inspectors
1818
{
1919
public class GameObjectInspector : InspectorBase
2020
{
21-
public GameObject GOTarget => Target as GameObject;
21+
public new GameObject Target => base.Target as GameObject;
2222

2323
public GameObject Content;
2424

25-
public GameObjectControls GOControls;
25+
public GameObjectControls Controls;
2626

2727
public TransformTree TransformTree;
2828
private ScrollPool<TransformCell> transformScroll;
@@ -38,10 +38,10 @@ public override void OnBorrowedFromPool(object target)
3838
{
3939
base.OnBorrowedFromPool(target);
4040

41-
Target = target as GameObject;
41+
base.Target = target as GameObject;
4242

43-
GOControls.UpdateGameObjectInfo(true, true);
44-
GOControls.UpdateTransformControlValues(true);
43+
Controls.UpdateGameObjectInfo(true, true);
44+
Controls.TransformControl.UpdateTransformControlValues(true);
4545

4646
RuntimeHelper.StartCoroutine(InitCoroutine());
4747
}
@@ -76,9 +76,9 @@ public override void CloseInspector()
7676

7777
public void OnTransformCellClicked(GameObject newTarget)
7878
{
79-
this.Target = newTarget;
80-
GOControls.UpdateGameObjectInfo(true, true);
81-
GOControls.UpdateTransformControlValues(true);
79+
base.Target = newTarget;
80+
Controls.UpdateGameObjectInfo(true, true);
81+
Controls.TransformControl.UpdateTransformControlValues(true);
8282
TransformTree.RefreshData(true, false, true, false);
8383
UpdateComponents();
8484
}
@@ -90,21 +90,21 @@ public override void Update()
9090
if (!this.IsActive)
9191
return;
9292

93-
if (Target.IsNullOrDestroyed(false))
93+
if (base.Target.IsNullOrDestroyed(false))
9494
{
9595
InspectorManager.ReleaseInspector(this);
9696
return;
9797
}
9898

99-
GOControls.UpdateVectorSlider();
100-
GOControls.UpdateTransformControlValues(false);
99+
Controls.UpdateVectorSlider();
100+
Controls.TransformControl.UpdateTransformControlValues(false);
101101

102102
// Slow update
103103
if (timeOfLastUpdate.OccuredEarlierThan(1))
104104
{
105105
timeOfLastUpdate = Time.realtimeSinceStartup;
106106

107-
GOControls.UpdateGameObjectInfo(false, false);
107+
Controls.UpdateGameObjectInfo(false, false);
108108

109109
TransformTree.RefreshData(true, false, false, false);
110110
UpdateComponents();
@@ -115,12 +115,12 @@ public override void Update()
115115

116116
private IEnumerable<GameObject> GetTransformEntries()
117117
{
118-
if (!GOTarget)
118+
if (!Target)
119119
return Enumerable.Empty<GameObject>();
120120

121121
cachedChildren.Clear();
122-
for (int i = 0; i < GOTarget.transform.childCount; i++)
123-
cachedChildren.Add(GOTarget.transform.GetChild(i).gameObject);
122+
for (int i = 0; i < Target.transform.childCount; i++)
123+
cachedChildren.Add(Target.transform.GetChild(i).gameObject);
124124
return cachedChildren;
125125
}
126126

@@ -130,11 +130,11 @@ private IEnumerable<GameObject> GetTransformEntries()
130130
private readonly List<bool> behaviourEnabledStates = new();
131131

132132
// ComponentList.GetRootEntriesMethod
133-
private List<Component> GetComponentEntries() => GOTarget ? componentEntries : Enumerable.Empty<Component>().ToList();
133+
private List<Component> GetComponentEntries() => Target ? componentEntries : Enumerable.Empty<Component>().ToList();
134134

135135
public void UpdateComponents()
136136
{
137-
if (!GOTarget)
137+
if (!Target)
138138
{
139139
componentEntries.Clear();
140140
compInstanceIDs.Clear();
@@ -146,8 +146,8 @@ public void UpdateComponents()
146146
}
147147

148148
// Check if we actually need to refresh the component cells or not.
149-
IEnumerable<Component> comps = GOTarget.GetComponents<Component>();
150-
IEnumerable<Behaviour> behaviours = GOTarget.GetComponents<Behaviour>();
149+
IEnumerable<Component> comps = Target.GetComponents<Component>();
150+
IEnumerable<Behaviour> behaviours = Target.GetComponents<Behaviour>();
151151

152152
bool needRefresh = false;
153153

@@ -231,7 +231,7 @@ public void UpdateComponents()
231231
private void OnAddChildClicked(string input)
232232
{
233233
GameObject newObject = new(input);
234-
newObject.transform.parent = GOTarget.transform;
234+
newObject.transform.parent = Target.transform;
235235

236236
TransformTree.RefreshData(true, false, true, false);
237237
}
@@ -242,7 +242,7 @@ private void OnAddComponentClicked(string input)
242242
{
243243
try
244244
{
245-
RuntimeHelper.AddComponent<Component>(GOTarget, type);
245+
RuntimeHelper.AddComponent<Component>(Target, type);
246246
UpdateComponents();
247247
}
248248
catch (Exception ex)
@@ -270,7 +270,7 @@ public override GameObject CreateContent(GameObject parent)
270270
UIFactory.SetLayoutGroup<VerticalLayoutGroup>(Content, spacing: 3, padTop: 2, padBottom: 2, padLeft: 2, padRight: 2);
271271

272272
// Construct GO Controls
273-
GOControls = new GameObjectControls(this);
273+
Controls = new GameObjectControls(this);
274274

275275
ConstructLists();
276276

0 commit comments

Comments
 (0)