Started Swap to uniRx

Author: MystikalPooka

Assets/Editor/BehaviorTreeViewEditor/BehaviorExtensions.cs

@@ -74,7 +74,6 @@ public static void SaveBehaviorAsset(this BehaviorManager behaviorManager, strin
 
             if(behaviorManager != null)
             {
-                behaviorManager.FileName = asset.name;
                 behaviorManager.Reinitialize();
                 asset.SecondsBetweenTicks = behaviorManager.SecondsBetweenTicks;
                 asset.TimesToTick = behaviorManager.TimesToTick;

Assets/Examples/test2.asset

@@ -14,25 +14,20 @@ MonoBehaviour:
   TimesToTick: 135
   SecondsBetweenTicks: 0.5
   RunnerElementsJSON: "[\r\n  {\r\n    \"NumberOfFailuresBeforeFail\": 0,\r\n    \"NumberOfSuccessBeforeSucceed\":
-    0,\r\n    \"ElementType\": \"Assets.Scripts.AI.Components.ParallelRunner\",\r\n
+    0,\r\n    \"Initialized\": false,\r\n    \"ElementType\": \"Assets.Scripts.AI.Components.ParallelRunner\",\r\n
     \   \"Depth\": -1,\r\n    \"HasChildren\": true,\r\n    \"Name\": \"New Root\",\r\n
-    \   \"ID\": -1\r\n  },\r\n  {\r\n    \"ElementType\": \"Assets.Scripts.AI.Components.Selector\",\r\n
+    \   \"ID\": -1\r\n  },\r\n  {\r\n    \"Initialized\": false,\r\n    \"ElementType\":
+    \"Assets.Scripts.AI.Nodes.DebugOutNode\",\r\n    \"Depth\": 0,\r\n    \"HasChildren\":
+    false,\r\n    \"Name\": \"DebugOutNode 9\",\r\n    \"ID\": 9\r\n  },\r\n  {\r\n
+    \   \"Initialized\": false,\r\n    \"ElementType\": \"Assets.Scripts.AI.Decorators.Inverter\",\r\n
+    \   \"Depth\": 0,\r\n    \"HasChildren\": true,\r\n    \"Name\": \"Inverter 4\",\r\n
+    \   \"ID\": 4\r\n  },\r\n  {\r\n    \"Initialized\": false,\r\n    \"ElementType\":
+    \"Assets.Scripts.AI.Nodes.DebugOutNode\",\r\n    \"Depth\": 1,\r\n    \"HasChildren\":
+    false,\r\n    \"Name\": \"DebugOutNode 2\",\r\n    \"ID\": 2\r\n  },\r\n  {\r\n
+    \   \"Initialized\": false,\r\n    \"ElementType\": \"Assets.Scripts.AI.Components.Selector\",\r\n
     \   \"Depth\": 0,\r\n    \"HasChildren\": true,\r\n    \"Name\": \"Selector 0\",\r\n
     \   \"ID\": 0\r\n  },\r\n  {\r\n    \"MoveSpeed\": 6.0,\r\n    \"UpdatePlayersTickInterval\":
-    6,\r\n    \"UpdateSelfPositionTickInterval\": 3,\r\n    \"ElementType\": \"Assets.Scripts.AI.Nodes.MoveEnemyIfCloseToPlayer\",\r\n
+    6,\r\n    \"UpdateSelfPositionTickInterval\": 3,\r\n    \"Initialized\": false,\r\n
+    \   \"ElementType\": \"Assets.Scripts.AI.Nodes.MoveEnemyIfCloseToPlayer\",\r\n
     \   \"Depth\": 1,\r\n    \"HasChildren\": false,\r\n    \"Name\": \"MoveEnemyIfCloseToPlayer
-    3\",\r\n    \"ID\": 3\r\n  },\r\n  {\r\n    \"ElementType\": \"Assets.Scripts.AI.Decorators.Inverter\",\r\n
-    \   \"Depth\": 1,\r\n    \"HasChildren\": true,\r\n    \"Name\": \"Inverter 4\",\r\n
-    \   \"ID\": 4\r\n  },\r\n  {\r\n    \"ElementType\": \"Assets.Scripts.AI.Decorators.Inverter\",\r\n
-    \   \"Depth\": 2,\r\n    \"HasChildren\": true,\r\n    \"Name\": \"Inverter 8\",\r\n
-    \   \"ID\": 8\r\n  },\r\n  {\r\n    \"ElementType\": \"Assets.Scripts.AI.Components.Sequencer\",\r\n
-    \   \"Depth\": 3,\r\n    \"HasChildren\": true,\r\n    \"Name\": \"Sequencer 5\",\r\n
-    \   \"ID\": 5\r\n  },\r\n  {\r\n    \"ElementType\": \"Assets.Scripts.AI.Decorators.Inverter\",\r\n
-    \   \"Depth\": 4,\r\n    \"HasChildren\": true,\r\n    \"Name\": \"Inverter 1\",\r\n
-    \   \"ID\": 1\r\n  },\r\n  {\r\n    \"ElementType\": \"Assets.Scripts.AI.Nodes.DebugOutNode\",\r\n
-    \   \"Depth\": 5,\r\n    \"HasChildren\": false,\r\n    \"Name\": \"DebugOutNode
-    2\",\r\n    \"ID\": 2\r\n  },\r\n  {\r\n    \"ElementType\": \"Assets.Scripts.AI.Nodes.DebugOutNode\",\r\n
-    \   \"Depth\": 4,\r\n    \"HasChildren\": false,\r\n    \"Name\": \"DebugOutNode
-    7\",\r\n    \"ID\": 7\r\n  },\r\n  {\r\n    \"ElementType\": \"Assets.Scripts.AI.Nodes.DebugOutNode\",\r\n
-    \   \"Depth\": 4,\r\n    \"HasChildren\": false,\r\n    \"Name\": \"DebugOutNode
-    6\",\r\n    \"ID\": 6\r\n  }\r\n]"
+    3\",\r\n    \"ID\": 3\r\n  }\r\n]"

Assets/Scripts/AI/BehaviorManager.cs

@@ -12,7 +12,6 @@ namespace Assets.Scripts.AI
 {
     public class BehaviorManager : MonoBehaviour
     {
-        public string FileName = "";
         /// <summary>
         /// The file to actually save/load to/from.
         /// </summary>
@@ -26,7 +25,7 @@ public class BehaviorManager : MonoBehaviour
         /// </summary>
         [SerializeField]
         [Description("Seconds between every tick. At 0 this will tick every frame")]
-        public double SecondsBetweenTicks = 0.1f;
+        public float SecondsBetweenTicks = 0.1f;
 
         /// <summary>
         /// Number of times to tick the full trees. Set to a negative number to make an infinitely running behavior tree.
@@ -68,7 +67,7 @@ public void Reinitialize()
             initialized = true;
         }
 
-        //TODO: Add ILogger *(perhaps Observer pattern? This is our "singleton")*
+        //TODO: Add ILogger *(perhaps Observer pattern?)*
         //Dispatch messages to observed classes and receive that information here...
         //How to store? List? Dictionary? My face? Cat Pictures?
 
@@ -78,10 +77,14 @@ public void Reinitialize()
         /// <returns></returns>
         IEnumerator Start()
         {
-            while(TimesToTick-- > 0)
+            while(TimesToTick != 0)
+            {
                 yield return Runner.Tick()
-                                   .ToObservable()
-                                   .Subscribe(xr => Debug.Log("OnNxt called " + xr), xd => Debug.Log("Destroyed " + xd)).AddTo(this);
+                                   .ToObservable(true)
+                                   .Subscribe(xr => Debug.Log("Starting Tick on Runner"), e => Debug.LogError("Error: " + e)).AddTo(this);
+                yield return new WaitForSeconds(SecondsBetweenTicks);
+                if (TimesToTick > 1) --TimesToTick;
+            }
         }
 
         /// <summary>

Assets/Scripts/AI/BehaviorTreeElement.cs

@@ -71,13 +71,13 @@ public virtual void Initialize()
 
             foreach(var ch in allChildrenToRun)
             {
+                //TODO: will be changed to an actual debugger instead of just unity logs. Issue #3
                 ch.ObserveEveryValueChanged(x => x.CurrentState).Subscribe(x => Debug.Log(ElementType + " state changed: " + x));
             }
 
             Initialized = true;
         }
 
-
         public override string ToString()
         {
             var depthPad = "";

Assets/Scripts/AI/BehaviorTreeManagerAsset.cs

@@ -12,7 +12,7 @@ namespace Assets.Scripts.AI
     public class BehaviorTreeManagerAsset : ScriptableObject
     {
         public int TimesToTick;
-        public double SecondsBetweenTicks = 10;
+        public float SecondsBetweenTicks = 0.1f;
 
         public string RunnerElementsJSON;
     }