diff --git a/GraphCreator/Runtime/Blackboard/GraphMetaBlackboard.cs b/GraphCreator/Runtime/Blackboard/GraphMetaBlackboard.cs deleted file mode 100644 index 77fc56b..0000000 --- a/GraphCreator/Runtime/Blackboard/GraphMetaBlackboard.cs +++ /dev/null @@ -1,9 +0,0 @@ -using TNodeCore.Editor.EditorPersistence; -using TNodeCore.Runtime.Models; - -namespace TNode.GraphCreator.Runtime.Blackboard{ - public class GraphMetaBlackboard:BlackboardData{ - - - } -} \ No newline at end of file diff --git a/Samples/Editor/HelloEditor.cs b/Samples/Editor/HelloEditor.cs index 055890b..7e1cfaa 100644 --- a/Samples/Editor/HelloEditor.cs +++ b/Samples/Editor/HelloEditor.cs @@ -1,20 +1,21 @@ -using Samples; +using TNodeCore.Editor; using UnityEditor; using UnityEditor.Callbacks; using UnityEngine; -using TNodeCore.Editor; -public class HelloEditor : GraphEditor{ + +namespace Samples.Editor{ + public class HelloEditor : GraphEditor{ [OnOpenAsset] public static bool OnOpenAsset(int instanceID, int line){ - var graph = EditorUtility.InstanceIDToObject(instanceID) as HelloGraph; - if (graph != null) { - var wnd = GetWindow(); - wnd.titleContent = new GUIContent("HelloGraph Editor"); - wnd.Show(); - wnd.SetupNonRuntime(graph); - return true; - } - return false; + var graph = EditorUtility.InstanceIDToObject(instanceID) as HelloGraph; + if (graph != null) { + var wnd = GetWindow(); + wnd.titleContent = new GUIContent("HelloGraph Editor"); + wnd.Show(); + wnd.SetupNonRuntime(graph); + return true; + } + return false; } [MenuItem("Window/HelloEditor")] public static void ShowWindow(){ @@ -23,4 +24,5 @@ public class HelloEditor : GraphEditor{ res.Show(); } + } } \ No newline at end of file diff --git a/TextMesh Pro.meta b/Samples/New Animator Controller.controller.meta similarity index 52% rename from TextMesh Pro.meta rename to Samples/New Animator Controller.controller.meta index f9da8b5..f04ed19 100644 --- a/TextMesh Pro.meta +++ b/Samples/New Animator Controller.controller.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: f54d1bd14bd3ca042bd867b519fee8cc -folderAsset: yes -DefaultImporter: +guid: 416b2146595ee9245be40d8a34aff436 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 9100000 userData: assetBundleName: assetBundleVariant: diff --git a/Scenes/SampleScene.unity.meta b/Samples/TestScene.unity.meta similarity index 74% rename from Scenes/SampleScene.unity.meta rename to Samples/TestScene.unity.meta index c1e3c88..c514c9b 100644 --- a/Scenes/SampleScene.unity.meta +++ b/Samples/TestScene.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2cda990e2423bbf4892e6590ba056729 +guid: 49e3a9e72efd1a847a568e8b12744466 DefaultImporter: externalObjects: {} userData: diff --git a/GraphCreator.meta b/TNodeCore/GraphCreator.meta similarity index 100% rename from GraphCreator.meta rename to TNodeCore/GraphCreator.meta diff --git a/GraphCreator/Editor.meta b/TNodeCore/GraphCreator/Editor.meta similarity index 100% rename from GraphCreator/Editor.meta rename to TNodeCore/GraphCreator/Editor.meta diff --git a/GraphCreator/Editor/GraphCreator.cs b/TNodeCore/GraphCreator/Editor/GraphCreator.cs similarity index 75% rename from GraphCreator/Editor/GraphCreator.cs rename to TNodeCore/GraphCreator/Editor/GraphCreator.cs index 18a3656..b8a70f2 100644 --- a/GraphCreator/Editor/GraphCreator.cs +++ b/TNodeCore/GraphCreator/Editor/GraphCreator.cs @@ -1,7 +1,7 @@ using TNode.GraphCreator.Runtime; using TNodeCore.Editor; -namespace TNode.GraphCreator.Editor{ +namespace TNodeCore.GraphCreator.Editor{ public class GraphCreator:GraphEditor{ } diff --git a/GraphCreator/Editor/GraphCreator.cs.meta b/TNodeCore/GraphCreator/Editor/GraphCreator.cs.meta similarity index 100% rename from GraphCreator/Editor/GraphCreator.cs.meta rename to TNodeCore/GraphCreator/Editor/GraphCreator.cs.meta diff --git a/GraphCreator/Runtime.meta b/TNodeCore/GraphCreator/Runtime.meta similarity index 100% rename from GraphCreator/Runtime.meta rename to TNodeCore/GraphCreator/Runtime.meta diff --git a/GraphCreator/Runtime/Blackboard.meta b/TNodeCore/GraphCreator/Runtime/Blackboard.meta similarity index 100% rename from GraphCreator/Runtime/Blackboard.meta rename to TNodeCore/GraphCreator/Runtime/Blackboard.meta diff --git a/TNodeCore/GraphCreator/Runtime/Blackboard/GraphMetaBlackboard.cs b/TNodeCore/GraphCreator/Runtime/Blackboard/GraphMetaBlackboard.cs new file mode 100644 index 0000000..bf76943 --- /dev/null +++ b/TNodeCore/GraphCreator/Runtime/Blackboard/GraphMetaBlackboard.cs @@ -0,0 +1,8 @@ +using TNodeCore.Runtime.Models; + +namespace TNodeCore.GraphCreator.Runtime.Blackboard{ + public class GraphMetaBlackboard:BlackboardData{ + + + } +} \ No newline at end of file diff --git a/GraphCreator/Runtime/Blackboard/GraphMetaBlackboard.cs.meta b/TNodeCore/GraphCreator/Runtime/Blackboard/GraphMetaBlackboard.cs.meta similarity index 100% rename from GraphCreator/Runtime/Blackboard/GraphMetaBlackboard.cs.meta rename to TNodeCore/GraphCreator/Runtime/Blackboard/GraphMetaBlackboard.cs.meta diff --git a/GraphCreator/Runtime/GraphMetaNode.cs b/TNodeCore/GraphCreator/Runtime/GraphMetaNode.cs similarity index 100% rename from GraphCreator/Runtime/GraphMetaNode.cs rename to TNodeCore/GraphCreator/Runtime/GraphMetaNode.cs diff --git a/GraphCreator/Runtime/GraphMetaNode.cs.meta b/TNodeCore/GraphCreator/Runtime/GraphMetaNode.cs.meta similarity index 100% rename from GraphCreator/Runtime/GraphMetaNode.cs.meta rename to TNodeCore/GraphCreator/Runtime/GraphMetaNode.cs.meta diff --git a/GraphCreator/Runtime/MetaGraph.cs b/TNodeCore/GraphCreator/Runtime/MetaGraph.cs similarity index 100% rename from GraphCreator/Runtime/MetaGraph.cs rename to TNodeCore/GraphCreator/Runtime/MetaGraph.cs diff --git a/GraphCreator/Runtime/MetaGraph.cs.meta b/TNodeCore/GraphCreator/Runtime/MetaGraph.cs.meta similarity index 100% rename from GraphCreator/Runtime/MetaGraph.cs.meta rename to TNodeCore/GraphCreator/Runtime/MetaGraph.cs.meta diff --git a/GraphCreator/Runtime/Nodes.meta b/TNodeCore/GraphCreator/Runtime/Nodes.meta similarity index 100% rename from GraphCreator/Runtime/Nodes.meta rename to TNodeCore/GraphCreator/Runtime/Nodes.meta diff --git a/GraphCreator/Runtime/Nodes/GraphMetaNode.cs b/TNodeCore/GraphCreator/Runtime/Nodes/GraphMetaNode.cs similarity index 80% rename from GraphCreator/Runtime/Nodes/GraphMetaNode.cs rename to TNodeCore/GraphCreator/Runtime/Nodes/GraphMetaNode.cs index 64d6dd1..3f957eb 100644 --- a/GraphCreator/Runtime/Nodes/GraphMetaNode.cs +++ b/TNodeCore/GraphCreator/Runtime/Nodes/GraphMetaNode.cs @@ -1,8 +1,9 @@ using System; +using TNode.GraphCreator.Runtime; using TNodeCore.Runtime.Attributes; using TNodeCore.Runtime.Models; -namespace TNode.GraphCreator.Runtime.Nodes{ +namespace TNodeCore.GraphCreator.Runtime.Nodes{ namespace TNode.GraphCreator.Runtime{ diff --git a/GraphCreator/Runtime/Nodes/GraphMetaNode.cs.meta b/TNodeCore/GraphCreator/Runtime/Nodes/GraphMetaNode.cs.meta similarity index 100% rename from GraphCreator/Runtime/Nodes/GraphMetaNode.cs.meta rename to TNodeCore/GraphCreator/Runtime/Nodes/GraphMetaNode.cs.meta diff --git a/TNodeGraphViewImpl/Editor/Cache/NodeEditorExtensions.cs b/TNodeGraphViewImpl/Editor/Cache/NodeEditorExtensions.cs index 827cd51..1d8b2dd 100644 --- a/TNodeGraphViewImpl/Editor/Cache/NodeEditorExtensions.cs +++ b/TNodeGraphViewImpl/Editor/Cache/NodeEditorExtensions.cs @@ -4,17 +4,15 @@ using System.Linq; using System.Reflection; using TNode.TNodeCore.Editor.Blackboard; using TNode.TNodeCore.Editor.EditorPersistence; -using TNode.TNodeGraphViewImpl.Editor.GraphBlackboard; -using TNode.TNodeGraphViewImpl.Editor.NodeGraphView; -using TNode.TNodeGraphViewImpl.Editor.NodeViews; -using TNodeCore.Editor.EditorPersistence; using TNodeCore.Editor.NodeGraphView; using TNodeCore.Runtime.Attributes; using TNodeCore.Runtime.Models; +using TNodeGraphViewImpl.Editor.GraphBlackboard; +using TNodeGraphViewImpl.Editor.NodeGraphView; +using TNodeGraphViewImpl.Editor.NodeViews; using UnityEditor; -using UnityEngine; -namespace TNode.TNodeGraphViewImpl.Editor.Cache{ +namespace TNodeGraphViewImpl.Editor.Cache{ /// /// Internal singleton class for caching TNode reflection Data. /// diff --git a/TNodeGraphViewImpl/Editor/GraphBlackboard/BlackboardDataEntry.cs b/TNodeGraphViewImpl/Editor/GraphBlackboard/BlackboardDataEntry.cs index 76702d7..b0e11f7 100644 --- a/TNodeGraphViewImpl/Editor/GraphBlackboard/BlackboardDataEntry.cs +++ b/TNodeGraphViewImpl/Editor/GraphBlackboard/BlackboardDataEntry.cs @@ -5,7 +5,7 @@ using UnityEditor.Experimental.GraphView; using UnityEngine; using UnityEngine.UIElements; -namespace TNode.TNodeGraphViewImpl.Editor.GraphBlackboard{ +namespace TNodeGraphViewImpl.Editor.GraphBlackboard{ public class BlackboardDataEntry:GraphElement{ public Type propertyType; public string propertyPath; diff --git a/TNodeGraphViewImpl/Editor/GraphBlackboard/BlackboardField.cs b/TNodeGraphViewImpl/Editor/GraphBlackboard/BlackboardField.cs index da64ac5..77f9419 100644 --- a/TNodeGraphViewImpl/Editor/GraphBlackboard/BlackboardField.cs +++ b/TNodeGraphViewImpl/Editor/GraphBlackboard/BlackboardField.cs @@ -1,7 +1,7 @@ -namespace TNode.TNodeGraphViewImpl.Editor.GraphBlackboard{ +namespace TNodeGraphViewImpl.Editor.GraphBlackboard{ public class BlackboardField:UnityEditor.Experimental.GraphView.BlackboardField{ - public global::TNode.TNodeGraphViewImpl.Editor.GraphBlackboard.BlackboardProperty.BlackboardProperty BlackboardProperty; - public BlackboardField(global::TNode.TNodeGraphViewImpl.Editor.GraphBlackboard.BlackboardProperty.BlackboardProperty blackboardProperty):base(null,blackboardProperty.PropertyName,null){ + public global::TNodeGraphViewImpl.Editor.GraphBlackboard.BlackboardProperty.BlackboardProperty BlackboardProperty; + public BlackboardField(global::TNodeGraphViewImpl.Editor.GraphBlackboard.BlackboardProperty.BlackboardProperty blackboardProperty):base(null,blackboardProperty.PropertyName,null){ BlackboardProperty = blackboardProperty; } } diff --git a/TNodeGraphViewImpl/Editor/GraphBlackboard/BlackboardProperty/BlackboardProperty.cs b/TNodeGraphViewImpl/Editor/GraphBlackboard/BlackboardProperty/BlackboardProperty.cs index ddc7992..eaa5f89 100644 --- a/TNodeGraphViewImpl/Editor/GraphBlackboard/BlackboardProperty/BlackboardProperty.cs +++ b/TNodeGraphViewImpl/Editor/GraphBlackboard/BlackboardProperty/BlackboardProperty.cs @@ -1,6 +1,6 @@ using System; -namespace TNode.TNodeGraphViewImpl.Editor.GraphBlackboard.BlackboardProperty{ +namespace TNodeGraphViewImpl.Editor.GraphBlackboard.BlackboardProperty{ public class BlackboardProperty{ public string PropertyName; public Type PropertyType; diff --git a/TNodeGraphViewImpl/Editor/GraphBlackboard/DefaultGraphBlackboardView.cs b/TNodeGraphViewImpl/Editor/GraphBlackboard/DefaultGraphBlackboardView.cs index d460b0c..9ef2240 100644 --- a/TNodeGraphViewImpl/Editor/GraphBlackboard/DefaultGraphBlackboardView.cs +++ b/TNodeGraphViewImpl/Editor/GraphBlackboard/DefaultGraphBlackboardView.cs @@ -3,17 +3,17 @@ using System.Collections; using System.Linq; using System.Reflection; using TNode.TNodeCore.Editor.Serialization; -using TNode.TNodeGraphViewImpl.Editor.Search; using TNodeCore.Editor.NodeGraphView; using TNodeCore.Runtime.Attributes; using TNodeCore.Runtime.Models; +using TNodeGraphViewImpl.Editor.Search; using UnityEditor; using UnityEditor.Experimental.GraphView; using UnityEditor.UIElements; using UnityEngine; using UnityEngine.UIElements; -namespace TNode.TNodeGraphViewImpl.Editor.GraphBlackboard{ +namespace TNodeGraphViewImpl.Editor.GraphBlackboard{ [ViewComponent] public class DefaultGraphBlackboardView:GraphBlackboardView{ diff --git a/TNodeGraphViewImpl/Editor/GraphBlackboard/GraphBlackboardPropertyField.cs b/TNodeGraphViewImpl/Editor/GraphBlackboard/GraphBlackboardPropertyField.cs index f227574..75e4b2c 100644 --- a/TNodeGraphViewImpl/Editor/GraphBlackboard/GraphBlackboardPropertyField.cs +++ b/TNodeGraphViewImpl/Editor/GraphBlackboard/GraphBlackboardPropertyField.cs @@ -2,7 +2,7 @@ using UnityEditor.UIElements; using UnityEngine.UIElements; -namespace TNode.TNodeGraphViewImpl.Editor.GraphBlackboard{ +namespace TNodeGraphViewImpl.Editor.GraphBlackboard{ public class GraphBlackboardPropertyField:PropertyField{ private readonly bool _runtime; diff --git a/TNodeGraphViewImpl/Editor/GraphBlackboard/GraphBlackboardView.cs b/TNodeGraphViewImpl/Editor/GraphBlackboard/GraphBlackboardView.cs index e4ec655..7fa95fe 100644 --- a/TNodeGraphViewImpl/Editor/GraphBlackboard/GraphBlackboardView.cs +++ b/TNodeGraphViewImpl/Editor/GraphBlackboard/GraphBlackboardView.cs @@ -5,7 +5,7 @@ using UnityEditor; using UnityEditor.Experimental.GraphView; using UnityEngine; -namespace TNode.TNodeGraphViewImpl.Editor.GraphBlackboard{ +namespace TNodeGraphViewImpl.Editor.GraphBlackboard{ /// /// Implement this class to create graph black board for specified graph /// diff --git a/TNodeGraphViewImpl/Editor/Inspector/NodeInspector.cs b/TNodeGraphViewImpl/Editor/Inspector/NodeInspector.cs index a5f1108..5ad8583 100644 --- a/TNodeGraphViewImpl/Editor/Inspector/NodeInspector.cs +++ b/TNodeGraphViewImpl/Editor/Inspector/NodeInspector.cs @@ -1,11 +1,11 @@ -using TNode.TNodeGraphViewImpl.Editor.NodeGraphView; -using TNode.TNodeGraphViewImpl.Editor.NodeViews; -using TNodeCore.Runtime.Models; +using TNodeCore.Runtime.Models; +using TNodeGraphViewImpl.Editor.NodeGraphView; +using TNodeGraphViewImpl.Editor.NodeViews; using UnityEditor.Experimental.GraphView; using UnityEngine; using UnityEngine.UIElements; -namespace TNode.TNodeGraphViewImpl.Editor.Inspector{ +namespace TNodeGraphViewImpl.Editor.Inspector{ public class NodeInspector:SimpleGraphSubWindow{ private NodeData _data; public NodeData Data{ diff --git a/TNodeGraphViewImpl/Editor/Inspector/NodeInspectorInNode.cs b/TNodeGraphViewImpl/Editor/Inspector/NodeInspectorInNode.cs index 38047c2..0565d67 100644 --- a/TNodeGraphViewImpl/Editor/Inspector/NodeInspectorInNode.cs +++ b/TNodeGraphViewImpl/Editor/Inspector/NodeInspectorInNode.cs @@ -7,7 +7,7 @@ using UnityEditor; using UnityEditor.UIElements; using UnityEngine.UIElements; -namespace TNode.TNodeGraphViewImpl.Editor.Inspector{ +namespace TNodeGraphViewImpl.Editor.Inspector{ public class NodeInspectorInNode:VisualElement{ private NodeData _data; public NodeData Data{ diff --git a/TNodeGraphViewImpl/Editor/NodeGraphView/DataGraphView.cs b/TNodeGraphViewImpl/Editor/NodeGraphView/DataGraphView.cs index 2afd375..e1ed731 100644 --- a/TNodeGraphViewImpl/Editor/NodeGraphView/DataGraphView.cs +++ b/TNodeGraphViewImpl/Editor/NodeGraphView/DataGraphView.cs @@ -7,30 +7,26 @@ using TNode.TNodeCore.Editor.Blackboard; using TNode.TNodeCore.Editor.CommentView; using TNode.TNodeCore.Editor.EditorPersistence; using TNode.TNodeCore.Editor.Models; -using TNode.TNodeGraphViewImpl.Editor.Cache; -using TNode.TNodeGraphViewImpl.Editor.GraphBlackboard; -using TNode.TNodeGraphViewImpl.Editor.Inspector; -using TNode.TNodeGraphViewImpl.Editor.NodeViews; -using TNode.TNodeGraphViewImpl.Editor.Placemats; -using TNode.TNodeGraphViewImpl.Editor.Search; using TNodeCore.Editor; -using TNodeCore.Editor.EditorPersistence; using TNodeCore.Editor.NodeGraphView; - using TNodeCore.Editor.Tools.NodeCreator; using TNodeCore.Runtime.Components; using TNodeCore.Runtime.Models; using TNodeCore.Runtime.RuntimeCache; - +using TNodeGraphViewImpl.Editor.Cache; +using TNodeGraphViewImpl.Editor.GraphBlackboard; +using TNodeGraphViewImpl.Editor.Inspector; +using TNodeGraphViewImpl.Editor.NodeViews; +using TNodeGraphViewImpl.Editor.Placemats; +using TNodeGraphViewImpl.Editor.Search; using UnityEditor; using UnityEditor.Experimental.GraphView; -using UnityEditor.UIElements; using UnityEngine; using UnityEngine.UIElements; -using BlackboardField = TNode.TNodeGraphViewImpl.Editor.GraphBlackboard.BlackboardField; +using BlackboardField = TNodeGraphViewImpl.Editor.GraphBlackboard.BlackboardField; using Edge = UnityEditor.Experimental.GraphView.Edge; -namespace TNode.TNodeGraphViewImpl.Editor.NodeGraphView{ +namespace TNodeGraphViewImpl.Editor.NodeGraphView{ public class BaseDataGraphView:GraphView,IDataGraphView where T:GraphData{ #region const public const float RefreshRate = 1f; diff --git a/TNodeGraphViewImpl/Editor/NodeGraphView/SimpleGraphSubWindow.cs b/TNodeGraphViewImpl/Editor/NodeGraphView/SimpleGraphSubWindow.cs index 1af4330..c6ec020 100644 --- a/TNodeGraphViewImpl/Editor/NodeGraphView/SimpleGraphSubWindow.cs +++ b/TNodeGraphViewImpl/Editor/NodeGraphView/SimpleGraphSubWindow.cs @@ -1,11 +1,8 @@ -using System.Linq; -using TNode.TNodeCore.Editor.EditorPersistence; -using TNodeCore.Editor.EditorPersistence; -using UnityEditor; +using UnityEditor; using UnityEditor.Experimental.GraphView; using UnityEngine.UIElements; -namespace TNode.TNodeGraphViewImpl.Editor.NodeGraphView{ +namespace TNodeGraphViewImpl.Editor.NodeGraphView{ public class SimpleGraphSubWindow:GraphElement{ private readonly Dragger _dragger = new Dragger(); diff --git a/TNodeGraphViewImpl/Editor/NodeViews/DefaultNodeView.cs b/TNodeGraphViewImpl/Editor/NodeViews/DefaultNodeView.cs index b047a15..2a6bf22 100644 --- a/TNodeGraphViewImpl/Editor/NodeViews/DefaultNodeView.cs +++ b/TNodeGraphViewImpl/Editor/NodeViews/DefaultNodeView.cs @@ -1,6 +1,6 @@ using TNodeCore.Runtime.Models; -namespace TNode.TNodeGraphViewImpl.Editor.NodeViews{ +namespace TNodeGraphViewImpl.Editor.NodeViews{ public class DefaultBaseNodeView:BaseNodeView{ diff --git a/TNodeGraphViewImpl/Editor/NodeViews/DragNodeView.cs b/TNodeGraphViewImpl/Editor/NodeViews/DragNodeView.cs index 6748d03..9102505 100644 --- a/TNodeGraphViewImpl/Editor/NodeViews/DragNodeView.cs +++ b/TNodeGraphViewImpl/Editor/NodeViews/DragNodeView.cs @@ -7,7 +7,7 @@ using UnityEditor.Experimental.GraphView; using UnityEngine; using UnityEngine.UIElements; -namespace TNode.TNodeGraphViewImpl.Editor.NodeViews{ +namespace TNodeGraphViewImpl.Editor.NodeViews{ [ViewComponent] public class DragBaseNodeView:BaseNodeView{ public DragBaseNodeView() : base(){ diff --git a/TNodeGraphViewImpl/Editor/NodeViews/NodeView.cs b/TNodeGraphViewImpl/Editor/NodeViews/NodeView.cs index 22c4742..c9f3a77 100644 --- a/TNodeGraphViewImpl/Editor/NodeViews/NodeView.cs +++ b/TNodeGraphViewImpl/Editor/NodeViews/NodeView.cs @@ -2,20 +2,20 @@ using System.Linq; using System.Reflection; using TNode.TNodeCore.Editor.Serialization; -using TNode.TNodeGraphViewImpl.Editor.Inspector; -using TNode.TNodeGraphViewImpl.Editor.Ports; using TNodeCore.Editor.NodeGraphView; using TNodeCore.Runtime; using TNodeCore.Runtime.Attributes; using TNodeCore.Runtime.Attributes.Ports; using TNodeCore.Runtime.Models; +using TNodeGraphViewImpl.Editor.Inspector; +using TNodeGraphViewImpl.Editor.Ports; using UnityEditor; using UnityEditor.Experimental.GraphView; using UnityEngine; using UnityEngine.UIElements; using Direction = UnityEditor.Experimental.GraphView.Direction; -namespace TNode.TNodeGraphViewImpl.Editor.NodeViews{ +namespace TNodeGraphViewImpl.Editor.NodeViews{ public abstract class BaseNodeView : Node,INodeView where T:NodeData,new(){ protected T _data; diff --git a/TNodeGraphViewImpl/Editor/Placemats/PlacematView.cs b/TNodeGraphViewImpl/Editor/Placemats/PlacematView.cs index f37f9ec..0230fe2 100644 --- a/TNodeGraphViewImpl/Editor/Placemats/PlacematView.cs +++ b/TNodeGraphViewImpl/Editor/Placemats/PlacematView.cs @@ -3,7 +3,7 @@ using UnityEditor.Experimental.GraphView; using UnityEngine; using UnityEngine.UIElements; -namespace TNode.TNodeGraphViewImpl.Editor.Placemats{ +namespace TNodeGraphViewImpl.Editor.Placemats{ public class PlacematView:Placemat{ public PlacematModel PlacematModel{ get => _placematModel; diff --git a/TNodeGraphViewImpl/Editor/Ports/CustomPort.cs b/TNodeGraphViewImpl/Editor/Ports/CustomPort.cs index 13a2129..536f020 100644 --- a/TNodeGraphViewImpl/Editor/Ports/CustomPort.cs +++ b/TNodeGraphViewImpl/Editor/Ports/CustomPort.cs @@ -1,13 +1,13 @@ using System; using System.Collections.Generic; using System.Linq; -using TNode.TNodeGraphViewImpl.Editor.NodeViews; using TNodeCore.Editor.NodeGraphView; using TNodeCore.Runtime.Models; +using TNodeGraphViewImpl.Editor.NodeViews; using UnityEditor.Experimental.GraphView; using UnityEngine.UIElements; -namespace TNode.TNodeGraphViewImpl.Editor.Ports{ +namespace TNodeGraphViewImpl.Editor.Ports{ public class CustomPort:UnityEditor.Experimental.GraphView.Port{ public CustomPort(Orientation portOrientation, Direction portDirection, Capacity portCapacity, Type type) : base(portOrientation, portDirection, portCapacity, type){ m_EdgeConnector = new EdgeConnector(new CustomEdgeConnectorListener()); diff --git a/TNodeGraphViewImpl/Editor/Search/BlackboardSearchWindowProvider.cs b/TNodeGraphViewImpl/Editor/Search/BlackboardSearchWindowProvider.cs index d362a2b..5b6e372 100644 --- a/TNodeGraphViewImpl/Editor/Search/BlackboardSearchWindowProvider.cs +++ b/TNodeGraphViewImpl/Editor/Search/BlackboardSearchWindowProvider.cs @@ -2,14 +2,13 @@ using System.Collections; using System.Collections.Generic; using TNode.TNodeCore.Editor.Blackboard; -using TNode.TNodeGraphViewImpl.Editor.GraphBlackboard; using TNodeCore.Editor.NodeGraphView; using UnityEditor; using UnityEditor.Experimental.GraphView; using UnityEngine; using Object = UnityEngine.Object; -namespace TNode.TNodeGraphViewImpl.Editor.Search{ +namespace TNodeGraphViewImpl.Editor.Search{ public class BlackboardSearchWindowProvider:ScriptableObject,ISearchWindowProvider{ private Type _graphType; private IBaseDataGraphView _graphView; diff --git a/TNodeGraphViewImpl/Editor/Search/NodeSearchWindowProvider.cs b/TNodeGraphViewImpl/Editor/Search/NodeSearchWindowProvider.cs index 8b488d9..640477b 100644 --- a/TNodeGraphViewImpl/Editor/Search/NodeSearchWindowProvider.cs +++ b/TNodeGraphViewImpl/Editor/Search/NodeSearchWindowProvider.cs @@ -1,16 +1,16 @@ using System; using System.Collections.Generic; using System.Linq; -using TNode.TNodeGraphViewImpl.Editor.Cache; using TNodeCore.Editor.NodeGraphView; using TNodeCore.Editor.Tools.NodeCreator; using TNodeCore.Runtime.Models; +using TNodeGraphViewImpl.Editor.Cache; using UnityEditor; using UnityEditor.Experimental.GraphView; using UnityEngine; using UnityEngine.UIElements; -namespace TNode.TNodeGraphViewImpl.Editor.Search{ +namespace TNodeGraphViewImpl.Editor.Search{ public class NodeSearchWindowProvider:ScriptableObject,ISearchWindowProvider{ private Type _graphType; private GraphView _graphView; diff --git a/TNodeGtfImpl/Editor/BaseView.cs b/TNodeGtfImpl/Editor/BaseView.cs index 4de5425..4d8cd50 100644 --- a/TNodeGtfImpl/Editor/BaseView.cs +++ b/TNodeGtfImpl/Editor/BaseView.cs @@ -1,5 +1,5 @@ #define UNITY_2020_1_OR_NEWER -namespace TNode.TNodeGtfImpl.Editor{ +namespace TNodeGtfImpl.Editor{ public class BaseView{ } diff --git a/Scenes.meta b/TNodeGtfImpl/GTFReference.asmref.meta similarity index 56% rename from Scenes.meta rename to TNodeGtfImpl/GTFReference.asmref.meta index 7fe8e10..9154f95 100644 --- a/Scenes.meta +++ b/TNodeGtfImpl/GTFReference.asmref.meta @@ -1,7 +1,6 @@ fileFormatVersion: 2 -guid: 131a6b21c8605f84396be9f6751fb6e3 -folderAsset: yes -DefaultImporter: +guid: de9b4da88084be341822a6bfc1636129 +AssemblyDefinitionReferenceImporter: externalObjects: {} userData: assetBundleName: