Merge pull request #91 from crashkonijn/fix/various-editor-bugs

Fix/various editor bugs
crashkonijn · Oct 16, 2023 · 49be2e4 · 49be2e4
2 parents 2d068ed + 7499088
commit 49be2e4
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 16 deletions.
diff --git a/Package/Documentation/General/WorldState.md.meta b/Package/Documentation/General/WorldState.md.meta
diff --git a/Package/Editor/CrashKonijn.Goap.Editor/Classes/DebugGraph.cs b/Package/Editor/CrashKonijn.Goap.Editor/Classes/DebugGraph.cs
@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
+using NUnit.Framework;
 using Graph = CrashKonijn.Goap.Editor.Classes.Models.Graph;
 using Node = CrashKonijn.Goap.Editor.Classes.Models.Node;
 
@@ -25,11 +27,14 @@ public Nodes GetGraph(Node entryNode)
 
         private void StoreNode(int depth, Node node, Nodes nodes)
         {
+            if (nodes.Contains(node))
+                return;
+
             nodes.Add(depth, node);
 
             foreach (var connection in node.Conditions.SelectMany(condition => condition.Connections))
             {
-                this.StoreNode(depth + 1, this.GetNode(connection), nodes);
+                this.StoreNode(depth + 1,  this.GetNode(connection), nodes);
             }
         }
 

diff --git a/Package/Editor/CrashKonijn.Goap.Editor/Classes/Nodes.cs b/Package/Editor/CrashKonijn.Goap.Editor/Classes/Nodes.cs
@@ -38,7 +38,7 @@ public int GetMaxWidth()
 
         public void Add(int depth, Node node)
         {
-            if (this.AllNodes.Values.Any(x => x.Node == node))
+            if (this.Contains(node))
                 return;
 
             var newNode = new RenderNode(node);
@@ -47,5 +47,10 @@ public void Add(int depth, Node node)
 
             this.MaxWidth = this.GetMaxWidth();
         }
+
+        public bool Contains(Node node)
+        {
+            return this.AllNodes.Values.Any(x => x.Node == node);
+        }
     }
 }
diff --git a/Package/Editor/CrashKonijn.Goap.Editor/NodeViewer/NodeViewerEditorWindow.cs b/Package/Editor/CrashKonijn.Goap.Editor/NodeViewer/NodeViewerEditorWindow.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using CrashKonijn.Goap.Behaviours;
 using CrashKonijn.Goap.Editor.Classes;
@@ -173,7 +174,17 @@ private void RenderAgents()
                 itemsSource = this.agents
             };
 
-            list.SetSelectionWithoutNotify(new []{ this.agents.IndexOf(this.agent) });
+            if (this.agent == null && this.agents.Count > 0)
+            {
+                list.SetSelectionWithoutNotify(new[] { 0 });
+                this.AgentChanged(this.agents[0]);
+            }
+
+            if (this.agent != null)
+            {
+                list.SetSelectionWithoutNotify(new []{ this.agents.IndexOf(this.agent) });
+                this.AgentChanged(this.agent);
+            }
 
 #if UNITY_2021_1 || UNITY_2021_2 || UNITY_2021_3
             list.schedule.Execute(() =>
@@ -188,26 +199,29 @@ private void RenderAgents()
 
                 var agent = this.agents[index];
 
-                if (agent == null)
-                    return;
-
-                if (agent == this.agent)
-                    return;
-
-                this.agent = agent;
-                this.goapSet = this.agent.GoapSet;
-                this.RenderGraph();
+                this.AgentChanged(agent);
             }).Every(33);
 #elif UNITY_2022_1_OR_NEWER
             list.selectionChanged += _ =>
             {
-                this.agent = this.agents[list.selectedIndex];
-                this.goapSet = this.agent.GoapSet;
-                this.RenderGraph();
+                this.AgentChanged(this.agents[list.selectedIndex]);
             };
 #endif
             this.leftPanel.Add(list);
         }
+
+        private void AgentChanged(AgentBehaviour agent)
+        {
+            if (agent == null)
+                return;
+
+            if (agent == this.agent)
+                return;
+
+            this.agent = agent;
+            this.goapSet = this.agent.GoapSet;
+            this.RenderGraph();
+        }
 
         private void RenderGraph()
         {