feat: improve node layout

Author: SolarianZ

Editor/Scripts/GraphView/PlayableGraphView.cs

@@ -30,9 +30,9 @@ public PlayableGraph GetPlayableGraph()
             return _playableGraph;
         }
 
-        public void SetPlayableGraph(PlayableGraph playableGraph, bool forceRepaint)
+        public void SetPlayableGraph(PlayableGraph playableGraph)
         {
-            if (!forceRepaint && IsEqual(ref _playableGraph, ref playableGraph))
+            if (IsEqual(ref _playableGraph, ref playableGraph))
             {
                 return;
             }
@@ -91,10 +91,10 @@ private void PopulateView()
             for (int i = 0; i < _playableOutputNodes.Count; i++)
             {
                 var outputNode = _playableOutputNodes[i];
-                var hierarchySize = outputNode.GetHierarchySize();
-                outputNode.CalculateLayout(hierarchySize, origin);
+                var treeSize = outputNode.GetHierarchySize();
+                outputNode.CalculateLayout(treeSize, origin);
 
-                origin.y += hierarchySize.y + NodeLayoutInfo.VerticalSpace;
+                origin.y += treeSize.y + NodeLayoutInfo.VerticalSpace;
             }
         }
 

Editor/Scripts/Node/GraphViewNode.cs

@@ -47,44 +47,32 @@ public Vector2 GetHierarchySize()
                 return _hierarchySize.Value;
             }
 
-
             if (Children.Count == 0)
             {
                 _hierarchySize = GetNodeSize();
                 return _hierarchySize.Value;
             }
 
-            if (Children.Count == 1)
-            {
-                var selfSize = GetNodeSize();
-                var childHierarchySize = Children[0].GetHierarchySize();
-                _hierarchySize = new Vector2
-                {
-                    x = selfSize.x + childHierarchySize.x + NodeLayoutInfo.HorizontalSpace,
-                    y = selfSize.y + childHierarchySize.y + NodeLayoutInfo.VerticalSpace
-                };
-
-                return _hierarchySize.Value;
-            }
-
-            var hierarchySize = GetNodeSize() + new Vector2(NodeLayoutInfo.HorizontalSpace, 0);
+            var subHierarchySize = Vector2.zero;
             for (int i = 0; i < Children.Count; i++)
             {
                 var childSize = Children[i].GetHierarchySize();
-                hierarchySize.x += childSize.x;
-                hierarchySize.y = Mathf.Max(hierarchySize.y, childSize.y);
+                subHierarchySize.x = Mathf.Max(subHierarchySize.x, childSize.x);
+                subHierarchySize.y += childSize.y;
             }
+            subHierarchySize.y += (Children.Count - 1) * NodeLayoutInfo.VerticalSpace;
 
-            hierarchySize.y += (Children.Count - 1) * NodeLayoutInfo.VerticalSpace;
+            var hierarchySize = GetNodeSize() + new Vector2(NodeLayoutInfo.HorizontalSpace, 0);
+            hierarchySize.y = Mathf.Max(hierarchySize.y, subHierarchySize.y);
             _hierarchySize = hierarchySize;
 
             return _hierarchySize.Value;
         }
 
         public void CalculateLayout(Vector2 treeSize, Vector2 origin)
         {
-            var hierarchySize = GetHierarchySize();
-            var nodePos = CalculateSubTreeRootPosition(treeSize, hierarchySize, origin);
+            var subTreeSize = GetHierarchySize();
+            var nodePos = CalculateSubTreeRootPosition(treeSize, subTreeSize, origin);
             SetPosition(new Rect(nodePos, Vector2.zero));
 
             origin.x -= GetNodeSize().x - NodeLayoutInfo.HorizontalSpace;
@@ -94,7 +82,7 @@ public void CalculateLayout(Vector2 treeSize, Vector2 origin)
                 var childHierarchySize = childNode.GetHierarchySize();
                 childNode.CalculateLayout(treeSize, origin);
 
-                origin.y += childHierarchySize.y + NodeLayoutInfo.VerticalSpace;
+                origin.y += childHierarchySize.y;
             }
         }
 

Editor/Scripts/Node/NodeLayoutInfo.cs

@@ -8,7 +8,7 @@ public struct NodeLayoutInfo
 
         public const int VerticalSpace = 80;
 
-        public static readonly Vector2 StandardNodeSize = new Vector2(300, 150);
+        public static readonly Vector2 StandardNodeSize = new Vector2(400, 150);
 
         public int TreeWidth;
 

Editor/Scripts/Node/PlayableNode.cs

@@ -34,7 +34,6 @@ public override void CreateAndConnectInputNodes()
                 {
                     title = inputPlayableTypeName
                 };
-                //inputPlayableNode.SetPosition(new Rect(-400 * inputPlayableDepth, 200, 0, 0));
                 inputPlayableNode.AddToContainer(Container);
                 Children.Add(inputPlayableNode);
 

Editor/Scripts/Node/PlayableOutputNode.cs

@@ -35,12 +35,10 @@ public override void CreateAndConnectInputNodes()
             {
                 title = sourcePlayableTypeName
             };
-            //sourcePlayableNode.SetPosition(new Rect(-400 * sourcePlayableNodeDepth, 200, 0, 0));
             sourcePlayableNode.AddToContainer(Container);
             Children.Add(sourcePlayableNode);
 
-            var sourcePlayableOutputPortIndex = PlayableOutput.GetSourceOutputPort();
-            var sourcePlayableOutputPort = sourcePlayableNode.OutputPorts[sourcePlayableOutputPortIndex];
+            var sourcePlayableOutputPort = sourcePlayableNode.OutputPorts[0];
             var selfSourcePort = InternalInputPorts[0];
             var edge = selfSourcePort.ConnectTo(sourcePlayableOutputPort);
             Container.AddElement(edge);

Editor/Scripts/Window/PlayableGraphMonitorWindow.cs

@@ -23,12 +23,8 @@ public static PlayableGraphMonitorWindow Open()
 
         private PopupField<PlayableGraph> _graphPopupField;
 
-        private PlayableGraph _selectedGraph;
-
         private PlayableGraphView _graphView;
 
-        private bool _needRepaintGraph;
-
 
         private void OnEnable()
         {
@@ -70,8 +66,7 @@ private void OnDisable()
 
         private void Update()
         {
-            _graphView.SetPlayableGraph(_graphPopupField.value, _needRepaintGraph);
-            _needRepaintGraph = false;
+            _graphView.SetPlayableGraph(_graphPopupField.value);
         }
 
         private string GraphPopupFieldFormatter(PlayableGraph graph)
@@ -90,15 +85,13 @@ private void OnGraphCreated(PlayableGraph graph)
             {
                 _graphs.Add(graph);
                 _graphPopupField.MarkDirtyRepaint();
-                _needRepaintGraph = true;
             }
         }
 
         private void OnDestroyingGraph(PlayableGraph graph)
         {
             _graphs.Remove(graph);
             _graphPopupField.MarkDirtyRepaint();
-            _needRepaintGraph = true;
         }
     }
-}
+}