Skip to content

Commit 96d313d

Browse files
committed
Minor refactor changes
1 parent 3043365 commit 96d313d

File tree

1 file changed

+30
-28
lines changed

1 file changed

+30
-28
lines changed

Assets/Editor Toolbox/Editor/SceneView/ToolboxEditorSceneViewObjectSelector.cs

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ public class ToolboxEditorSceneViewObjectSelector : EditorWindow
88
{
99
private static readonly Color selectionColor = new Color(0.50f, 0.70f, 1.00f);
1010
private static readonly Color highlightWireColor = Color.yellow;
11-
private const float outlineFillOpacity = 1f;
1211

1312
private const float sizeXPadding = 2f;
1413
private const float sizeYPadding = 2f;
@@ -17,10 +16,10 @@ public class ToolboxEditorSceneViewObjectSelector : EditorWindow
1716
private const float sizeXOffset = -30f;
1817
private const float indentWidth = 12f;
1918

20-
private List<DisplayEntry> displayEntries;
19+
private readonly List<Renderer> highlightedRenderers = new List<Renderer>();
2120

21+
private List<DisplayEntry> displayEntries;
2222
private GameObject highlightedObject;
23-
private readonly List<Renderer> highlightedRenderers = new List<Renderer>();
2423
private Vector2 size;
2524
private Vector2 buttonSize;
2625

@@ -42,12 +41,12 @@ public static void Show(List<GameObject> gameObjects, Vector2 position)
4241

4342
private void OnEnable()
4443
{
45-
UnityEditor.SceneView.duringSceneGui += OnSceneViewDuringSceneGui;
44+
UnityEditor.SceneView.duringSceneGui += OnSceneViewGui;
4645
}
4746

4847
private void OnDisable()
4948
{
50-
UnityEditor.SceneView.duringSceneGui -= OnSceneViewDuringSceneGui;
49+
UnityEditor.SceneView.duringSceneGui -= OnSceneViewGui;
5150
highlightedRenderers.Clear();
5251
highlightedObject = null;
5352
}
@@ -325,7 +324,10 @@ private void SelectObject(int id, bool control, bool shift)
325324
}
326325
else
327326
{
328-
Selection.objects = new Object[] { gameObject };
327+
Selection.objects = new Object[]
328+
{
329+
gameObject
330+
};
329331
}
330332
}
331333

@@ -377,27 +379,6 @@ private void RemoveSelectedObject(GameObject gameObject)
377379
Selection.objects = newSelection;
378380
}
379381

380-
private GameObject HighlightedObject
381-
{
382-
set
383-
{
384-
if (highlightedObject == value)
385-
{
386-
return;
387-
}
388-
389-
highlightedObject = value;
390-
UnityEditor.SceneView.RepaintAll();
391-
392-
if (highlightedObject != null)
393-
{
394-
EditorGUIUtility.PingObject(highlightedObject);
395-
}
396-
397-
UpdateHighlightedRenderers();
398-
}
399-
}
400-
401382
private void UpdateHighlightedRenderers()
402383
{
403384
highlightedRenderers.Clear();
@@ -410,7 +391,7 @@ private void UpdateHighlightedRenderers()
410391
highlightedRenderers.AddRange(highlightedObject.GetComponentsInChildren<Renderer>(true));
411392
}
412393

413-
private void OnSceneViewDuringSceneGui(UnityEditor.SceneView sceneView)
394+
private void OnSceneViewGui(UnityEditor.SceneView sceneView)
414395
{
415396
if (highlightedRenderers.Count == 0 ||
416397
Event.current.type != EventType.Repaint)
@@ -438,6 +419,27 @@ private void OnSceneViewDuringSceneGui(UnityEditor.SceneView sceneView)
438419
#endif
439420
}
440421

422+
private GameObject HighlightedObject
423+
{
424+
set
425+
{
426+
if (highlightedObject == value)
427+
{
428+
return;
429+
}
430+
431+
highlightedObject = value;
432+
UnityEditor.SceneView.RepaintAll();
433+
434+
if (highlightedObject != null)
435+
{
436+
EditorGUIUtility.PingObject(highlightedObject);
437+
}
438+
439+
UpdateHighlightedRenderers();
440+
}
441+
}
442+
441443
private readonly struct DisplayEntry
442444
{
443445
internal DisplayEntry(GameObject gameObject, int depth)

0 commit comments

Comments
 (0)