From fb2ee29c5a35efd6ca9ad82a339d9a78df2d63b5 Mon Sep 17 00:00:00 2001 From: taoria <445625470@qq.com> Date: Wed, 13 Jul 2022 12:23:29 +0800 Subject: [PATCH] refactor: again refactor this --- TNode/Editor/Blackboard.meta | 3 +++ TNode/Editor/Blackboard/IBlackboardView.cs | 7 +++++++ TNode/Editor/Blackboard/IBlackboardView.cs.meta | 3 +++ TNode/Editor/NodeGraphView/IBaseDataGraphView.cs | 4 +++- TNode/Editor/NodeGraphView/IDataGraphView.cs | 2 +- .../Editor/Tools/GraphEditorCreator/GraphEditorCreator.cs | 1 - .../GraphEditorCreator/SourceGeneratorForGraphEditor.cs | 7 +------ {TNode => TNodeGraphViewImpl}/Editor/Cache.meta | 0 .../Editor/Cache/NodeEditorExtensions.cs | 4 +--- .../Editor/Cache/NodeEditorExtensions.cs.meta | 0 {TNode => TNodeGraphViewImpl}/Editor/GraphEditor.cs | 2 +- {TNode => TNodeGraphViewImpl}/Editor/GraphEditor.cs.meta | 0 TNodeGraphViewImpl/Editor/NodeGraphView/DataGraphView.cs | 4 ++-- .../Editor/Search/NodeSearchWindowProvider.cs | 2 +- 14 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 TNode/Editor/Blackboard.meta create mode 100644 TNode/Editor/Blackboard/IBlackboardView.cs create mode 100644 TNode/Editor/Blackboard/IBlackboardView.cs.meta rename {TNode => TNodeGraphViewImpl}/Editor/Cache.meta (100%) rename {TNode => TNodeGraphViewImpl}/Editor/Cache/NodeEditorExtensions.cs (99%) rename {TNode => TNodeGraphViewImpl}/Editor/Cache/NodeEditorExtensions.cs.meta (100%) rename {TNode => TNodeGraphViewImpl}/Editor/GraphEditor.cs (98%) rename {TNode => TNodeGraphViewImpl}/Editor/GraphEditor.cs.meta (100%) diff --git a/TNode/Editor/Blackboard.meta b/TNode/Editor/Blackboard.meta new file mode 100644 index 0000000..ab8049d --- /dev/null +++ b/TNode/Editor/Blackboard.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: bf3b6f6e73b647e2a5421f482a0b0e8f +timeCreated: 1657686050 \ No newline at end of file diff --git a/TNode/Editor/Blackboard/IBlackboardView.cs b/TNode/Editor/Blackboard/IBlackboardView.cs new file mode 100644 index 0000000..6a7e0f0 --- /dev/null +++ b/TNode/Editor/Blackboard/IBlackboardView.cs @@ -0,0 +1,7 @@ +namespace TNode.Editor.Blackboard{ + public interface IBlackboardView{ + public void AddData(){ + + } + } +} \ No newline at end of file diff --git a/TNode/Editor/Blackboard/IBlackboardView.cs.meta b/TNode/Editor/Blackboard/IBlackboardView.cs.meta new file mode 100644 index 0000000..d57a0dd --- /dev/null +++ b/TNode/Editor/Blackboard/IBlackboardView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 9c618ca8a5b0444284489b8a1942af91 +timeCreated: 1657686059 \ No newline at end of file diff --git a/TNode/Editor/NodeGraphView/IBaseDataGraphView.cs b/TNode/Editor/NodeGraphView/IBaseDataGraphView.cs index e851505..4800d8b 100644 --- a/TNode/Editor/NodeGraphView/IBaseDataGraphView.cs +++ b/TNode/Editor/NodeGraphView/IBaseDataGraphView.cs @@ -5,7 +5,9 @@ namespace TNode.Editor.NodeGraphView{ public interface IBaseDataGraphView{ public void AddTNode(NodeData nodeData, Rect rect); public void RemoveTNode(NodeData nodeData); - + public BlackboardData GetBlackboardData(); + + } } \ No newline at end of file diff --git a/TNode/Editor/NodeGraphView/IDataGraphView.cs b/TNode/Editor/NodeGraphView/IDataGraphView.cs index db2d69b..e0ed67b 100644 --- a/TNode/Editor/NodeGraphView/IDataGraphView.cs +++ b/TNode/Editor/NodeGraphView/IDataGraphView.cs @@ -2,6 +2,6 @@ namespace TNode.Editor.NodeGraphView{ public interface IDataGraphView : IBaseDataGraphView where T:GraphData{ - + public T Data{ get; set; } } } \ No newline at end of file diff --git a/TNode/Editor/Tools/GraphEditorCreator/GraphEditorCreator.cs b/TNode/Editor/Tools/GraphEditorCreator/GraphEditorCreator.cs index 1248939..145792a 100644 --- a/TNode/Editor/Tools/GraphEditorCreator/GraphEditorCreator.cs +++ b/TNode/Editor/Tools/GraphEditorCreator/GraphEditorCreator.cs @@ -1,6 +1,5 @@ using System.IO; using System.Text.RegularExpressions; -using TNode.Editor.Model; using UnityEditor; using UnityEngine; using UnityEngine.UIElements; diff --git a/TNode/Editor/Tools/GraphEditorCreator/SourceGeneratorForGraphEditor.cs b/TNode/Editor/Tools/GraphEditorCreator/SourceGeneratorForGraphEditor.cs index 8e4eeae..7529026 100644 --- a/TNode/Editor/Tools/GraphEditorCreator/SourceGeneratorForGraphEditor.cs +++ b/TNode/Editor/Tools/GraphEditorCreator/SourceGeneratorForGraphEditor.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; -using System.Text.RegularExpressions; -using Microsoft.CodeAnalysis; +using System.Text.RegularExpressions; using UnityEngine; namespace TNode.Editor.Tools.GraphEditorCreator{ diff --git a/TNode/Editor/Cache.meta b/TNodeGraphViewImpl/Editor/Cache.meta similarity index 100% rename from TNode/Editor/Cache.meta rename to TNodeGraphViewImpl/Editor/Cache.meta diff --git a/TNode/Editor/Cache/NodeEditorExtensions.cs b/TNodeGraphViewImpl/Editor/Cache/NodeEditorExtensions.cs similarity index 99% rename from TNode/Editor/Cache/NodeEditorExtensions.cs rename to TNodeGraphViewImpl/Editor/Cache/NodeEditorExtensions.cs index 4f2de04..856f0c1 100644 --- a/TNode/Editor/Cache/NodeEditorExtensions.cs +++ b/TNodeGraphViewImpl/Editor/Cache/NodeEditorExtensions.cs @@ -3,16 +3,14 @@ using System.Collections.Generic; using System.Linq; using TNode.Attribute; using TNode.Editor; -using TNode.Editor.Inspector; using TNode.Editor.NodeViews; using TNode.Models; using TNodeGraphViewImpl.Editor.GraphBlackboard; using TNodeGraphViewImpl.Editor.NodeGraphView; using UnityEditor.Experimental.GraphView; using UnityEngine; -using UnityEngine.TestTools.Utils; -namespace TNode.Cache{ +namespace TNodeGraphViewImpl.Editor.Cache{ /// /// Internal singleton class for caching TNode reflection Data. /// diff --git a/TNode/Editor/Cache/NodeEditorExtensions.cs.meta b/TNodeGraphViewImpl/Editor/Cache/NodeEditorExtensions.cs.meta similarity index 100% rename from TNode/Editor/Cache/NodeEditorExtensions.cs.meta rename to TNodeGraphViewImpl/Editor/Cache/NodeEditorExtensions.cs.meta diff --git a/TNode/Editor/GraphEditor.cs b/TNodeGraphViewImpl/Editor/GraphEditor.cs similarity index 98% rename from TNode/Editor/GraphEditor.cs rename to TNodeGraphViewImpl/Editor/GraphEditor.cs index 93a272e..59c4b11 100644 --- a/TNode/Editor/GraphEditor.cs +++ b/TNodeGraphViewImpl/Editor/GraphEditor.cs @@ -1,8 +1,8 @@ using Codice.CM.Common; -using TNode.Cache; using TNode.Editor.Inspector; using TNode.Editor.Model; using TNode.Models; +using TNodeGraphViewImpl.Editor.Cache; using TNodeGraphViewImpl.Editor.NodeGraphView; using UnityEditor; using UnityEditor.Experimental.GraphView; diff --git a/TNode/Editor/GraphEditor.cs.meta b/TNodeGraphViewImpl/Editor/GraphEditor.cs.meta similarity index 100% rename from TNode/Editor/GraphEditor.cs.meta rename to TNodeGraphViewImpl/Editor/GraphEditor.cs.meta diff --git a/TNodeGraphViewImpl/Editor/NodeGraphView/DataGraphView.cs b/TNodeGraphViewImpl/Editor/NodeGraphView/DataGraphView.cs index bcc280c..0a46a2b 100644 --- a/TNodeGraphViewImpl/Editor/NodeGraphView/DataGraphView.cs +++ b/TNodeGraphViewImpl/Editor/NodeGraphView/DataGraphView.cs @@ -3,7 +3,6 @@ using System.Collections; using System.Collections.Generic; using System.Linq; using System.Reflection; -using TNode.Cache; using TNode.Editor; using TNode.Editor.Inspector; using TNode.Editor.Model; @@ -12,6 +11,7 @@ using TNode.Editor.NodeViews; using TNode.Editor.Search; using TNode.Editor.Tools.NodeCreator; using TNode.Models; +using TNodeGraphViewImpl.Editor.Cache; using TNodeGraphViewImpl.Editor.GraphBlackboard; using TNodeGraphViewImpl.Editor.GraphBlackboard.BlackboardProperty; using UnityEditor; @@ -21,7 +21,7 @@ using UnityEngine.UIElements; using Edge = UnityEditor.Experimental.GraphView.Edge; namespace TNodeGraphViewImpl.Editor.NodeGraphView{ - public abstract class BaseDataGraphView:GraphView,IBaseDataGraphView where T:GraphData{ + public abstract class BaseDataGraphView:GraphView,IDataGraphView where T:GraphData{ #region variables and properties private T _data; private bool _isInspectorOn; diff --git a/TNodeGraphViewImpl/Editor/Search/NodeSearchWindowProvider.cs b/TNodeGraphViewImpl/Editor/Search/NodeSearchWindowProvider.cs index 058d07b..5ef4ced 100644 --- a/TNodeGraphViewImpl/Editor/Search/NodeSearchWindowProvider.cs +++ b/TNodeGraphViewImpl/Editor/Search/NodeSearchWindowProvider.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using TNode.Cache; using TNode.Editor.NodeGraphView; using TNode.Editor.Tools.NodeCreator; using TNode.Models; +using TNodeGraphViewImpl.Editor.Cache; using UnityEditor; using UnityEditor.Experimental.GraphView; using UnityEngine;