small fixes; fixed bug in MultipleResourcesSensor

luxkun · Feb 21, 2017 · 9ca2c26 · 9ca2c26
1 parent dd74a62
commit 9ca2c26
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 23 deletions.
diff --git a/Unity/Editor/ReGoapNodeBaseEditor.cs b/Unity/Editor/ReGoapNodeBaseEditor.cs
@@ -21,15 +21,11 @@ public class ReGoapNodeBaseEditor : EditorWindow
     private IReGoapAgent agent;
     private GUIStyle possibleActionStyle;
 
-    private float repaintCooldown;
-    private float repaintDelay = 0.33f;
-
     [MenuItem("Window/ReGoap Debugger")]
     private static void OpenWindow()
     {
         ReGoapNodeBaseEditor window = GetWindow<ReGoapNodeBaseEditor>();
         window.titleContent = new GUIContent("ReGoap Debugger");
-        EditorApplication.update += window.Update;
     }
 
     private void OnEnable()
@@ -99,15 +95,6 @@ private void OnGUI()
         ProcessNodeEvents(Event.current);
         ProcessEvents(Event.current);
 
-        if (GUI.changed) Repaint();
-    }
-
-    void Update()
-    {
-        if (Time.time < repaintCooldown)
-            return;
-        repaintCooldown = repaintDelay + Time.time;
-        UpdateGoapNodes(Selection.activeGameObject);
         Repaint();
     }
 

diff --git a/Unity/FSMExample/Sensors/MultipleResourcesSensor.cs b/Unity/FSMExample/Sensors/MultipleResourcesSensor.cs
@@ -8,7 +8,7 @@
 public class MultipleResourcesSensor : ResourceSensor
 {
     private static Dictionary<string, Dictionary<IResource, Vector3>> cachedResources;
-    private static float cacheUpdateDelay;
+    private Dictionary<string, float> cacheUpdateDelays;
     private static float cacheUpdateCooldown = 1f;
 
     public float MinResourceValue = 1f;
@@ -23,13 +23,17 @@ public override void UpdateSensor()
             worldState.Set("see" + resourceManager.GetResourceName(), resourceManager.GetResourcesCount() >= MinResourceValue);
 
             if (cachedResources == null)
+            {
                 cachedResources = new Dictionary<string, Dictionary<IResource, Vector3>>();
+                cacheUpdateDelays = new Dictionary<string, float>();
+            }
             // since every agent will use same resources we cache this function
-            if (Time.time > cacheUpdateDelay || !cachedResources.ContainsKey(resourceManager.GetResourceName()))
+            float cacheUpdateDelay;
+            if (!cacheUpdateDelays.TryGetValue(resourceManager.GetResourceName(), out cacheUpdateDelay) || Time.time > cacheUpdateDelay)
             {
                 UpdateResources(resourceManager);
                 cachedResources[resourceManager.GetResourceName()] = resourcesPosition;
-                cacheUpdateDelay = Time.time + cacheUpdateCooldown;
+                cacheUpdateDelays[resourceManager.GetResourceName()] = Time.time + cacheUpdateCooldown;
             }
             var nearestResource = Utilities.GetNearest(transform.position, cachedResources[resourceManager.GetResourceName()]);
             worldState.Set("nearest" + resourceManager.GetResourceName(), nearestResource);

diff --git a/Unity/GoapAgent.cs b/Unity/GoapAgent.cs
@@ -33,6 +33,7 @@ public bool IsPlanning
     }
 
     public bool WorkInFixedUpdate;
+    public bool ValidateActiveAction;
 
     #region UnityFunctions
     protected virtual void Awake()
@@ -72,9 +73,12 @@ private void Tick()
             return;
         }
         // check if current action preconditions are still valid, else invalid action and restart planning
-        var state = memory.GetWorldState();
-        if (currentActionState.Action.GetPreconditions(state).MissingDifference(state, 1) > 0)
-            TryWarnActionFailure(currentActionState.Action);
+        if (ValidateActiveAction)
+        {
+            var state = memory.GetWorldState();
+            if (currentActionState.Action.GetPreconditions(state).MissingDifference(state, 1) > 0)
+                TryWarnActionFailure(currentActionState.Action);
+        }
     }
     #endregion
 
@@ -129,10 +133,11 @@ protected virtual bool CalculateNewGoal(bool forceStart = false)
     protected virtual void OnDonePlanning(IReGoapGoal newGoal)
     {
         currentPlanWorker = null;
-        if (newGoal == null)
-        {
+        if (newGoal == null) { 
             if (currentGoal == null)
+            {
                 ReGoapLogger.LogWarning("GoapAgent " + this + " could not find a plan.");
+            }
             return;
         }
 
@@ -181,6 +186,8 @@ protected virtual void PushAction()
         var plan = currentGoal.GetPlan();
         if (plan.Count == 0)
         {
+            currentActionState.Action.Exit(currentActionState.Action);
+            currentActionState = null;
             CalculateNewGoal();
         }
         else

diff --git a/Unity/GoapPlannerManager.cs b/Unity/GoapPlannerManager.cs
@@ -142,9 +142,9 @@ protected virtual void FixedUpdate()
     // check all threads for done work
     protected virtual void Tick()
     {
-        lock (doneWorks)
+        if (doneWorks.Count > 0)
         {
-            if (doneWorks.Count > 0)
+            lock (doneWorks)
             {
                 var doneWorksCopy = doneWorks.ToArray();
                 doneWorks.Clear();