Fix Travis Build Errors

MystikalPooka · MystikalPooka · commit 8860f59893da · 2018-04-04T22:49:42.000-06:00
diff --git a/Assets/CameraController.cs b/Assets/CameraController.cs
@@ -1,6 +1,4 @@
-﻿using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
+﻿using UnityEngine;
 
 [ExecuteInEditMode]
 public class CameraController : MonoBehaviour
diff --git a/Assets/Editor/BehaviorTreeViewEditor/BackendData/MultiColumnBTreeWindow.cs b/Assets/Editor/BehaviorTreeViewEditor/BackendData/MultiColumnBTreeWindow.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();
             
diff --git a/Assets/Editor/BehaviorTreeViewEditor/BackendData/TreeViewWithTreeModel.cs b/Assets/Editor/BehaviorTreeViewEditor/BackendData/TreeViewWithTreeModel.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;
 					}
diff --git a/Assets/InputHandler.cs b/Assets/InputHandler.cs
@@ -1,6 +1,4 @@
 ﻿using System;
-using System.Collections;
-using System.Collections.Generic;
 using UniRx;
 using UniRx.Triggers;
 using UnityEngine;
diff --git a/Assets/PlayerController.cs b/Assets/PlayerController.cs
@@ -1,6 +1,4 @@
-﻿using System.Collections;
-using System.Collections.Generic;
-using UniRx;
+﻿using UniRx;
 using UnityEngine;
 
 public class PlayerController : MonoBehaviour
diff --git a/Assets/Scripts/AI/Behavior Logger/BehaviorDebugExtensions.cs b/Assets/Scripts/AI/Behavior Logger/BehaviorDebugExtensions.cs
@@ -1,8 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UniRx;
 
 namespace Assets.Scripts.AI.Behavior_Logger
diff --git a/Assets/Scripts/AI/Behavior Logger/BehaviorLogEntry.cs b/Assets/Scripts/AI/Behavior Logger/BehaviorLogEntry.cs
@@ -1,7 +1,4 @@
-﻿using Assets.Scripts.AI;
-using System;
-using System.Collections.Generic;
-using System.Text;
+﻿using System;
 using UnityEngine;
 
 namespace Assets.Scripts.AI.Behavior_Logger
diff --git a/Assets/Scripts/AI/Behavior Logger/BehaviorLogger.cs b/Assets/Scripts/AI/Behavior Logger/BehaviorLogger.cs
@@ -1,7 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Text;
-using UniRx.Diagnostics;
 using UnityEngine;
 
 namespace Assets.Scripts.AI.Behavior_Logger
diff --git a/Assets/Scripts/AI/Behavior Logger/ObservableBehaviorLogger.cs b/Assets/Scripts/AI/Behavior Logger/ObservableBehaviorLogger.cs
@@ -1,8 +1,5 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Text;
 using UniRx;
-using UnityEngine;
 
 namespace Assets.Scripts.AI.Behavior_Logger
 {
diff --git a/Assets/Scripts/AI/BehaviorManager.cs b/Assets/Scripts/AI/BehaviorManager.cs
@@ -5,15 +5,14 @@
 using UnityEngine;
 using Newtonsoft.Json;
 using System.ComponentModel;
-using UniRx.Triggers;
 using UniRx;
 using Assets.Scripts.AI.Tree;
 using System.Linq;
 using Assets.Scripts.AI.Behavior_Logger;
 
 namespace Assets.Scripts.AI
 {
-    public class BehaviorManager : MonoBehaviour
+    public class BehaviorManager : MonoBehaviour, IDisposable
     {
         public BehaviorLogger BehaviorLogger { get; private set;}
 
@@ -64,7 +63,7 @@ public void InitIfNeeded()
         }
 
 
-        public IObservable<BehaviorTreeElement> treeStream { get; private set; }
+        public IObservable<BehaviorTreeElement> TreeStream { get; private set; }
         public void Reinitialize()
         {
             //TODO: Change to runner extension (?)
@@ -81,7 +80,7 @@ public void Reinitialize()
 
 
             BehaviorLogger = new BehaviorLogger(gameObject.name + " Logger");
-            treeStream =
+            TreeStream =
                 treeQuery
                 .ToObservable()
                 .Do(xr =>
@@ -95,7 +94,7 @@ public void Reinitialize()
                     .AddTo(this);
                 });
 
-            treeStream.Subscribe().AddTo(this);
+            TreeStream.Subscribe().AddTo(this);
 
             initialized = true;
         }
@@ -112,7 +111,7 @@ IEnumerator Start()
                                    .ToObservable(true)
                                    .Subscribe(_ => { }, e => Debug.LogError("Error: " + e))
                                    .AddTo(this);
-                treeStream.Subscribe().AddTo(this);
+                TreeStream.Subscribe().AddTo(this);
                 yield return new WaitForSeconds(SecondsBetweenTicks);
                 if (TimesToTick > 1) --TimesToTick;
             }
@@ -148,5 +147,10 @@ public bool SpliceIntoRunner()
             }
             else return false;
         }
+
+        public void Dispose()
+        {
+            Runner.Dispose();
+        }
     }
 }
diff --git a/Assets/Scripts/AI/BehaviorTreeElement.cs b/Assets/Scripts/AI/BehaviorTreeElement.cs
@@ -1,11 +1,9 @@
-﻿using Assets.Scripts.AI.Behavior_Logger;
-using Assets.Scripts.AI.Tree;
+﻿using Assets.Scripts.AI.Tree;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using UniRx;
-using UniRx.Diagnostics;
 using UnityEngine;
 
 namespace Assets.Scripts.AI
@@ -102,6 +100,7 @@ public override string ToString()
         #region IDisposable Support
 
         // CompositeDisposable is similar with List<IDisposable>, manage multiple IDisposable
+        [NonSerialized]
         protected CompositeDisposable Disposables = new CompositeDisposable(); // field
         private bool disposedValue = false; // To detect redundant calls
 
diff --git a/Assets/Scripts/AI/Components/ParallelRunner.cs b/Assets/Scripts/AI/Components/ParallelRunner.cs
@@ -1,10 +1,8 @@
-﻿using Assets.Scripts.AI.Behavior_Logger;
-using System;
+﻿using System;
 using System.Collections;
 using System.ComponentModel;
 using System.Linq;
 using UniRx;
-using UniRx.Diagnostics;
 using UnityEngine;
 
 namespace Assets.Scripts.AI.Components
diff --git a/Assets/Scripts/AI/Components/Selector.cs b/Assets/Scripts/AI/Components/Selector.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using System.Collections;
 using System.ComponentModel;
-using System.Linq;
 using UniRx;
 using UnityEngine;
 
diff --git a/Assets/Scripts/AI/Decorators/BehaviorDecorator.cs b/Assets/Scripts/AI/Decorators/BehaviorDecorator.cs
@@ -1,9 +1,4 @@
-﻿using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using UnityEngine;
+﻿using System.Collections.Generic;
 
 namespace Assets.Scripts.AI.Decorators
 {
diff --git a/Assets/Scripts/AI/Nodes/BehaviorNode.cs b/Assets/Scripts/AI/Nodes/BehaviorNode.cs
@@ -1,6 +1,4 @@
 ﻿using System.Collections;
-using System.Collections.Generic;
-using UniRx;
 using UnityEngine;
 
 namespace Assets.Scripts.AI.Nodes
diff --git a/Assets/Scripts/AI/Nodes/DebugOutNode.cs b/Assets/Scripts/AI/Nodes/DebugOutNode.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Collections;
-using UniRx;
 using UnityEngine;
 
 namespace Assets.Scripts.AI.Nodes
diff --git a/Assets/Scripts/AI/Tree/TreeElement.cs b/Assets/Scripts/AI/Tree/TreeElement.cs
@@ -1,7 +1,6 @@
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
-using UniRx;
 using UnityEngine;
 
 namespace Assets.Scripts.AI.Tree
diff --git a/Assets/Scripts/AI/Tree/TreeElementUtility.cs b/Assets/Scripts/AI/Tree/TreeElementUtility.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using UniRx;
 
 namespace Assets.Scripts.AI.Tree
 {
diff --git a/Assets/Scripts/AI/Tree/TreeModel.cs b/Assets/Scripts/AI/Tree/TreeModel.cs

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ void CreateNewTree()`
`134`	`134`	`CustomAssetUtility.CreateAsset<BehaviorTreeManagerAsset>();`
`135`	`135`	`_BehaviorTreeManagerAsset = (BehaviorTreeManagerAsset)Selection.activeObject;`
`136`	`136`	`BehaviorExtensions.SaveBehaviorAsset(null, AssetDatabase.GetAssetPath(_BehaviorTreeManagerAsset),`
`137`		`- _BehaviorTreeManagerAsset,(ParallelRunner)_TreeView.treeModel.root);`
	`137`	`+ _BehaviorTreeManagerAsset,(ParallelRunner)_TreeView.treeModel.Root);`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`void OnSelectionChange()`
`@@ -199,7 +199,7 @@ void TopToolbar(Rect rect)`
`199`	`199`	`if (GUILayout.Button("Save Tree"))`
`200`	`200`	`{`
`201`	`201`	`FilePath = EditorUtility.SaveFilePanel("", FileDir, "New Behavior Tree", "asset");`
`202`		`- BehaviorExtensions.SaveBehaviorAsset(null, FilePath, _BehaviorTreeManagerAsset, (ParallelRunner)_TreeView.treeModel.root);`
	`202`	`+ BehaviorExtensions.SaveBehaviorAsset(null, FilePath, _BehaviorTreeManagerAsset, (ParallelRunner)_TreeView.treeModel.Root);`
`203`	`203`	`}`
`204`	`204`	`}`
`205`	`205`
`@@ -209,7 +209,7 @@ void TopToolbar(Rect rect)`
`209`	`209`	`private void OnTypeSelected(object typeName)`
`210`	`210`	`{`
`211`	`211`	`var selection = _TreeView.GetSelection();`
`212`		`- BehaviorTreeElement parent = (selection.Count == 1 ? _TreeView.treeModel.Find(selection[0]) : null) ?? _TreeView.treeModel.root;`
	`212`	`+ BehaviorTreeElement parent = (selection.Count == 1 ? _TreeView.treeModel.Find(selection[0]) : null) ?? _TreeView.treeModel.Root;`
`213`	`213`	`int depth = parent != null ? parent.Depth + 1 : 0;`
`214`	`214`	`int id = _TreeView.treeModel.GenerateUniqueID();`
`215`	`215`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public TreeViewWithTreeModel (TreeViewState state, MultiColumnHeader multiColumn`
`42`	`42`	`void Init (TreeModel<T> model)`
`43`	`43`	`{`
`44`	`44`	`_TreeModel = model;`
`45`		`- _TreeModel.modelChanged += ModelChanged;`
	`45`	`+ _TreeModel.ModelChanged += ModelChanged;`
`46`	`46`
`47`	`47`	`}`
`48`	`48`
`@@ -58,30 +58,30 @@ protected override TreeViewItem BuildRoot()`
`58`	`58`	`{`
`59`	`59`	`int depthForHiddenRoot = -1;`
`60`	`60`
`61`		`- if(null == _TreeModel.root)`
	`61`	`+ if(null == _TreeModel.Root)`
`62`	`62`	`{`
`63`	`63`	`Debug.LogError("Tree Model root is null!!");`
`64`	`64`	`}`
`65`	`65`
`66`		`- return new TreeViewItem<T>(_TreeModel.root.ID, depthForHiddenRoot, _TreeModel.root.Name, _TreeModel.root);`
	`66`	`+ return new TreeViewItem<T>(_TreeModel.Root.ID, depthForHiddenRoot, _TreeModel.Root.Name, _TreeModel.Root);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`protected override IList<TreeViewItem> BuildRows (TreeViewItem root)`
`70`	`70`	`{`
`71`		`- if (_TreeModel.root == null)`
	`71`	`+ if (_TreeModel.Root == null)`
`72`	`72`	`{`
`73`	`73`	`Debug.LogError ("tree model root is null. did you call SetData()?");`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`_Rows.Clear ();`
`77`	`77`	`if (!string.IsNullOrEmpty(searchString))`
`78`	`78`	`{`
`79`		`- Search (_TreeModel.root, searchString, _Rows);`
	`79`	`+ Search (_TreeModel.Root, searchString, _Rows);`
`80`	`80`	`}`
`81`	`81`	`else`
`82`	`82`	`{`
`83`		`- if (_TreeModel.root.HasChildren)`
`84`		`- AddChildrenRecursive(_TreeModel.root, 0, _Rows);`
	`83`	`+ if (_TreeModel.Root.HasChildren)`
	`84`	`+ AddChildrenRecursive(_TreeModel.Root, 0, _Rows);`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`// We still need to setup the child parent information for the rows since this`
`@@ -206,7 +206,7 @@ protected override DragAndDropVisualMode HandleDragAndDrop (DragAndDropArgs args`
`206`	`206`	`case DragAndDropPosition.OutsideItems:`
`207`	`207`	`{`
`208`	`208`	`if (args.performDrop)`
`209`		`- OnDropDraggedElementsAtIndex(draggedRows, _TreeModel.root, _TreeModel.root.Children.Count);`
	`209`	`+ OnDropDraggedElementsAtIndex(draggedRows, _TreeModel.Root, _TreeModel.Root.Children.Count);`
`210`	`210`
`211`	`211`	`return DragAndDropVisualMode.Move;`
`212`	`212`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,5 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Text;`
`4`	`2`	`using UniRx;`
`5`		`-using UnityEngine;`
`6`	`3`
`7`	`4`	`namespace Assets.Scripts.AI.Behavior_Logger`
`8`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,14 @@`
`5`	`5`	`using UnityEngine;`
`6`	`6`	`using Newtonsoft.Json;`
`7`	`7`	`using System.ComponentModel;`
`8`		`-using UniRx.Triggers;`
`9`	`8`	`using UniRx;`
`10`	`9`	`using Assets.Scripts.AI.Tree;`
`11`	`10`	`using System.Linq;`
`12`	`11`	`using Assets.Scripts.AI.Behavior_Logger;`
`13`	`12`
`14`	`13`	`namespace Assets.Scripts.AI`
`15`	`14`	`{`
`16`		`- public class BehaviorManager : MonoBehaviour`
	`15`	`+ public class BehaviorManager : MonoBehaviour, IDisposable`
`17`	`16`	`{`
`18`	`17`	`public BehaviorLogger BehaviorLogger { get; private set;}`
`19`	`18`
`@@ -64,7 +63,7 @@ public void InitIfNeeded()`
`64`	`63`	`}`
`65`	`64`
`66`	`65`
`67`		`- public IObservable<BehaviorTreeElement> treeStream { get; private set; }`
	`66`	`+ public IObservable<BehaviorTreeElement> TreeStream { get; private set; }`
`68`	`67`	`public void Reinitialize()`
`69`	`68`	`{`
`70`	`69`	`//TODO: Change to runner extension (?)`
`@@ -81,7 +80,7 @@ public void Reinitialize()`
`81`	`80`
`82`	`81`
`83`	`82`	`BehaviorLogger = new BehaviorLogger(gameObject.name + " Logger");`
`84`		`- treeStream =`
	`83`	`+ TreeStream =`
`85`	`84`	`treeQuery`
`86`	`85`	`.ToObservable()`
`87`	`86`	`.Do(xr =>`
`@@ -95,7 +94,7 @@ public void Reinitialize()`
`95`	`94`	`.AddTo(this);`
`96`	`95`	`});`
`97`	`96`
`98`		`- treeStream.Subscribe().AddTo(this);`
	`97`	`+ TreeStream.Subscribe().AddTo(this);`
`99`	`98`
`100`	`99`	`initialized = true;`
`101`	`100`	`}`
`@@ -112,7 +111,7 @@ IEnumerator Start()`
`112`	`111`	`.ToObservable(true)`
`113`	`112`	`.Subscribe(_ => { }, e => Debug.LogError("Error: " + e))`
`114`	`113`	`.AddTo(this);`
`115`		`- treeStream.Subscribe().AddTo(this);`
	`114`	`+ TreeStream.Subscribe().AddTo(this);`
`116`	`115`	`yield return new WaitForSeconds(SecondsBetweenTicks);`
`117`	`116`	`if (TimesToTick > 1) --TimesToTick;`
`118`	`117`	`}`
`@@ -148,5 +147,10 @@ public bool SpliceIntoRunner()`
`148`	`147`	`}`
`149`	`148`	`else return false;`
`150`	`149`	`}`
	`150`	`+`
	`151`	`+ public void Dispose()`
	`152`	`+ {`
	`153`	`+ Runner.Dispose();`
	`154`	`+ }`
`151`	`155`	`}`
`152`	`156`	`}`