Merge pull request #9 from MystikalPooka/Debugger-2

Debug Stream Added and Window Started

Author: MystikalPooka

Assets/CameraController.cs

@@ -1,6 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
+using UnityEngine;
 
 [ExecuteInEditMode]
 public class CameraController : MonoBehaviour

Assets/Editor/BehaviorTreeElementDrawer.cs

@@ -134,7 +134,7 @@ void CreateNewTree()
             CustomAssetUtility.CreateAsset<BehaviorTreeManagerAsset>();
             _BehaviorTreeManagerAsset = (BehaviorTreeManagerAsset)Selection.activeObject;
             BehaviorExtensions.SaveBehaviorAsset(null, AssetDatabase.GetAssetPath(_BehaviorTreeManagerAsset),
-                                                _BehaviorTreeManagerAsset,(ParallelRunner)_TreeView.treeModel.root);
+                                                _BehaviorTreeManagerAsset,(ParallelRunner)_TreeView.treeModel.Root);
         }
 
         void OnSelectionChange()
@@ -199,7 +199,7 @@ void TopToolbar(Rect rect)
                 if (GUILayout.Button("Save Tree"))
                 {
                     FilePath = EditorUtility.SaveFilePanel("", FileDir, "New Behavior Tree", "asset");
-                    BehaviorExtensions.SaveBehaviorAsset(null, FilePath, _BehaviorTreeManagerAsset, (ParallelRunner)_TreeView.treeModel.root);
+                    BehaviorExtensions.SaveBehaviorAsset(null, FilePath, _BehaviorTreeManagerAsset, (ParallelRunner)_TreeView.treeModel.Root);
                 }
             }
 
@@ -209,7 +209,7 @@ void TopToolbar(Rect rect)
         private void OnTypeSelected(object typeName)
         {
             var selection = _TreeView.GetSelection();
-            BehaviorTreeElement parent = (selection.Count == 1 ? _TreeView.treeModel.Find(selection[0]) : null) ?? _TreeView.treeModel.root;
+            BehaviorTreeElement parent = (selection.Count == 1 ? _TreeView.treeModel.Find(selection[0]) : null) ?? _TreeView.treeModel.Root;
             int depth = parent != null ? parent.Depth + 1 : 0;
             int id = _TreeView.treeModel.GenerateUniqueID();
 

Assets/Editor/BehaviorTreeViewEditor/BackendData/MultiColumnBTreeWindow.cs

@@ -17,7 +17,7 @@ internal class MultiColumnBehaviorTreeView : TreeViewWithTreeModel<BehaviorTreeE
         const float kTypeButtonWidth = 70f;
         public ShowParameters ShowParams;
 
-        private Color GetBehaviorStateColor(int state)
+        private static Color GetBehaviorStateColor(int state)
         {
             switch (state)
             {
@@ -101,7 +101,6 @@ public MultiColumnBehaviorTreeView(TreeViewState state, MultiColumnHeader multic
             Assert.AreEqual(m_SortOptions.Length, Enum.GetValues(typeof(BTreeColumns)).Length, "Ensure number of sort options are in sync with number of MyColumns enum values");
 
             // Custom setup
-            //rowHeight = kRowHeights;
             columnIndexForTreeFoldouts = 1;
 
             showAlternatingRowBackgrounds = true;
@@ -196,12 +195,12 @@ protected override void ContextClickedItem(int id)
                 var menuStrings = elType.ToString().Split('.');
                 menu.AddItem(new GUIContent(menuStrings[menuStrings.Length - 2] + "/" + menuStrings.Last()), 
                     item.ElementType == elType.ToString(), 
-                    OnTypeSelected, obj);
+                    OnMenuTypeSelected, obj);
             }
             menu.ShowAsContext();
         }
 
-        public void OnTypeSelected(object itemTypeSelected)
+        public void OnMenuTypeSelected(object itemTypeSelected)
         {
             object[] obj = itemTypeSelected as object[];
             BehaviorTreeElement element = obj[0] as BehaviorTreeElement;

Assets/Editor/BehaviorTreeViewEditor/BackendData/MultiColumnBehaviorTreeView.cs

@@ -42,7 +42,7 @@ public TreeViewWithTreeModel (TreeViewState state, MultiColumnHeader multiColumn
 		void Init (TreeModel<T> model)
 		{
 			_TreeModel = model;
-			_TreeModel.modelChanged += ModelChanged;
+			_TreeModel.ModelChanged += ModelChanged;
 
 		}
 
@@ -58,30 +58,30 @@ protected override TreeViewItem BuildRoot()
 		{
 			int depthForHiddenRoot = -1;
 
-            if(null == _TreeModel.root)
+            if(null == _TreeModel.Root)
             {
                 Debug.LogError("Tree Model root is null!!");
             }
 
-            return new TreeViewItem<T>(_TreeModel.root.ID, depthForHiddenRoot, _TreeModel.root.Name, _TreeModel.root);
+            return new TreeViewItem<T>(_TreeModel.Root.ID, depthForHiddenRoot, _TreeModel.Root.Name, _TreeModel.Root);
 		}
 
 		protected override IList<TreeViewItem> BuildRows (TreeViewItem root)
 		{
-			if (_TreeModel.root == null)
+			if (_TreeModel.Root == null)
 			{
 				Debug.LogError ("tree model root is null. did you call SetData()?");
 			}
 
 			_Rows.Clear ();
 			if (!string.IsNullOrEmpty(searchString))
 			{
-				Search (_TreeModel.root, searchString, _Rows);
+				Search (_TreeModel.Root, searchString, _Rows);
 			}
 			else
 			{
-				if (_TreeModel.root.HasChildren)
-					AddChildrenRecursive(_TreeModel.root, 0, _Rows);
+				if (_TreeModel.Root.HasChildren)
+					AddChildrenRecursive(_TreeModel.Root, 0, _Rows);
 			}
 
 			// We still need to setup the child parent information for the rows since this 
@@ -206,7 +206,7 @@ protected override DragAndDropVisualMode HandleDragAndDrop (DragAndDropArgs args
 				case DragAndDropPosition.OutsideItems:
 					{
 						if (args.performDrop)
-							OnDropDraggedElementsAtIndex(draggedRows, _TreeModel.root, _TreeModel.root.Children.Count);
+							OnDropDraggedElementsAtIndex(draggedRows, _TreeModel.Root, _TreeModel.Root.Children.Count);
 
 						return DragAndDropVisualMode.Move;
 					}

Assets/Editor/BehaviorTreeViewEditor/BackendData/TreeViewWithTreeModel.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEditor;
+
+namespace Assets.Editor
+{
+    public class TreeDebuggerWindow : EditorWindow
+    {
+
+
+    }
+}

Assets/Editor/TreeDebuggerWindow.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using UniRx;
 using UniRx.Triggers;
 using UnityEngine;

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

@@ -1,6 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
-using UniRx;
+using UniRx;
 using UnityEngine;
 
 public class PlayerController : MonoBehaviour

Assets/InputHandler.cs

@@ -16,7 +16,6 @@ public static IObservable<T> Debug<T>(this IObservable<T> source, string label =
                 .Dematerialize()
                 .DoOnCancel(() => UnityEngine.Debug.Log(l + "OnCancel"))
                 .DoOnSubscribe(() => UnityEngine.Debug.Log(l + "OnSubscribe"));
-
 #else
             return source;
 #endif
@@ -33,7 +32,6 @@ public static IObservable<T> Debug<T>(this IObservable<T> source, UniRx.Diagnost
                 .Dematerialize()
                 .DoOnCancel(() => logger.Debug("OnCancel"))
                 .DoOnSubscribe(() => logger.Debug("OnSubscribe"));
-
 #else
             return source;
 #endif