Signal system refactored

cemuka · cemuka · commit bc939c289d2e · 2022-06-15T09:37:47.000+03:00
diff --git a/Assets/Example/Scripts/ApplicationStartup.cs b/Assets/Example/Scripts/ApplicationStartup.cs
@@ -1,19 +1,26 @@
 using UnityEngine;
+using RuntimeNodeEditor;
 
 public class ApplicationStartup : MonoBehaviour
 {
     public Transform editorHolder1;
+    public Transform editorHolder2;
     public ExampleNodeEditor editor1;
+    public ExampleNodeEditor editor2;
 
     private void Start()
     {
         Application.targetFrameRate = 60;
-        var graph1 = editor1.CreateGraph<MyGraph>(editorHolder1);
+        var graph1 = editor1.CreateGraph<NodeGraph>(editorHolder1);
         editor1.StartEditor(graph1);
+
+        var graph2 = editor2.CreateGraph<NodeGraph>(editorHolder2);
+        editor2.StartEditor(graph2);
     }
 
     private void Update()
     {
         editor1.UpdateEditor();
+        editor2.UpdateEditor();
     }
 }
diff --git a/Assets/Example/Scripts/ExampleNodeEditor.cs b/Assets/Example/Scripts/ExampleNodeEditor.cs
@@ -1,4 +1,5 @@
-﻿using RuntimeNodeEditor;
+﻿using System;
+using RuntimeNodeEditor;
 using UnityEngine;
 using UnityEngine.EventSystems;
 
@@ -12,10 +13,12 @@ public override void StartEditor(NodeGraph graph)
 
         _savePath = Application.dataPath + "/Example/Resources/graph.json";
         
-        Graph.pointerListener.GraphPointerClickEvent        += OnGraphPointerClick;
-        Graph.pointerListener.GraphPointerDragEvent         += OnGraphPointerDrag;
-        Graph.SignalSystem.NodePointerClickEvent            += OnNodePointerClick;
-        Graph.SignalSystem.NodeConnectionPointerClickEvent  += OnNodeConnectionPointerClick;
+        Graph.GraphPointerListener.GraphPointerClickEvent    += OnGraphPointerClick;
+        Graph.GraphPointerListener.GraphPointerDragEvent     += OnGraphPointerDrag;
+        Graph.EventListener.NodePointerClickEvent            += OnNodePointerClick;
+        Graph.EventListener.NodeConnectionPointerClickEvent  += OnNodeConnectionPointerClick;
+        Graph.EventListener.SocketConnect                    += OnSocketConnection;
+        Graph.EventListener.SocketDisconnect                 += OnSocketDisconnection;
     }
 
     private void OnGraphPointerClick(PointerEventData eventData)
@@ -75,6 +78,16 @@ private void OnNodeConnectionPointerClick(string connId, PointerEventData eventD
         }
     }
 
+    private void OnSocketConnection(SocketInput input, SocketOutput output)
+    {
+        Debug.Log("connect");
+    }
+
+    private void OnSocketDisconnection(SocketInput input, SocketOutput output)
+    {
+        Debug.Log("disconnect");
+    }
+
 
     //  context item actions
     private void CreateFloatNode()
diff --git a/Assets/Example/Scripts/MyGraph.cs b/Assets/Example/Scripts/MyGraph.cs
diff --git a/Assets/Example/Scripts/MyGraph.cs.meta b/Assets/Example/Scripts/MyGraph.cs.meta
diff --git a/Assets/RuntimeNodeEditor/Scripts/Graph/NodeGraph.cs b/Assets/RuntimeNodeEditor/Scripts/Graph/NodeGraph.cs
@@ -10,8 +10,9 @@ namespace RuntimeNodeEditor
 {
     public class NodeGraph : MonoBehaviour
     {
-        public RectTransform        GraphContainer => _graphContainer;
-        public SignalSystem         SignalSystem   => _signalSystem;
+        public RectTransform        GraphContainer          => _graphContainer;
+        public GraphPointerListener GraphPointerListener    => pointerListener;
+        public SignalSystem         EventListener           => _signalSystem;
 
         //  scene references
         public RectTransform        contextMenuContainer;
@@ -61,7 +62,7 @@ public void Create(string prefabPath)
 	        mousePosition = UnityEngine.InputSystem.Mouse.current.position.ReadValue();
 #endif
 	        var pos = Utility.GetLocalPointIn(nodeContainer, mousePosition);
-            var node = Utility.CreateNodePrefab<Node>(prefabPath);
+            var node = Utility.CreateNodePrefab<Node>(prefabPath, nodeContainer);
             node.Init(_signalSystem, pos, NewId(), prefabPath);
             node.Setup();
             nodes.Add(node);
@@ -70,7 +71,7 @@ public void Create(string prefabPath)
 
         public void Create(string prefabPath, Vector2 pos)
         {
-            var node = Utility.CreateNodePrefab<Node>(prefabPath);
+            var node = Utility.CreateNodePrefab<Node>(prefabPath, nodeContainer);
             node.Init(_signalSystem, pos, NewId(), prefabPath);
             node.Setup();
             nodes.Add(node);
@@ -391,7 +392,7 @@ private void HandleSocketRegister(Node node)
 
         private void LoadNode(NodeData data)
         {
-            var node = Utility.CreateNodePrefab<Node>(data.path);
+            var node = Utility.CreateNodePrefab<Node>(data.path, nodeContainer);
             node.Init(_signalSystem, new Vector2(data.posX, data.posY), data.id, data.path);
             node.Setup();
             nodes.Add(node);
diff --git a/Assets/RuntimeNodeEditor/Scripts/NodeEditor/NodeEditor.cs b/Assets/RuntimeNodeEditor/Scripts/NodeEditor/NodeEditor.cs
@@ -23,11 +23,10 @@ public virtual void StartEditor(NodeGraph graph)
             _graph = graph;
             _graph.Init();
             _graph.pointerListener.Init(_graph.GraphContainer, minZoom, maxZoom);
-            Utility.Initialize(_graph.nodeContainer, _graph.contextMenuContainer);
 
 
             _contextMenu = Instantiate(contextMenuPrefab, _graph.contextMenuContainer).GetComponent<ContextMenu>();
-            _contextMenu.Init(Graph.SignalSystem);
+            _contextMenu.Init(Graph.EventListener);
             CloseContextMenu();
         }
 
@@ -40,7 +39,7 @@ public void UpdateEditor()
         public void DisplayContextMenu()
         {
             _contextMenu.Clear();
-            _contextMenu.Show(_contextMenuData, Utility.GetCtxMenuPointerPosition());
+            _contextMenu.Show(_contextMenuData, Utility.GetCtxMenuPointerPosition(Graph.contextMenuContainer));
         }
 
         public void CloseContextMenu()
diff --git a/Assets/RuntimeNodeEditor/Scripts/SignalSystem.cs b/Assets/RuntimeNodeEditor/Scripts/SignalSystem.cs
@@ -14,6 +14,8 @@ public class SignalSystem
         public event Action<Node, PointerEventData>              NodePointerDragEvent;
         public event Action<ContextMenuData, ContextContainer>   OnMenuItemClicked;
         public event Action<string, PointerEventData>            NodeConnectionPointerClickEvent;
+        public event Action<SocketInput, SocketOutput>           SocketConnect;
+        public event Action<SocketInput, SocketOutput>           SocketDisconnect;
 
         public void InvokeSocketDragFrom(SocketOutput output)
         {
@@ -59,5 +61,15 @@ public void InvokeNodeConnectionPointerClick(string connId, PointerEventData eve
         {
             NodeConnectionPointerClickEvent?.Invoke(connId, eventData);
         }
+    
+        public void InvokeSocketConnection(SocketInput input, SocketOutput output)
+        {
+            SocketConnect?.Invoke(input, output);
+        }
+
+        public void InvokeSocketDisconnection(SocketInput input, SocketOutput output)
+        {
+            SocketDisconnect?.Invoke(input, output);
+        }
     }
 }
diff --git a/Assets/RuntimeNodeEditor/Scripts/Utility.cs b/Assets/RuntimeNodeEditor/Scripts/Utility.cs
@@ -4,29 +4,19 @@ namespace RuntimeNodeEditor
 {
     public class Utility
     {
-        private static RectTransform _nodeContainer;
-        private static RectTransform _contextMenuContainer;
-
-        public static void Initialize(RectTransform nodeContainer, RectTransform contextMenuContainer)
-        {
-            _nodeContainer = nodeContainer;
-            _contextMenuContainer = contextMenuContainer;
-        }
-
-
         public static Vector2 GetLocalPointIn(RectTransform container, Vector3 pos, Camera eventCamera = null)
         {
             var point = Vector2.zero;
             RectTransformUtility.ScreenPointToLocalPointInRectangle(container, pos, eventCamera, out point);
             return point;
         }
 
-        public static Vector2 GetCtxMenuPointerPosition()
+        public static Vector2 GetCtxMenuPointerPosition(RectTransform rect)
         {
 	        Vector2 localPointerPos;
 	        var success = false;
 	        #if ENABLE_LEGACY_INPUT_MANAGER
-            success = RectTransformUtility.ScreenPointToLocalPointInRectangle(_contextMenuContainer,
+            success = RectTransformUtility.ScreenPointToLocalPointInRectangle(rect,
                                                                                   Input.mousePosition,
                                                                                   null,
                                                                                   out localPointerPos);
@@ -42,7 +32,7 @@ public static Vector2 GetCtxMenuPointerPosition()
 
 
 
-        public static T CreatePrefab<T>(string path, Transform parent)
+        public static T CreatePrefab<T>(string path, RectTransform parent)
         {
             var prefab = Resources.Load<GameObject>(path);
             var instance = GameObject.Instantiate(prefab, parent);
@@ -51,9 +41,9 @@ public static T CreatePrefab<T>(string path, Transform parent)
             return component;
         }
 
-        public static T CreateNodePrefab<T>(string path)
+        public static T CreateNodePrefab<T>(string path, RectTransform parent)
         {
-            return CreatePrefab<T>(path, _nodeContainer);
+            return CreatePrefab<T>(path, parent);
         }
 
         public static Vector3 QuadraticCurve(Vector3 a, Vector3 b, Vector3 c, float t)

Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,26 @@`
`1`	`1`	`using UnityEngine;`
	`2`	`+using RuntimeNodeEditor;`
`2`	`3`
`3`	`4`	`public class ApplicationStartup : MonoBehaviour`
`4`	`5`	`{`
`5`	`6`	`public Transform editorHolder1;`
	`7`	`+ public Transform editorHolder2;`
`6`	`8`	`public ExampleNodeEditor editor1;`
	`9`	`+ public ExampleNodeEditor editor2;`
`7`	`10`
`8`	`11`	`private void Start()`
`9`	`12`	`{`
`10`	`13`	`Application.targetFrameRate = 60;`
`11`		`- var graph1 = editor1.CreateGraph<MyGraph>(editorHolder1);`
	`14`	`+ var graph1 = editor1.CreateGraph<NodeGraph>(editorHolder1);`
`12`	`15`	`editor1.StartEditor(graph1);`
	`16`	`+`
	`17`	`+ var graph2 = editor2.CreateGraph<NodeGraph>(editorHolder2);`
	`18`	`+ editor2.StartEditor(graph2);`
`13`	`19`	`}`
`14`	`20`
`15`	`21`	`private void Update()`
`16`	`22`	`{`
`17`	`23`	`editor1.UpdateEditor();`
	`24`	`+ editor2.UpdateEditor();`
`18`	`25`	`}`
`19`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,10 @@ public virtual void StartEditor(NodeGraph graph)`
`23`	`23`	`_graph = graph;`
`24`	`24`	`_graph.Init();`
`25`	`25`	`_graph.pointerListener.Init(_graph.GraphContainer, minZoom, maxZoom);`
`26`		`- Utility.Initialize(_graph.nodeContainer, _graph.contextMenuContainer);`
`27`	`26`
`28`	`27`
`29`	`28`	`_contextMenu = Instantiate(contextMenuPrefab, _graph.contextMenuContainer).GetComponent<ContextMenu>();`
`30`		`- _contextMenu.Init(Graph.SignalSystem);`
	`29`	`+ _contextMenu.Init(Graph.EventListener);`
`31`	`30`	`CloseContextMenu();`
`32`	`31`	`}`
`33`	`32`
`@@ -40,7 +39,7 @@ public void UpdateEditor()`
`40`	`39`	`public void DisplayContextMenu()`
`41`	`40`	`{`
`42`	`41`	`_contextMenu.Clear();`
`43`		`- _contextMenu.Show(_contextMenuData, Utility.GetCtxMenuPointerPosition());`
	`42`	`+ _contextMenu.Show(_contextMenuData, Utility.GetCtxMenuPointerPosition(Graph.contextMenuContainer));`
`44`	`43`	`}`
`45`	`44`
`46`	`45`	`public void CloseContextMenu()`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ public class SignalSystem`
`14`	`14`	`public event Action<Node, PointerEventData> NodePointerDragEvent;`
`15`	`15`	`public event Action<ContextMenuData, ContextContainer> OnMenuItemClicked;`
`16`	`16`	`public event Action<string, PointerEventData> NodeConnectionPointerClickEvent;`
	`17`	`+ public event Action<SocketInput, SocketOutput> SocketConnect;`
	`18`	`+ public event Action<SocketInput, SocketOutput> SocketDisconnect;`
`17`	`19`
`18`	`20`	`public void InvokeSocketDragFrom(SocketOutput output)`
`19`	`21`	`{`
`@@ -59,5 +61,15 @@ public void InvokeNodeConnectionPointerClick(string connId, PointerEventData eve`
`59`	`61`	`{`
`60`	`62`	`NodeConnectionPointerClickEvent?.Invoke(connId, eventData);`
`61`	`63`	`}`
	`64`	`+`
	`65`	`+ public void InvokeSocketConnection(SocketInput input, SocketOutput output)`
	`66`	`+ {`
	`67`	`+ SocketConnect?.Invoke(input, output);`
	`68`	`+ }`
	`69`	`+`
	`70`	`+ public void InvokeSocketDisconnection(SocketInput input, SocketOutput output)`
	`71`	`+ {`
	`72`	`+ SocketDisconnect?.Invoke(input, output);`
	`73`	`+ }`
`62`	`74`	`}`
`63`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,29 +4,19 @@ namespace RuntimeNodeEditor`
`4`	`4`	`{`
`5`	`5`	`public class Utility`
`6`	`6`	`{`
`7`		`- private static RectTransform _nodeContainer;`
`8`		`- private static RectTransform _contextMenuContainer;`
`9`		`-`
`10`		`- public static void Initialize(RectTransform nodeContainer, RectTransform contextMenuContainer)`
`11`		`- {`
`12`		`- _nodeContainer = nodeContainer;`
`13`		`- _contextMenuContainer = contextMenuContainer;`
`14`		`- }`
`15`		`-`
`16`		`-`
`17`	`7`	`public static Vector2 GetLocalPointIn(RectTransform container, Vector3 pos, Camera eventCamera = null)`
`18`	`8`	`{`
`19`	`9`	`var point = Vector2.zero;`
`20`	`10`	`RectTransformUtility.ScreenPointToLocalPointInRectangle(container, pos, eventCamera, out point);`
`21`	`11`	`return point;`
`22`	`12`	`}`
`23`	`13`
`24`		`- public static Vector2 GetCtxMenuPointerPosition()`
	`14`	`+ public static Vector2 GetCtxMenuPointerPosition(RectTransform rect)`
`25`	`15`	`{`
`26`	`16`	`Vector2 localPointerPos;`
`27`	`17`	`var success = false;`
`28`	`18`	`#if ENABLE_LEGACY_INPUT_MANAGER`
`29`		`- success = RectTransformUtility.ScreenPointToLocalPointInRectangle(_contextMenuContainer,`
	`19`	`+ success = RectTransformUtility.ScreenPointToLocalPointInRectangle(rect,`
`30`	`20`	`Input.mousePosition,`
`31`	`21`	`null,`
`32`	`22`	`out localPointerPos);`
`@@ -42,7 +32,7 @@ public static Vector2 GetCtxMenuPointerPosition()`
`42`	`32`
`43`	`33`
`44`	`34`
`45`		`- public static T CreatePrefab<T>(string path, Transform parent)`
	`35`	`+ public static T CreatePrefab<T>(string path, RectTransform parent)`
`46`	`36`	`{`
`47`	`37`	`var prefab = Resources.Load<GameObject>(path);`
`48`	`38`	`var instance = GameObject.Instantiate(prefab, parent);`
`@@ -51,9 +41,9 @@ public static T CreatePrefab<T>(string path, Transform parent)`
`51`	`41`	`return component;`
`52`	`42`	`}`
`53`	`43`
`54`		`- public static T CreateNodePrefab<T>(string path)`
	`44`	`+ public static T CreateNodePrefab<T>(string path, RectTransform parent)`
`55`	`45`	`{`
`56`		`- return CreatePrefab<T>(path, _nodeContainer);`
	`46`	`+ return CreatePrefab<T>(path, parent);`
`57`	`47`	`}`
`58`	`48`
`59`	`49`	`public static Vector3 QuadraticCurve(Vector3 a, Vector3 b, Vector3 c, float t)`