UnityMirror/xNode
1
0
Fork 0
mirror of https://github.com/Siccity/xNode.git synced 2025-12-21 01:36:03 +08:00
Code

Fixed Editor Window losing SceneGraph reference when exiting play mode.

Browse Source
This commit is contained in:
Emre Dogan 2023-10-06 21:23:33 +01:00
parent 47396c06f4
commit ef83d77a72
2 changed files with 56 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Scripts/Editor/NodeEditorGUI.cs
View File

@ -23,23 +23,44 @@ namespace XNodeEditor
/// <summary> Executed after all other window GUI. Useful if Zoom is ruining your day. Automatically resets after being run.</summary> /// <summary> Executed after all other window GUI. Useful if Zoom is ruining your day. Automatically resets after being run.</summary>
public event Action onLateGUI; public event Action onLateGUI;
private static readonly Vector3[] polyLineTempArray = new Vector3[2]; private static readonly Vector3[] polyLineTempArray = new Vector3[2];
private bool graphFindAttempted;
private bool editModeEntered;
protected virtual void OnGUI() protected virtual void OnGUI()
{ {
Event e = Event.current; Event e = Event.current;
Matrix4x4 m = GUI.matrix; Matrix4x4 m = GUI.matrix;
if (graph == null) if (graph == null && !graphFindAttempted)
{ {
return; graphFindAttempted = true;
if (!OnOpen(graphInstanceID, 0))
{
return;
}
}
else
{
graphFindAttempted = false;
} }
ValidateGraphEditor(); ValidateGraphEditor();
Controls(); Controls();
DrawGrid(position, zoom, panOffset); DrawGrid(position, zoom, panOffset);
DrawConnections(); // Hack used to prevent connections flickering when exiting play mode.
DrawDraggedConnection(); if (!editModeEntered)
DrawNodes(); {
DrawNodes();
DrawConnections();
DrawDraggedConnection();
}
else
{
DrawConnections();
DrawDraggedConnection();
DrawNodes();
}
DrawSelectionBox(); DrawSelectionBox();
DrawTooltip(); DrawTooltip();
graphEditor.OnGUI(); graphEditor.OnGUI();
@ -99,7 +120,8 @@ namespace XNodeEditor
// Draw tiled background // Draw tiled background
GUI.DrawTextureWithTexCoords(rect, gridTex, new Rect(tileOffset, tileAmount)); GUI.DrawTextureWithTexCoords(rect, gridTex, new Rect(tileOffset, tileAmount));
GUI.DrawTextureWithTexCoords(rect, crossTex, new Rect(tileOffset + new Vector2(0.5f, 0.5f), tileAmount)); GUI.DrawTextureWithTexCoords(rect, crossTex,
new Rect(tileOffset + new Vector2(0.5f, 0.5f), tileAmount));
} }
public void DrawSelectionBox() public void DrawSelectionBox()

28
Scripts/Editor/NodeEditorWindow.cs
View File

@ -57,6 +57,7 @@ namespace XNodeEditor
private void OnEnable() private void OnEnable()
{ {
Undo.undoRedoPerformed += OnUndoRedoPerformed; Undo.undoRedoPerformed += OnUndoRedoPerformed;
EditorApplication.playModeStateChanged += PlaymodeStateChanged;
// Reload portConnectionPoints if there are any // Reload portConnectionPoints if there are any
int length = _references.Length; int length = _references.Length;
@ -76,6 +77,7 @@ namespace XNodeEditor
private void OnDisable() private void OnDisable()
{ {
Undo.undoRedoPerformed -= OnUndoRedoPerformed; Undo.undoRedoPerformed -= OnUndoRedoPerformed;
EditorApplication.playModeStateChanged -= PlaymodeStateChanged;
// Cache portConnectionPoints before serialization starts // Cache portConnectionPoints before serialization starts
int count = portConnectionPoints.Count; int count = portConnectionPoints.Count;
@ -90,8 +92,32 @@ namespace XNodeEditor
} }
} }
private void PlaymodeStateChanged(PlayModeStateChange playModeStateChange)
{
if (playModeStateChange == PlayModeStateChange.EnteredEditMode)
{
// graph = EditorUtility.InstanceIDToObject(graphInstanceID) as NodeGraph;
// OnOpen(graphInstanceID, 0);
// Repaint();
editModeEntered = true;
}
else if (playModeStateChange == PlayModeStateChange.ExitingPlayMode)
{
// OnOpen(graphInstanceID, 0);
// Repaint();
editModeEntered = false;
}
// if (!EditorApplication.isPlaying)
// {
// OnOpen(graphInstanceID, 0);
// Repaint();
// }
}
public Dictionary<Node, Vector2> nodeSizes { get; } = new Dictionary<Node, Vector2>(); public Dictionary<Node, Vector2> nodeSizes { get; } = new Dictionary<Node, Vector2>();
public NodeGraph graph; public NodeGraph graph;
public int graphInstanceID;
public Vector2 panOffset public Vector2 panOffset
{ {
get => _panOffset; get => _panOffset;
@ -304,6 +330,8 @@ namespace XNodeEditor
NodeEditorWindow w = GetWindow(typeof(NodeEditorWindow), false, "xNode", true) as NodeEditorWindow; NodeEditorWindow w = GetWindow(typeof(NodeEditorWindow), false, "xNode", true) as NodeEditorWindow;
w.wantsMouseMove = true; w.wantsMouseMove = true;
w.graph = graph; w.graph = graph;
w.graphInstanceID = graph.GetInstanceID();
return w; return w;
} }