Merge pull request #145 from alelievr/customize-edgeview

alelievr · web-flow · commit 2322667b79ff · 2021-02-22T14:54:26.000+01:00
Customize edgeview
diff --git a/Assets/com.alelievr.NodeGraphProcessor/Editor/Logic/EdgeConnectorListener.cs b/Assets/com.alelievr.NodeGraphProcessor/Editor/Logic/EdgeConnectorListener.cs
@@ -12,7 +12,7 @@ namespace GraphProcessor
     /// </summary>
     public class BaseEdgeConnectorListener : IEdgeConnectorListener
     {
-        protected readonly BaseGraphView graphView;
+        public readonly BaseGraphView graphView;
 
         Dictionary< Edge, PortView >    edgeInputPorts = new Dictionary< Edge, PortView >();
         Dictionary< Edge, PortView >    edgeOutputPorts = new Dictionary< Edge, PortView >();
diff --git a/Assets/com.alelievr.NodeGraphProcessor/Editor/Utils/BaseEdgeConnector.cs b/Assets/com.alelievr.NodeGraphProcessor/Editor/Utils/BaseEdgeConnector.cs
@@ -9,19 +9,26 @@ namespace GraphProcessor
 {
 	public class BaseEdgeConnector : EdgeConnector
 	{
-		BaseEdgeDragHelper dragHelper;
+		protected BaseEdgeDragHelper dragHelper;
         Edge edgeCandidate;
-        private bool active;
+        protected bool active;
         Vector2 mouseDownPosition;
+        protected BaseGraphView graphView;
 
         internal const float k_ConnectionDistanceTreshold = 10f;
 
 		public BaseEdgeConnector(IEdgeConnectorListener listener) : base()
 		{
-            dragHelper = new BaseEdgeDragHelper(listener);
+            graphView = (listener as BaseEdgeConnectorListener)?.graphView;
             active = false;
+            InitEdgeConnector(listener);
+        }
+
+        protected virtual void InitEdgeConnector(IEdgeConnectorListener listener)
+        {
+            dragHelper = new BaseEdgeDragHelper(listener);
             activators.Add(new ManipulatorActivationFilter { button = MouseButton.LeftMouse });
-		}
+        }
 
 		public override EdgeDragHelper edgeDragHelper => dragHelper;
 
@@ -63,7 +70,7 @@ protected virtual void OnMouseDown(MouseDownEvent e)
 
             mouseDownPosition = e.localMousePosition;
 
-            edgeCandidate = new EdgeView();
+            edgeCandidate = graphView != null ? graphView.CreateEdgeView() : new EdgeView();
             edgeDragHelper.draggedPort = graphElement;
             edgeDragHelper.edgeCandidate = edgeCandidate;
 
diff --git a/Assets/com.alelievr.NodeGraphProcessor/Editor/Utils/BaseEdgeDragHelper.cs b/Assets/com.alelievr.NodeGraphProcessor/Editor/Utils/BaseEdgeDragHelper.cs
@@ -218,7 +218,7 @@ public override void HandleMouseMove(MouseMoveEvent evt)
             {
                 if (ghostEdge == null)
                 {
-                    ghostEdge = new EdgeView();
+                    ghostEdge = CreateEdgeView();
                     ghostEdge.isGhostEdge = true;
                     ghostEdge.pickingMode = PickingMode.Ignore;
                     graphView.AddElement(ghostEdge);
@@ -260,6 +260,11 @@ public override void HandleMouseMove(MouseMoveEvent evt)
             }
         }
 
+        protected virtual EdgeView CreateEdgeView()
+        {
+            return new EdgeView();
+        }
+
         private void Pan(TimerState ts)
         {
             graphView.viewTransform.position -= panDiff;
diff --git a/Assets/com.alelievr.NodeGraphProcessor/Editor/Views/BaseGraphView.cs b/Assets/com.alelievr.NodeGraphProcessor/Editor/Views/BaseGraphView.cs
@@ -289,19 +289,22 @@ void UnserializeAndPasteCallback(string operationName, string serializedData)
 
 				if (nodeViewsPerNode.ContainsKey(oldInputNode) && nodeViewsPerNode.ContainsKey(oldOutputNode))
 				{
-					var edgeView = new EdgeView()
-					{
-						userData = newEdge,
-						input = nodeViewsPerNode[oldInputNode].GetPortViewFromFieldName(newEdge.inputFieldName, newEdge.inputPortIdentifier),
-						output = nodeViewsPerNode[oldOutputNode].GetPortViewFromFieldName(newEdge.outputFieldName, newEdge.outputPortIdentifier)
-					};
+					var edgeView = CreateEdgeView();
+					edgeView.userData = newEdge;
+					edgeView.input = nodeViewsPerNode[oldInputNode].GetPortViewFromFieldName(newEdge.inputFieldName, newEdge.inputPortIdentifier);
+					edgeView.output = nodeViewsPerNode[oldOutputNode].GetPortViewFromFieldName(newEdge.outputFieldName, newEdge.outputPortIdentifier);
 
 					Connect(edgeView);
 				}
 			}
 		}
 
-		GraphViewChange GraphViewChangedCallback(GraphViewChange changes)
+        public virtual EdgeView CreateEdgeView()
+        {
+			return new EdgeView();
+        }
+
+        GraphViewChange GraphViewChangedCallback(GraphViewChange changes)
 		{
 			if (changes.elementsToRemove != null)
 			{
@@ -764,11 +767,11 @@ void InitializeEdgeViews()
 				if (inputNodeView == null || outputNodeView == null)
 					continue;
 
-				var edgeView = new EdgeView() {
-					userData = serializedEdge,
-					input = inputNodeView.GetPortViewFromFieldName(serializedEdge.inputFieldName, serializedEdge.inputPortIdentifier),
-					output = outputNodeView.GetPortViewFromFieldName(serializedEdge.outputFieldName, serializedEdge.outputPortIdentifier)
-				};
+				var edgeView = CreateEdgeView();
+				edgeView.userData = serializedEdge;
+				edgeView.input = inputNodeView.GetPortViewFromFieldName(serializedEdge.inputFieldName, serializedEdge.inputPortIdentifier);
+				edgeView.output = outputNodeView.GetPortViewFromFieldName(serializedEdge.outputFieldName, serializedEdge.outputPortIdentifier);
+
 
 				ConnectView(edgeView);
 			}
@@ -1087,12 +1090,11 @@ public bool Connect(PortView inputPortView, PortView outputPortView, bool autoDi
 
 			var newEdge = SerializableEdge.CreateNewEdge(graph, inputPort, outputPort);
 
-			var edgeView = new EdgeView()
-			{
-				userData = newEdge,
-				input = inputPortView,
-				output = outputPortView,
-			};
+			var edgeView = CreateEdgeView();
+			edgeView.userData = newEdge;
+			edgeView.input = inputPortView;
+			edgeView.output = outputPortView;
+
 
 			return Connect(edgeView);
 		}
diff --git a/Assets/com.alelievr.NodeGraphProcessor/Editor/Views/BaseNodeView.cs b/Assets/com.alelievr.NodeGraphProcessor/Editor/Views/BaseNodeView.cs
@@ -280,9 +280,10 @@ public PortView GetPortViewFromFieldName(string fieldName, string identifier)
 			});
 		}
 
+
 		public PortView AddPort(FieldInfo fieldInfo, Direction direction, BaseEdgeConnectorListener listener, PortData portData)
 		{
-			PortView p = PortView.CreatePV(direction, fieldInfo, portData, listener);
+			PortView p = CreatePortView(direction, fieldInfo, portData, listener);
 
 			if (p.direction == Direction.Input)
 			{
@@ -317,7 +318,10 @@ public PortView AddPort(FieldInfo fieldInfo, Direction direction, BaseEdgeConnec
 			return p;
 		}
 
-		public void InsertPort(PortView portView, int index)
+        protected virtual PortView CreatePortView(Direction direction, FieldInfo fieldInfo, PortData portData, BaseEdgeConnectorListener listener)
+        	=> PortView.CreatePortView(direction, fieldInfo, portData, listener);
+
+        public void InsertPort(PortView portView, int index)
 		{
 			if (portView.direction == Direction.Input)
 			{
diff --git a/Assets/com.alelievr.NodeGraphProcessor/Editor/Views/PortView.cs b/Assets/com.alelievr.NodeGraphProcessor/Editor/Views/PortView.cs
@@ -30,7 +30,7 @@ public class PortView : Port
 
 		readonly string portStyle = "GraphProcessorStyles/PortView";
 
-        PortView(Direction direction, FieldInfo fieldInfo, PortData portData, BaseEdgeConnectorListener edgeConnectorListener)
+        protected PortView(Direction direction, FieldInfo fieldInfo, PortData portData, BaseEdgeConnectorListener edgeConnectorListener)
             : base(portData.vertical ? Orientation.Vertical : Orientation.Horizontal, direction, Capacity.Multi, portData.displayType ?? fieldInfo.FieldType)
 		{
 			this.fieldInfo = fieldInfo;
@@ -53,7 +53,7 @@ public class PortView : Port
 			this.tooltip = portData.tooltip;
 		}
 
-		public static PortView CreatePV(Direction direction, FieldInfo fieldInfo, PortData portData, BaseEdgeConnectorListener edgeConnectorListener)
+		public static PortView CreatePortView(Direction direction, FieldInfo fieldInfo, PortData portData, BaseEdgeConnectorListener edgeConnectorListener)
 		{
 			var pv = new PortView(direction, fieldInfo, portData, edgeConnectorListener);
 			pv.m_EdgeConnector = new BaseEdgeConnector(edgeConnectorListener);

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace GraphProcessor`
`12`	`12`	`/// </summary>`
`13`	`13`	`public class BaseEdgeConnectorListener : IEdgeConnectorListener`
`14`	`14`	`{`
`15`		`- protected readonly BaseGraphView graphView;`
	`15`	`+ public readonly BaseGraphView graphView;`
`16`	`16`
`17`	`17`	`Dictionary< Edge, PortView > edgeInputPorts = new Dictionary< Edge, PortView >();`
`18`	`18`	`Dictionary< Edge, PortView > edgeOutputPorts = new Dictionary< Edge, PortView >();`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ public override void HandleMouseMove(MouseMoveEvent evt)`
`218`	`218`	`{`
`219`	`219`	`if (ghostEdge == null)`
`220`	`220`	`{`
`221`		`- ghostEdge = new EdgeView();`
	`221`	`+ ghostEdge = CreateEdgeView();`
`222`	`222`	`ghostEdge.isGhostEdge = true;`
`223`	`223`	`ghostEdge.pickingMode = PickingMode.Ignore;`
`224`	`224`	`graphView.AddElement(ghostEdge);`
`@@ -260,6 +260,11 @@ public override void HandleMouseMove(MouseMoveEvent evt)`
`260`	`260`	`}`
`261`	`261`	`}`
`262`	`262`
	`263`	`+ protected virtual EdgeView CreateEdgeView()`
	`264`	`+ {`
	`265`	`+ return new EdgeView();`
	`266`	`+ }`
	`267`	`+`
`263`	`268`	`private void Pan(TimerState ts)`
`264`	`269`	`{`
`265`	`270`	`graphView.viewTransform.position -= panDiff;`
Original file line number	Diff line number	Diff line change
`@@ -280,9 +280,10 @@ public PortView GetPortViewFromFieldName(string fieldName, string identifier)`
`280`	`280`	`});`
`281`	`281`	`}`
`282`	`282`
	`283`	`+`
`283`	`284`	`public PortView AddPort(FieldInfo fieldInfo, Direction direction, BaseEdgeConnectorListener listener, PortData portData)`
`284`	`285`	`{`
`285`		`- PortView p = PortView.CreatePV(direction, fieldInfo, portData, listener);`
	`286`	`+ PortView p = CreatePortView(direction, fieldInfo, portData, listener);`
`286`	`287`
`287`	`288`	`if (p.direction == Direction.Input)`
`288`	`289`	`{`
`@@ -317,7 +318,10 @@ public PortView AddPort(FieldInfo fieldInfo, Direction direction, BaseEdgeConnec`
`317`	`318`	`return p;`
`318`	`319`	`}`
`319`	`320`
`320`		`- public void InsertPort(PortView portView, int index)`
	`321`	`+ protected virtual PortView CreatePortView(Direction direction, FieldInfo fieldInfo, PortData portData, BaseEdgeConnectorListener listener)`
	`322`	`+ => PortView.CreatePortView(direction, fieldInfo, portData, listener);`
	`323`	`+`
	`324`	`+ public void InsertPort(PortView portView, int index)`
`321`	`325`	`{`
`322`	`326`	`if (portView.direction == Direction.Input)`
`323`	`327`	`{`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public class PortView : Port`
`30`	`30`
`31`	`31`	`readonly string portStyle = "GraphProcessorStyles/PortView";`
`32`	`32`
`33`		`- PortView(Direction direction, FieldInfo fieldInfo, PortData portData, BaseEdgeConnectorListener edgeConnectorListener)`
	`33`	`+ protected PortView(Direction direction, FieldInfo fieldInfo, PortData portData, BaseEdgeConnectorListener edgeConnectorListener)`
`34`	`34`	`: base(portData.vertical ? Orientation.Vertical : Orientation.Horizontal, direction, Capacity.Multi, portData.displayType ?? fieldInfo.FieldType)`
`35`	`35`	`{`
`36`	`36`	`this.fieldInfo = fieldInfo;`
`@@ -53,7 +53,7 @@ public class PortView : Port`
`53`	`53`	`this.tooltip = portData.tooltip;`
`54`	`54`	`}`
`55`	`55`
`56`		`- public static PortView CreatePV(Direction direction, FieldInfo fieldInfo, PortData portData, BaseEdgeConnectorListener edgeConnectorListener)`
	`56`	`+ public static PortView CreatePortView(Direction direction, FieldInfo fieldInfo, PortData portData, BaseEdgeConnectorListener edgeConnectorListener)`
`57`	`57`	`{`
`58`	`58`	`var pv = new PortView(direction, fieldInfo, portData, edgeConnectorListener);`
`59`	`59`	`pv.m_EdgeConnector = new BaseEdgeConnector(edgeConnectorListener);`