Skip to content

Commit 31a5b59

Browse files
committed
Start on Debugger Window
1 parent e76d143 commit 31a5b59

File tree

6 files changed

+36
-79
lines changed

6 files changed

+36
-79
lines changed

Assets/Editor/BehaviorTreeElementDrawer.cs

Lines changed: 0 additions & 58 deletions
This file was deleted.

Assets/Editor/BehaviorTreeViewEditor/BackendData/MultiColumnBehaviorTreeView.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ internal class MultiColumnBehaviorTreeView : TreeViewWithTreeModel<BehaviorTreeE
1717
const float kTypeButtonWidth = 70f;
1818
public ShowParameters ShowParams;
1919

20-
private Color GetBehaviorStateColor(int state)
20+
private static Color GetBehaviorStateColor(int state)
2121
{
2222
switch (state)
2323
{
@@ -101,7 +101,6 @@ public MultiColumnBehaviorTreeView(TreeViewState state, MultiColumnHeader multic
101101
Assert.AreEqual(m_SortOptions.Length, Enum.GetValues(typeof(BTreeColumns)).Length, "Ensure number of sort options are in sync with number of MyColumns enum values");
102102

103103
// Custom setup
104-
//rowHeight = kRowHeights;
105104
columnIndexForTreeFoldouts = 1;
106105

107106
showAlternatingRowBackgrounds = true;
@@ -196,12 +195,12 @@ protected override void ContextClickedItem(int id)
196195
var menuStrings = elType.ToString().Split('.');
197196
menu.AddItem(new GUIContent(menuStrings[menuStrings.Length - 2] + "/" + menuStrings.Last()),
198197
item.ElementType == elType.ToString(),
199-
OnTypeSelected, obj);
198+
OnMenuTypeSelected, obj);
200199
}
201200
menu.ShowAsContext();
202201
}
203202

204-
public void OnTypeSelected(object itemTypeSelected)
203+
public void OnMenuTypeSelected(object itemTypeSelected)
205204
{
206205
object[] obj = itemTypeSelected as object[];
207206
BehaviorTreeElement element = obj[0] as BehaviorTreeElement;
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
using UnityEditor;
7+
8+
namespace Assets.Editor
9+
{
10+
public class TreeDebuggerWindow : EditorWindow
11+
{
12+
13+
14+
}
15+
}

Assets/Editor/BehaviorTreeElementDrawer.cs.meta renamed to Assets/Editor/TreeDebuggerWindow.cs.meta

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Scripts/AI/BehaviorManager.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace Assets.Scripts.AI
1515
{
1616
public class BehaviorManager : MonoBehaviour
1717
{
18-
public BehaviorLogger Logger { get; private set;}
18+
public BehaviorLogger BehaviorLogger { get; private set;}
1919

2020
/// <summary>
2121
/// The file to actually save/load to/from.
@@ -80,7 +80,7 @@ public void Reinitialize()
8080
select el;
8181

8282

83-
Logger = new BehaviorLogger(gameObject.name + " Logger");
83+
BehaviorLogger = new BehaviorLogger(gameObject.name + " Logger");
8484
treeStream =
8585
treeQuery
8686
.ToObservable()
@@ -89,7 +89,7 @@ public void Reinitialize()
8989
xr.ObserveEveryValueChanged(x => x.NumberOfTicksReceived)
9090
.Do(_ =>
9191
{
92-
Logger.Debug(xr + " Ticked " + xr.NumberOfTicksReceived.Value + " times");
92+
BehaviorLogger.Debug(xr + " Ticked " + xr.NumberOfTicksReceived.Value + " times");
9393
})
9494
.Subscribe()
9595
.AddTo(this);
@@ -122,6 +122,8 @@ IEnumerator Start()
122122
/// Splice all trees in the "splice" area of the editor and return "true" if new trees were spliced.
123123
/// </summary>
124124
/// <returns></returns>
125+
///
126+
//TODO: Swap this to a better and/or reactive approach.
125127
public bool SpliceIntoRunner()
126128
{
127129
if (SpliceList != null)

Assets/Scripts/AI/BehaviorTreeElement.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public BehaviorTreeElement(string name, int depth, int id)
4343
Children = new List<TreeElement>();
4444
}
4545

46-
4746
[Newtonsoft.Json.JsonIgnore]
4847
public BehaviorState CurrentState;
4948

0 commit comments

Comments
 (0)