draft ControlPointViewer

Author: oleghcp

Code/Editor/Window/NodeBased/GraphMap.cs

@@ -330,7 +330,7 @@ private void HandleNodeEvents(Event e)
                     needLockEvent |= _nodeViewers[i].HandleBaseEventsOutOfPointer(e);
                 }
 
-                _nodeViewers[i].HandleBaseEventsAnyway(e);
+                _nodeViewers[i].HandleBaseEvents(e);
             }
 
             if (needLockEvent)

Code/Editor/Window/NodeBased/NodeDrawing/ControlPointViewer.cs

@@ -0,0 +1,81 @@
+using OlegHcp;
+using OlegHcp.Mathematics;
+using UnityEditor;
+using UnityEngine;
+
+namespace OlegHcpEditor.Window.NodeBased.NodeDrawing
+{
+    internal class ControlPointViewer
+    {
+        private bool _controlPressed;
+        private TransitionViewer _transitionViewer;
+        private Vector3[] _trianglePoints = new Vector3[4];
+
+        public ControlPointViewer(TransitionViewer transitionViewer)
+        {
+            _transitionViewer = transitionViewer;
+        }
+
+        public void DrawSquare(in Vector2 position, in Color color)
+        {
+            Handles.color = color;
+            if (Handles.Button(position, Quaternion.identity, 4f, 8f, Handles.DotHandleCap))
+                ButtonAction();
+            Handles.color = Colours.White;
+        }
+
+        public void DrawTriangle(in Vector2 position, in Quaternion rotation, in Color color)
+        {
+            Handles.color = color;
+            if (Handles.Button(position, rotation, 6f, 8f, TriangleHandleCap))
+                ButtonAction();
+            Handles.color = Colours.White;
+        }
+
+        public bool HandleEvents(Event e)
+        {
+            _controlPressed = e.control;
+
+            return false;
+        }
+
+        private void ButtonAction()
+        {
+            if (Event.current.button != 0)
+                return;
+
+            if (_controlPressed)
+                _transitionViewer.Delete();
+            else
+                _transitionViewer.ShowInfoWindow();
+        }
+
+        private void TriangleHandleCap(int controlID, Vector3 position, Quaternion rotation, float size, EventType eventType)
+        {
+            switch (eventType)
+            {
+                case EventType.MouseMove:
+                case EventType.Layout:
+                    HandleUtility.AddControl(controlID, HandleUtility.DistanceToRectangle(position, rotation, size));
+                    break;
+
+                case EventType.Repaint:
+                    Vector2 pos = position;
+                    float angle = rotation.eulerAngles.z + 90f;
+
+                    Vector2 vector0 = MathUtility.AngleToVector2(angle) * size;
+                    Vector2 vector1 = MathUtility.AngleToVector2(angle + 120f) * size;
+                    Vector2 vector2 = MathUtility.AngleToVector2(angle - 120f) * size;
+                    Vector2 lookVector = pos + vector0;
+
+                    _trianglePoints[0] = pos + vector1;
+                    _trianglePoints[1] = lookVector;
+                    _trianglePoints[2] = lookVector;
+                    _trianglePoints[3] = pos + vector2;
+
+                    Handles.DrawSolidRectangleWithOutline(_trianglePoints, Colours.White, default);
+                    break;
+            }
+        }
+    }
+}

Code/Editor/Window/NodeBased/NodeDrawing/ControlPointViewer.cs.meta

@@ -24,7 +24,7 @@ internal class NodeViewer : IComparable<NodeViewer>
         private readonly PortViewer _out;
         private readonly GraphMap _map;
         private readonly GraphEditorWindow _window;
-        private readonly List<TransitionViewer> _transitionViewers;
+        private readonly List<TransitionViewer> _lineViewers;
 
         private NodeDrawer _nodeDrawer;
         private SerializedProperty _nodeProp;
@@ -55,7 +55,7 @@ internal class NodeViewer : IComparable<NodeViewer>
         public NodeType Type => _type;
         public Type SystemType => _systemType;
 
-        public IReadOnlyList<TransitionViewer> TransitionViewers => _transitionViewers;
+        public IReadOnlyList<TransitionViewer> LineViewers => _lineViewers;
         public SerializedProperty NodeProp => _nodeProp;
         public SerializedProperty NameProp => _nameProp;
         public NodeDrawer NodeDrawer => _nodeDrawer;
@@ -138,7 +138,7 @@ public NodeViewer(SerializedProperty nodeProp, GraphMap map, GraphEditorWindow w
             _systemType = EditorUtilityExt.GetTypeFromSerializedPropertyTypename(nodeProp.managedReferenceFullTypename);
             _type = GraphUtility.GetNodeType(_systemType);
             _position = nodeProp.FindPropertyRelative(RawNode.PositionFieldName).vector2Value;
-            _transitionViewers = new List<TransitionViewer>();
+            _lineViewers = new List<TransitionViewer>();
             _in = new PortViewer(this, PortType.In, _map);
             _out = new PortViewer(this, PortType.Out, _map);
             _nodeDrawer = _map.GetNodeDrawer(_systemType);
@@ -156,7 +156,7 @@ public void CreateConnections()
             {
                 int nextNodeId = transitionProp.FindPropertyRelative(Transition.NodeIdFieldName).intValue;
                 NodeViewer connectedNodeViewer = _map.NodeViewers.First(itm => itm.Id == nextNodeId);
-                _transitionViewers.Add(new TransitionViewer(_out, connectedNodeViewer.In, _window));
+                _lineViewers.Add(new TransitionViewer(_out, connectedNodeViewer.In, _window));
             }
         }
 
@@ -167,7 +167,7 @@ public void Select(bool on)
 
         public void CreateTransition(PortViewer destination)
         {
-            if (_transitionViewers.Any(item => item.Destination.Node.Id == destination.Node.Id))
+            if (_lineViewers.Any(item => item.Destination.Node.Id == destination.Node.Id))
                 return;
 
             SerializedProperty transitionsProperty = _nodeProp.FindPropertyRelative(RawNode.ArrayFieldName);
@@ -177,19 +177,19 @@ public void CreateTransition(PortViewer destination)
             newItem.FindPropertyRelative(Transition.ConditionFieldName).managedReferenceValue = null;
             newItem.FindPropertyRelative(Transition.PointsFieldName).ClearArray();
 
-            _transitionViewers.Add(new TransitionViewer(_out, destination, _window));
+            _lineViewers.Add(new TransitionViewer(_out, destination, _window));
         }
 
         public void RemoveTransition(NodeViewer nextNodeViewer)
         {
-            TransitionViewer transition = _transitionViewers.Find(item => item.Destination.Node == nextNodeViewer);
+            TransitionViewer transition = _lineViewers.Find(item => item.Destination.Node == nextNodeViewer);
             if (transition != null)
                 RemoveTransition(transition);
         }
 
         public void RemoveTransition(TransitionViewer transition)
         {
-            _transitionViewers.Remove(transition);
+            _lineViewers.Remove(transition);
             NodeViewer next = transition.Destination.Node;
 
             SerializedProperty transitionsProperty = _nodeProp.FindPropertyRelative(RawNode.ArrayFieldName);
@@ -231,16 +231,16 @@ public void DrawTransitions()
         {
             if (_window.ShowPorts)
             {
-                for (int i = 0; i < _transitionViewers.Count; i++)
+                for (int i = 0; i < _lineViewers.Count; i++)
                 {
-                    _transitionViewers[i].DrawSpline();
+                    _lineViewers[i].DrawSpline();
                 }
             }
             else
             {
-                for (int i = 0; i < _transitionViewers.Count; i++)
+                for (int i = 0; i < _lineViewers.Count; i++)
                 {
-                    _transitionViewers[i].DrawArrow();
+                    _lineViewers[i].DrawArrow();
                 }
             }
         }
@@ -334,7 +334,7 @@ public bool HandleBaseEventsOutOfPointer(Event e)
             return needLock;
         }
 
-        public void HandleBaseEventsAnyway(Event e)
+        public void HandleBaseEvents(Event e)
         {
             if (e.type == EventType.KeyDown)
             {
@@ -365,9 +365,9 @@ public bool HandleLineEvents(Event e)
 
             if (IsInCamera)
             {
-                for (int i = 0; i < _transitionViewers.Count; i++)
+                for (int i = 0; i < _lineViewers.Count; i++)
                 {
-                    if (_transitionViewers[i].HandleEvents(e))
+                    if (_lineViewers[i].HandleEvents(e, _window.ShowPorts))
                         needLock = true;
                 }
             }
@@ -379,7 +379,7 @@ public void Save()
         {
             SerializedProperty positionProperty = _nodeProp.FindPropertyRelative(RawNode.PositionFieldName);
             positionProperty.vector2Value = _position;
-            _transitionViewers.ForEach(item => item.Save());
+            _lineViewers.ForEach(item => item.Save());
         }
 
         public int CompareTo(NodeViewer other)

Code/Editor/Window/NodeBased/NodeDrawing/NodeViewer.cs

@@ -28,7 +28,7 @@ public PointViewer(Vector2 position, TransitionViewer transitionViewer, GraphEdi
         public void Draw(in Color color)
         {
             Handles.color = color;
-            Handles.DrawSolidDisc(_window.Camera.WorldToScreen(Position), Vector3.back, VIEW_RADIUS);
+            Handles.DrawSolidDisc(_window.Camera.WorldToScreen(_position), Vector3.back, VIEW_RADIUS);
             Handles.color = Colours.White;
         }
 
@@ -40,7 +40,7 @@ public bool HandleEvents(Event e)
             {
                 case EventType.MouseDown:
                     Vector2 rectSize = new Vector2(PICK_SIZE, PICK_SIZE);
-                    Vector2 rectPos = _window.Camera.WorldToScreen(Position) - rectSize * 0.5f;
+                    Vector2 rectPos = _window.Camera.WorldToScreen(_position) - rectSize * 0.5f;
                     Rect pointRect = new Rect(rectPos, rectSize);
 
                     if (e.button == 0)
@@ -49,13 +49,13 @@ public bool HandleEvents(Event e)
                         {
                             if (e.control)
                             {
-                                _draggedPosition = Position;
+                                _draggedPosition = _position;
                                 _isDragged = e.control;
                                 needLock = true;
                             }
                             else
                             {
-                                _transitionViewer.ShowTransitionInfoWindow();
+                                _transitionViewer.ShowInfoWindow();
                             }
                         }
                         else