feat: improve node layout

Author: SolarianZ

Editor/Scripts/GraphView/PlayableGraphView.cs

@@ -1,6 +1,5 @@
 using GBG.PlayableGraphMonitor.Editor.Node;
 using System.Collections.Generic;
-using UnityEditor;
 using UnityEditor.Experimental.GraphView;
 using UnityEditor.Playables;
 using UnityEngine;
@@ -20,8 +19,8 @@ public class PlayableGraphView : UGraphView
         public PlayableGraphView()
         {
             this.AddManipulator(new ContentDragger());
-            this.AddManipulator(new SelectionDragger());
-            this.AddManipulator(new RectangleSelector());
+            //this.AddManipulator(new SelectionDragger());
+            //this.AddManipulator(new RectangleSelector());
             SetupZoom(ContentZoomer.DefaultMinScale, ContentZoomer.DefaultMaxScale);
         }
 
@@ -32,18 +31,16 @@ public PlayableGraph GetPlayableGraph()
 
         public void SetPlayableGraph(PlayableGraph playableGraph)
         {
-            if (IsEqual(ref _playableGraph, ref playableGraph))
-            {
-                return;
-            }
+            //if (IsEqual(ref _playableGraph, ref playableGraph))
+            //{
+            //    return;
+            //}
 
             _playableGraph = playableGraph;
 
             ClearView();
 
             PopulateView();
-
-            EditorApplication.delayCall += () => FrameAll();
         }
 
 
@@ -55,8 +52,6 @@ private void ClearView()
             }
 
             _playableOutputNodes.Clear();
-
-            GraphViewNode.LayoutInfo.Reset();
         }
 
         private void PopulateView()
@@ -92,7 +87,8 @@ private void PopulateView()
             {
                 var outputNode = _playableOutputNodes[i];
                 var treeSize = outputNode.GetHierarchySize();
-                outputNode.CalculateLayout(treeSize, origin);
+
+                outputNode.CalculateLayout(origin);
 
                 origin.y += treeSize.y + NodeLayoutInfo.VerticalSpace;
             }

Editor/Scripts/Node/GraphViewNode.cs

@@ -8,8 +8,6 @@ namespace GBG.PlayableGraphMonitor.Editor.Node
 {
     public abstract class GraphViewNode : UNode
     {
-        internal static NodeLayoutInfo LayoutInfo;
-
         public int Depth { get; }
 
         public IReadOnlyList<Port> InputPorts => InternalInputPorts;
@@ -20,12 +18,12 @@ public abstract class GraphViewNode : UNode
 
         protected List<Port> InternalOutputPorts { get; } = new List<Port>();
 
-        protected UGraphView Container { get; set; }
-
         // public IReadOnlyList<Edge> InputEdges => InternalInputEdges;
 
         protected List<Edge> InternalInputEdges { get; } = new List<Edge>();
 
+        protected UGraphView Container { get; set; }
+
         protected GraphViewNode Parent { get; private set; }
 
         protected new List<GraphViewNode> Children { get; } = new List<GraphViewNode>();
@@ -34,6 +32,17 @@ public abstract class GraphViewNode : UNode
         private Vector2? _hierarchySize;
 
 
+        protected GraphViewNode(int depth)
+        {
+            Depth = depth;
+        }
+
+        protected Port InstantiatePort<TPort>(Direction direction)
+        {
+            return InstantiatePort(Orientation.Horizontal, direction, Port.Capacity.Single, typeof(TPort));
+        }
+
+
         public Vector2 GetNodeSize()
         {
             return NodeLayoutInfo.StandardNodeSize;
@@ -69,24 +78,24 @@ public Vector2 GetHierarchySize()
             return _hierarchySize.Value;
         }
 
-        public void CalculateLayout(Vector2 treeSize, Vector2 origin)
+        public void CalculateLayout(Vector2 origin)
         {
             var subTreeSize = GetHierarchySize();
-            var nodePos = CalculateSubTreeRootPosition(treeSize, subTreeSize, origin);
+            var nodePos = CalculateSubTreeRootNodePosition(subTreeSize, origin);
             SetPosition(new Rect(nodePos, Vector2.zero));
 
             origin.x -= GetNodeSize().x - NodeLayoutInfo.HorizontalSpace;
             for (int i = 0; i < Children.Count; i++)
             {
                 var childNode = Children[i];
                 var childHierarchySize = childNode.GetHierarchySize();
-                childNode.CalculateLayout(treeSize, origin);
+                childNode.CalculateLayout(origin);
 
                 origin.y += childHierarchySize.y;
             }
         }
 
-        public static Vector2 CalculateSubTreeRootPosition(Vector2 treeSize, Vector2 subTreeSize, Vector2 subTreeOrigin)
+        public static Vector2 CalculateSubTreeRootNodePosition(Vector2 subTreeSize, Vector2 subTreeOrigin)
         {
             var subTreePos = subTreeOrigin;
             subTreePos.y += subTreeSize.y / 2;
@@ -124,16 +133,5 @@ public virtual void RemoveFromContainer()
         }
 
         public abstract void CreateAndConnectInputNodes();
-
-
-        protected GraphViewNode(int depth)
-        {
-            Depth = depth;
-        }
-
-        protected Port InstantiatePort<TPort>(Direction direction)
-        {
-            return InstantiatePort(Orientation.Horizontal, direction, Port.Capacity.Single, typeof(TPort));
-        }
     }
 }

Editor/Scripts/Node/NodeLayoutInfo.cs

@@ -2,24 +2,12 @@
 
 namespace GBG.PlayableGraphMonitor.Editor.Node
 {
-    public struct NodeLayoutInfo
+    public static class NodeLayoutInfo
     {
         public const int HorizontalSpace = 80;
 
         public const int VerticalSpace = 80;
 
         public static readonly Vector2 StandardNodeSize = new Vector2(400, 150);
-
-        public int TreeWidth;
-
-        public Vector2 Origin;
-
-
-        public void Reset()
-        {
-            TreeWidth = 0;
-
-            Origin = Vector2.zero;
-        }
     }
 }

Editor/Scripts/Node/PlayableNode.cs

@@ -1,4 +1,5 @@
-using UnityEditor.Experimental.GraphView;
+using System;
+using UnityEditor.Experimental.GraphView;
 using UnityEngine;
 using UnityEngine.Playables;
 
@@ -8,6 +9,9 @@ public class PlayableNode : GraphViewNode
     {
         public Playable Playable { get; }
 
+        public Type PlayableType => Playable.IsValid() ? Playable.GetPlayableType() : null;
+
+
         public PlayableNode(int depth, Playable playable)
             : base(depth)
         {
@@ -44,11 +48,6 @@ public override void CreateAndConnectInputNodes()
                 InternalInputEdges.Add(edge);
             }
 
-            if (Children.Count > 1)
-            {
-                LayoutInfo.TreeWidth += Children.Count - 1;
-            }
-
             for (int i = 0; i < Children.Count; i++)
             {
                 Children[i].CreateAndConnectInputNodes();

Editor/Scripts/Node/PlayableOutputNode.cs

@@ -16,11 +16,9 @@ public PlayableOutputNode(int depth, PlayableOutput playableOutput)
             CreatePorts();
             RefreshExpandedState();
             RefreshPorts();
-
-            // root node occupies one width unit
-            LayoutInfo.TreeWidth += 1;
         }
 
+
         public override void CreateAndConnectInputNodes()
         {
             if (!PlayableOutput.IsOutputValid())
@@ -44,11 +42,6 @@ public override void CreateAndConnectInputNodes()
             Container.AddElement(edge);
             InternalInputEdges.Add(edge);
 
-            if (Children.Count > 1)
-            {
-                LayoutInfo.TreeWidth += Children.Count - 1;
-            }
-
             for (int i = 0; i < Children.Count; i++)
             {
                 Children[i].CreateAndConnectInputNodes();