diff --git a/TNode/TNodeCore/Editor/Blackboard/IBlackboardView.cs b/TNode/TNodeCore/Editor/Blackboard/IBlackboardView.cs index e40f9d5..8b57506 100644 --- a/TNode/TNodeCore/Editor/Blackboard/IBlackboardView.cs +++ b/TNode/TNodeCore/Editor/Blackboard/IBlackboardView.cs @@ -1,5 +1,5 @@ using TNodeCore.Editor.NodeGraphView; -using TNodeCore.Models; +using TNodeCore.Runtime.Models; using UnityEditor; namespace TNodeCore.Editor.Blackboard{ diff --git a/TNode/TNodeCore/Editor/EditorPersistence/GraphEditorData.cs b/TNode/TNodeCore/Editor/EditorPersistence/GraphEditorData.cs index 646edcd..b5b2eb7 100644 --- a/TNode/TNodeCore/Editor/EditorPersistence/GraphEditorData.cs +++ b/TNode/TNodeCore/Editor/EditorPersistence/GraphEditorData.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using TNodeCore.Editor.NodeGraphView; -using TNodeCore.Models; +using TNodeCore.Runtime.Models; using UnityEngine; namespace TNodeCore.Editor.EditorPersistence{ diff --git a/TNode/TNodeCore/Editor/GraphEditor.cs b/TNode/TNodeCore/Editor/GraphEditor.cs index 0beb43a..625d8d9 100644 --- a/TNode/TNodeCore/Editor/GraphEditor.cs +++ b/TNode/TNodeCore/Editor/GraphEditor.cs @@ -1,13 +1,12 @@ -using TNodeCore.Editor; using TNodeCore.Editor.EditorPersistence; using TNodeCore.Editor.NodeGraphView; -using TNodeCore.Models; +using TNodeCore.Runtime.Models; using UnityEditor; using UnityEngine; using UnityEngine.Serialization; using UnityEngine.UIElements; -namespace TNodeEditor.Editor{ +namespace TNodeCore.Editor{ // public class SelectGraphWindow : EditorWindow{ // public EditorWindow parent; diff --git a/TNode/TNodeCore/Editor/Inspector/INodeDataBindingBase.cs b/TNode/TNodeCore/Editor/Inspector/INodeDataBindingBase.cs index b84492c..28f6c40 100644 --- a/TNode/TNodeCore/Editor/Inspector/INodeDataBindingBase.cs +++ b/TNode/TNodeCore/Editor/Inspector/INodeDataBindingBase.cs @@ -1,4 +1,4 @@ -using TNodeCore.Models; +using TNodeCore.Runtime.Models; namespace TNodeCore.Editor.Inspector{ public interface INodeDataBindingBase{ diff --git a/TNode/TNodeCore/Editor/NodeGraphView/IBaseDataGraphView.cs b/TNode/TNodeCore/Editor/NodeGraphView/IBaseDataGraphView.cs index 0208be5..ef4854e 100644 --- a/TNode/TNodeCore/Editor/NodeGraphView/IBaseDataGraphView.cs +++ b/TNode/TNodeCore/Editor/NodeGraphView/IBaseDataGraphView.cs @@ -1,7 +1,7 @@ using System; -using TNodeCore.Components; -using TNodeCore.Models; using TNodeCore.Runtime; +using TNodeCore.Runtime.Components; +using TNodeCore.Runtime.Models; using UnityEngine; namespace TNodeCore.Editor.NodeGraphView{ diff --git a/TNode/TNodeCore/Editor/NodeGraphView/IDataGraphView.cs b/TNode/TNodeCore/Editor/NodeGraphView/IDataGraphView.cs index 16ab0fc..fa3ee39 100644 --- a/TNode/TNodeCore/Editor/NodeGraphView/IDataGraphView.cs +++ b/TNode/TNodeCore/Editor/NodeGraphView/IDataGraphView.cs @@ -1,6 +1,5 @@ using TNodeCore.Editor.EditorPersistence; -using TNodeCore.Models; -using TNodeEditor.Editor; +using TNodeCore.Runtime.Models; namespace TNodeCore.Editor.NodeGraphView{ public interface IDataGraphView : IBaseDataGraphView where T:GraphData{ diff --git a/TNode/TNodeCore/Editor/Serialization/BlackboardDataWrapper.cs b/TNode/TNodeCore/Editor/Serialization/BlackboardDataWrapper.cs index d64b76d..31602ca 100644 --- a/TNode/TNodeCore/Editor/Serialization/BlackboardDataWrapper.cs +++ b/TNode/TNodeCore/Editor/Serialization/BlackboardDataWrapper.cs @@ -1,4 +1,5 @@ -using TNodeCore.Models; +using TNodeCore.Runtime; +using TNodeCore.Runtime.Models; namespace TNodeCore.Editor.Serialization{ public class BlackboardDataWrapper:DataWrapper{ diff --git a/TNode/TNodeCore/Editor/Serialization/NodeDataWrapper.cs b/TNode/TNodeCore/Editor/Serialization/NodeDataWrapper.cs index 5d1846e..da587d2 100644 --- a/TNode/TNodeCore/Editor/Serialization/NodeDataWrapper.cs +++ b/TNode/TNodeCore/Editor/Serialization/NodeDataWrapper.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; -using TNodeCore.Models; +using TNodeCore.Runtime; +using TNodeCore.Runtime.Models; using UnityEngine; namespace TNodeCore.Editor.Serialization{ diff --git a/TNode/TNodeCore/Editor/Tools/NodeCreator/NodeCreator.cs b/TNode/TNodeCore/Editor/Tools/NodeCreator/NodeCreator.cs index 3ed372b..059b797 100644 --- a/TNode/TNodeCore/Editor/Tools/NodeCreator/NodeCreator.cs +++ b/TNode/TNodeCore/Editor/Tools/NodeCreator/NodeCreator.cs @@ -1,5 +1,5 @@ using System; -using TNodeCore.Models; +using TNodeCore.Runtime.Models; namespace TNodeCore.Editor.Tools.NodeCreator{ public static class NodeCreator{ diff --git a/TNode/TNodeCore/Runtime/Attributes/DisableOnInspector.cs b/TNode/TNodeCore/Runtime/Attributes/DisableOnInspector.cs index 158ccba..807ac04 100644 --- a/TNode/TNodeCore/Runtime/Attributes/DisableOnInspector.cs +++ b/TNode/TNodeCore/Runtime/Attributes/DisableOnInspector.cs @@ -1,6 +1,6 @@ using System; -namespace TNodeCore.Attribute{ +namespace TNodeCore.Runtime.Attributes{ /// /// Use this attribute to mark a field as disabled.An disable field will not be edit by the inspector. /// diff --git a/TNode/TNodeCore/Runtime/Attributes/GraphUsageAttribute.cs b/TNode/TNodeCore/Runtime/Attributes/GraphUsageAttribute.cs index 62ed03f..c58a82b 100644 --- a/TNode/TNodeCore/Runtime/Attributes/GraphUsageAttribute.cs +++ b/TNode/TNodeCore/Runtime/Attributes/GraphUsageAttribute.cs @@ -1,9 +1,8 @@ using System; using JetBrains.Annotations; -using TNodeCore.Models; -using TNodeCore.Runtime.Interfaces; +using TNodeCore.Runtime.Models; -namespace TNodeCore.Attribute{ +namespace TNodeCore.Runtime.Attributes{ /// /// Use this attribute to claim the usage of a type derived IModel IModel /// it can be applied to the same node multiple times. diff --git a/TNode/TNodeCore/Runtime/Attributes/InternalUsageAttribute.cs b/TNode/TNodeCore/Runtime/Attributes/InternalUsageAttribute.cs index d43dc33..6737f8e 100644 --- a/TNode/TNodeCore/Runtime/Attributes/InternalUsageAttribute.cs +++ b/TNode/TNodeCore/Runtime/Attributes/InternalUsageAttribute.cs @@ -1,4 +1,4 @@ -namespace TNodeCore.Attribute{ +namespace TNodeCore.Runtime.Attributes{ /// /// Internal use only. so that Editor Cache and Runtime cache could register it globally. /// diff --git a/TNode/TNodeCore/Runtime/Attributes/NodeAttribute.cs b/TNode/TNodeCore/Runtime/Attributes/NodeAttribute.cs index 447e36f..c06a921 100644 --- a/TNode/TNodeCore/Runtime/Attributes/NodeAttribute.cs +++ b/TNode/TNodeCore/Runtime/Attributes/NodeAttribute.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; -using TNodeCore.Models; +using TNodeCore.Runtime.Models; -namespace TNodeCore.Attribute{ +namespace TNodeCore.Runtime.Attributes{ [MeansImplicitUse] [BaseTypeRequired(typeof(NodeData))] diff --git a/TNode/TNodeCore/Runtime/Attributes/PortTypeConversion.cs b/TNode/TNodeCore/Runtime/Attributes/PortTypeConversion.cs index 13161cd..5ee1fe6 100644 --- a/TNode/TNodeCore/Runtime/Attributes/PortTypeConversion.cs +++ b/TNode/TNodeCore/Runtime/Attributes/PortTypeConversion.cs @@ -1,3 +1,3 @@ -namespace TNode.TNodeCore.Runtime.Attributes{ +namespace TNodeCore.Runtime.Attributes{ } \ No newline at end of file diff --git a/TNode/TNodeCore/Runtime/Attributes/Ports/BatchInputAttribute.cs b/TNode/TNodeCore/Runtime/Attributes/Ports/BatchInputAttribute.cs index 47f51fd..1f3af8b 100644 --- a/TNode/TNodeCore/Runtime/Attributes/Ports/BatchInputAttribute.cs +++ b/TNode/TNodeCore/Runtime/Attributes/Ports/BatchInputAttribute.cs @@ -1,4 +1,4 @@ -namespace TNode.TNodeCore.Runtime.Attributes.Ports{ +namespace TNodeCore.Runtime.Attributes.Ports{ public class BatchInputAttribute{ } diff --git a/TNode/TNodeCore/Runtime/Attributes/Ports/BatchOutputAttribute.cs b/TNode/TNodeCore/Runtime/Attributes/Ports/BatchOutputAttribute.cs index 5b21830..12aa03a 100644 --- a/TNode/TNodeCore/Runtime/Attributes/Ports/BatchOutputAttribute.cs +++ b/TNode/TNodeCore/Runtime/Attributes/Ports/BatchOutputAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace TNodeCore.Attribute.Ports{ +namespace TNodeCore.Runtime.Attributes.Ports{ /// /// Batch out port attribute could specify a batch out port,allowing large scale calculation. /// diff --git a/TNode/TNodeCore/Runtime/Attributes/Ports/InputAttribute.cs b/TNode/TNodeCore/Runtime/Attributes/Ports/InputAttribute.cs index 80a92a6..6b8ba37 100644 --- a/TNode/TNodeCore/Runtime/Attributes/Ports/InputAttribute.cs +++ b/TNode/TNodeCore/Runtime/Attributes/Ports/InputAttribute.cs @@ -1,7 +1,7 @@ using System; using JetBrains.Annotations; -namespace TNodeCore.Attribute.Ports{ +namespace TNodeCore.Runtime.Attributes.Ports{ [MeansImplicitUse] [AttributeUsage(AttributeTargets.Property, AllowMultiple = true)] public class InputAttribute : PortAttribute{ diff --git a/TNode/TNodeCore/Runtime/Attributes/Ports/OutputAttribute.cs b/TNode/TNodeCore/Runtime/Attributes/Ports/OutputAttribute.cs index 7fb3c8d..b11340d 100644 --- a/TNode/TNodeCore/Runtime/Attributes/Ports/OutputAttribute.cs +++ b/TNode/TNodeCore/Runtime/Attributes/Ports/OutputAttribute.cs @@ -1,4 +1,4 @@ -namespace TNodeCore.Attribute.Ports{ +namespace TNodeCore.Runtime.Attributes.Ports{ public class OutputAttribute:PortAttribute{ diff --git a/TNode/TNodeCore/Runtime/Attributes/Ports/PortAttribute.cs b/TNode/TNodeCore/Runtime/Attributes/Ports/PortAttribute.cs index d23eb6a..b27710e 100644 --- a/TNode/TNodeCore/Runtime/Attributes/Ports/PortAttribute.cs +++ b/TNode/TNodeCore/Runtime/Attributes/Ports/PortAttribute.cs @@ -1,7 +1,7 @@ using System; using JetBrains.Annotations; -namespace TNodeCore.Attribute.Ports{ +namespace TNodeCore.Runtime.Attributes.Ports{ public enum PortNameHandling{ Auto, diff --git a/TNode/TNodeCore/Runtime/Attributes/RuntimeNodeAttribute.cs b/TNode/TNodeCore/Runtime/Attributes/RuntimeNodeAttribute.cs index 6d2ad80..8b0b752 100644 --- a/TNode/TNodeCore/Runtime/Attributes/RuntimeNodeAttribute.cs +++ b/TNode/TNodeCore/Runtime/Attributes/RuntimeNodeAttribute.cs @@ -1,6 +1,3 @@ -using JetBrains.Annotations; -using TNodeCore.Models; - -namespace TNodeCore.Attribute{ +namespace TNodeCore.Runtime.Attributes{ } \ No newline at end of file diff --git a/TNode/TNodeCore/Runtime/Attributes/ShowInNodeViewAttribute.cs b/TNode/TNodeCore/Runtime/Attributes/ShowInNodeViewAttribute.cs index 87f5ab6..405c6e8 100644 --- a/TNode/TNodeCore/Runtime/Attributes/ShowInNodeViewAttribute.cs +++ b/TNode/TNodeCore/Runtime/Attributes/ShowInNodeViewAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace TNodeCore.Attribute{ +namespace TNodeCore.Runtime.Attributes{ [AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = false)] public class ShowInNodeViewAttribute:System.Attribute{ diff --git a/TNode/TNodeCore/Runtime/Attributes/ViewComponentAttribute.cs b/TNode/TNodeCore/Runtime/Attributes/ViewComponentAttribute.cs index fd525f0..ac9db2c 100644 --- a/TNode/TNodeCore/Runtime/Attributes/ViewComponentAttribute.cs +++ b/TNode/TNodeCore/Runtime/Attributes/ViewComponentAttribute.cs @@ -1,7 +1,7 @@ using System; using JetBrains.Annotations; -namespace TNodeCore.Attribute{ +namespace TNodeCore.Runtime.Attributes{ //Check if the ide is Rider diff --git a/TNode/TNodeCore/Runtime/Components/RuntimeDataSaver.cs b/TNode/TNodeCore/Runtime/Components/RuntimeDataSaver.cs index 399907b..36705c6 100644 --- a/TNode/TNodeCore/Runtime/Components/RuntimeDataSaver.cs +++ b/TNode/TNodeCore/Runtime/Components/RuntimeDataSaver.cs @@ -2,7 +2,7 @@ using System.IO; using UnityEngine; -namespace TNodeCore.Components{ +namespace TNodeCore.Runtime.Components{ public class RuntimeDataSaver:MonoBehaviour{ public string saveName; public string saveExtension = "tng"; diff --git a/TNode/TNodeCore/Runtime/Components/RuntimeGraph.cs b/TNode/TNodeCore/Runtime/Components/RuntimeGraph.cs index 2727aef..0682e88 100644 --- a/TNode/TNodeCore/Runtime/Components/RuntimeGraph.cs +++ b/TNode/TNodeCore/Runtime/Components/RuntimeGraph.cs @@ -1,11 +1,10 @@ using System; using System.Collections.Generic; using System.Linq; -using TNodeCore.Models; -using TNodeCore.Runtime; +using TNodeCore.Runtime.Models; using UnityEngine; -namespace TNodeCore.Components{ +namespace TNodeCore.Runtime.Components{ public class RuntimeGraph:MonoBehaviour{ /// /// Graph data reference to be used in runtime @@ -42,6 +41,7 @@ namespace TNodeCore.Components{ /// /// Entry nodes of the graph. These are the nodes that has no input. /// + [NonSerialized] public readonly List EntryNodes = new List(); /// /// Cached data for Dependency traversal. @@ -196,7 +196,6 @@ namespace TNodeCore.Components{ ModifyOrCreateInNode(linkData); ModifyOrCreateOutNode(linkData); } - Debug.Log("hi"); var nodeList = RuntimeNodes.Values; _graphTool = new GraphTool(nodeList.ToList(),RuntimeNodes,this); var sceneNodes = RuntimeNodes.Values.Where(x => x.NodeData is SceneNodeData).Select(x => x.NodeData as SceneNodeData); diff --git a/TNode/TNodeCore/Runtime/DataWrapper.cs b/TNode/TNodeCore/Runtime/DataWrapper.cs index 30d1410..bcdadc3 100644 --- a/TNode/TNodeCore/Runtime/DataWrapper.cs +++ b/TNode/TNodeCore/Runtime/DataWrapper.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; -using UnityEditor; using UnityEngine; -namespace TNodeCore{ +namespace TNodeCore.Runtime{ [Serializable] public class DataWrapper:ScriptableObject where TWrapper:DataWrapper,new(){ [SerializeReference] diff --git a/TNode/TNodeCore/Runtime/Models/BlackboardData.cs b/TNode/TNodeCore/Runtime/Models/BlackboardData.cs index 1da25ce..fec0ccb 100644 --- a/TNode/TNodeCore/Runtime/Models/BlackboardData.cs +++ b/TNode/TNodeCore/Runtime/Models/BlackboardData.cs @@ -1,6 +1,6 @@ using System; -namespace TNodeCore.Models{ +namespace TNodeCore.Runtime.Models{ /// /// Black board data can store scene data /// diff --git a/TNode/TNodeCore/Runtime/Models/BlackboardDragNodeData.cs b/TNode/TNodeCore/Runtime/Models/BlackboardDragNodeData.cs index 335164c..5b7ed72 100644 --- a/TNode/TNodeCore/Runtime/Models/BlackboardDragNodeData.cs +++ b/TNode/TNodeCore/Runtime/Models/BlackboardDragNodeData.cs @@ -1,10 +1,9 @@ using System; -using TNodeCore.Attribute; -using TNodeCore.Attribute.Ports; -using TNodeCore.RuntimeCache; -using UnityEngine; +using TNodeCore.Runtime.Attributes; +using TNodeCore.Runtime.Attributes.Ports; +using TNodeCore.Runtime.RuntimeCache; -namespace TNodeCore.Models{ +namespace TNodeCore.Runtime.Models{ [Serializable] [InternalUsage] public class BlackboardDragNodeData:SceneNodeData{ diff --git a/TNode/TNodeCore/Runtime/Models/GraphData.cs b/TNode/TNodeCore/Runtime/Models/GraphData.cs index cb400a4..3e2b596 100644 --- a/TNode/TNodeCore/Runtime/Models/GraphData.cs +++ b/TNode/TNodeCore/Runtime/Models/GraphData.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -namespace TNodeCore.Models{ +namespace TNodeCore.Runtime.Models{ [Serializable] public class GraphData:ScriptableObject,ISerializationCallbackReceiver{ public Dictionary NodeDictionary = new Dictionary(); diff --git a/TNode/TNodeCore/Runtime/Models/IModel.cs b/TNode/TNodeCore/Runtime/Models/IModel.cs index b0a1e42..ed465dd 100644 --- a/TNode/TNodeCore/Runtime/Models/IModel.cs +++ b/TNode/TNodeCore/Runtime/Models/IModel.cs @@ -1,6 +1,4 @@ -using System; - -namespace TNodeCore.Models{ +namespace TNodeCore.Runtime.Models{ public interface IModel{ } diff --git a/TNode/TNodeCore/Runtime/Models/NodeData.cs b/TNode/TNodeCore/Runtime/Models/NodeData.cs index 08d9501..0a1000d 100644 --- a/TNode/TNodeCore/Runtime/Models/NodeData.cs +++ b/TNode/TNodeCore/Runtime/Models/NodeData.cs @@ -1,9 +1,9 @@ using System; using System.Collections; -using TNodeCore.Attribute; +using TNodeCore.Runtime.Attributes; using UnityEngine; -namespace TNodeCore.Models{ +namespace TNodeCore.Runtime.Models{ /// /// this class is used to store the data of a node /// inherit it to implement your own node diff --git a/TNode/TNodeCore/Runtime/Models/NodeLink.cs b/TNode/TNodeCore/Runtime/Models/NodeLink.cs index 1b929ac..b70f370 100644 --- a/TNode/TNodeCore/Runtime/Models/NodeLink.cs +++ b/TNode/TNodeCore/Runtime/Models/NodeLink.cs @@ -1,6 +1,6 @@ using System; -namespace TNodeCore.Models{ +namespace TNodeCore.Runtime.Models{ //NodeAttribute links are stored in output side of the two node port. [Serializable] public class NodeLink{ diff --git a/TNode/TNodeCore/Runtime/Models/PortInfo.cs b/TNode/TNodeCore/Runtime/Models/PortInfo.cs index 1eb1ed8..1a11771 100644 --- a/TNode/TNodeCore/Runtime/Models/PortInfo.cs +++ b/TNode/TNodeCore/Runtime/Models/PortInfo.cs @@ -1,7 +1,6 @@ using System; -using UnityEngine.Serialization; -namespace TNodeCore.Models{ +namespace TNodeCore.Runtime.Models{ [Serializable] public class PortInfo{ public string portEntryName; diff --git a/TNode/TNodeCore/Runtime/Models/SceneObjectWrapper.cs b/TNode/TNodeCore/Runtime/Models/SceneObjectWrapper.cs index b932bbe..6440de8 100644 --- a/TNode/TNodeCore/Runtime/Models/SceneObjectWrapper.cs +++ b/TNode/TNodeCore/Runtime/Models/SceneObjectWrapper.cs @@ -4,7 +4,7 @@ using UnityEngine; using UnityEngine.SceneManagement; using Object = UnityEngine.Object; -namespace TNodeCore.Models{ +namespace TNodeCore.Runtime.Models{ /// /// Scene Object wrapper use to serialize blackboard data diff --git a/TNode/TNodeCore/Runtime/RuntimeCache/IModelPropertyAccessor.cs b/TNode/TNodeCore/Runtime/RuntimeCache/IModelPropertyAccessor.cs index 081caac..c263ffe 100644 --- a/TNode/TNodeCore/Runtime/RuntimeCache/IModelPropertyAccessor.cs +++ b/TNode/TNodeCore/Runtime/RuntimeCache/IModelPropertyAccessor.cs @@ -1,6 +1,6 @@ using System; -namespace TNodeCore.RuntimeCache{ +namespace TNodeCore.Runtime.RuntimeCache{ public interface IModelPropertyAccessor{ object GetValue(object model); void SetValue(object model, object value); diff --git a/TNode/TNodeCore/Runtime/RuntimeCache/RuntimeCache.cs b/TNode/TNodeCore/Runtime/RuntimeCache/RuntimeCache.cs index 9a12f9c..046bdf3 100644 --- a/TNode/TNodeCore/Runtime/RuntimeCache/RuntimeCache.cs +++ b/TNode/TNodeCore/Runtime/RuntimeCache/RuntimeCache.cs @@ -2,12 +2,11 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using TNodeCore.Attribute; -using TNodeCore.Models; +using TNodeCore.Runtime.Attributes; using TNodeCore.Runtime.Interfaces; -using UnityEngine; +using TNodeCore.Runtime.Models; -namespace TNodeCore.RuntimeCache{ +namespace TNodeCore.Runtime.RuntimeCache{ public class PropAccessor:IModelPropertyAccessor{ public readonly Func Get; public readonly Action Set; diff --git a/TNode/TNodeCore/Runtime/RuntimeNode.cs b/TNode/TNodeCore/Runtime/RuntimeNode.cs index 4003369..172d0e8 100644 --- a/TNode/TNodeCore/Runtime/RuntimeNode.cs +++ b/TNode/TNodeCore/Runtime/RuntimeNode.cs @@ -3,9 +3,8 @@ using System.Collections; using System.Collections.Generic; using System.Reflection; using Codice.Client.Common.TreeGrouper; -using TNodeCore.Attribute.Ports; -using TNodeCore.Models; -using TNodeCore.RuntimeCache; +using TNodeCore.Runtime.Models; +using TNodeCore.Runtime.RuntimeCache; using UnityEngine; namespace TNodeCore.Runtime{ diff --git a/TNode/TNodeCore/Runtime/Runtimeblackboard.cs b/TNode/TNodeCore/Runtime/Runtimeblackboard.cs index b0e44e1..a1dd9e6 100644 --- a/TNode/TNodeCore/Runtime/Runtimeblackboard.cs +++ b/TNode/TNodeCore/Runtime/Runtimeblackboard.cs @@ -1,4 +1,4 @@ -using TNodeCore.Models; +using TNodeCore.Runtime.Models; namespace TNodeCore.Runtime{ public class RuntimeBlackboard where T:BlackboardData{ diff --git a/TNode/TNodeGraphViewImpl/Editor/Cache/NodeEditorExtensions.cs b/TNode/TNodeGraphViewImpl/Editor/Cache/NodeEditorExtensions.cs index f40a74a..e77f967 100644 --- a/TNode/TNodeGraphViewImpl/Editor/Cache/NodeEditorExtensions.cs +++ b/TNode/TNodeGraphViewImpl/Editor/Cache/NodeEditorExtensions.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using TNode.Editor; -using TNodeCore.Attribute; using TNodeCore.Editor.Blackboard; using TNodeCore.Editor.EditorPersistence; using TNodeCore.Editor.NodeGraphView; -using TNodeCore.Models; +using TNodeCore.Runtime.Attributes; +using TNodeCore.Runtime.Models; using TNodeGraphViewImpl.Editor.GraphBlackboard; using TNodeGraphViewImpl.Editor.NodeGraphView; using TNodeGraphViewImpl.Editor.NodeViews; @@ -144,7 +144,6 @@ namespace TNodeGraphViewImpl.Editor.Cache{ public void Initialize(){ //Do nothing indeed - Debug.Log("Hello"); } } //Outer wrapper for the singleton class diff --git a/TNode/TNodeGraphViewImpl/Editor/GraphBlackboard/DefaultGraphBlackboardView.cs b/TNode/TNodeGraphViewImpl/Editor/GraphBlackboard/DefaultGraphBlackboardView.cs index 5d83a5c..0cbfd1c 100644 --- a/TNode/TNodeGraphViewImpl/Editor/GraphBlackboard/DefaultGraphBlackboardView.cs +++ b/TNode/TNodeGraphViewImpl/Editor/GraphBlackboard/DefaultGraphBlackboardView.cs @@ -1,10 +1,10 @@ using System.Collections; using System.Reflection; using TNode.Editor.Search; -using TNodeCore.Attribute; using TNodeCore.Editor.NodeGraphView; using TNodeCore.Editor.Serialization; -using TNodeCore.Models; +using TNodeCore.Runtime.Attributes; +using TNodeCore.Runtime.Models; using UnityEditor; using UnityEditor.Experimental.GraphView; using UnityEditor.UIElements; diff --git a/TNode/TNodeGraphViewImpl/Editor/GraphBlackboard/GraphBlackboardView.cs b/TNode/TNodeGraphViewImpl/Editor/GraphBlackboard/GraphBlackboardView.cs index 7d95719..b9c8d95 100644 --- a/TNode/TNodeGraphViewImpl/Editor/GraphBlackboard/GraphBlackboardView.cs +++ b/TNode/TNodeGraphViewImpl/Editor/GraphBlackboard/GraphBlackboardView.cs @@ -1,7 +1,7 @@ using TNode.Editor.Search; using TNodeCore.Editor.Blackboard; using TNodeCore.Editor.NodeGraphView; -using TNodeCore.Models; +using TNodeCore.Runtime.Models; using UnityEditor; using UnityEditor.Experimental.GraphView; using UnityEngine; diff --git a/TNode/TNodeGraphViewImpl/Editor/Inspector/NodeInspector.cs b/TNode/TNodeGraphViewImpl/Editor/Inspector/NodeInspector.cs index 8d86869..3aca0e7 100644 --- a/TNode/TNodeGraphViewImpl/Editor/Inspector/NodeInspector.cs +++ b/TNode/TNodeGraphViewImpl/Editor/Inspector/NodeInspector.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Reflection; using TNode.Editor.NodeViews; -using TNodeCore.Models; +using TNodeCore.Runtime.Models; using TNodeGraphViewImpl.Editor.NodeGraphView; using TNodeGraphViewImpl.Editor.NodeViews; using Unity.VisualScripting; diff --git a/TNode/TNodeGraphViewImpl/Editor/Inspector/NodeInspectorInNode.cs b/TNode/TNodeGraphViewImpl/Editor/Inspector/NodeInspectorInNode.cs index 561a006..47462d1 100644 --- a/TNode/TNodeGraphViewImpl/Editor/Inspector/NodeInspectorInNode.cs +++ b/TNode/TNodeGraphViewImpl/Editor/Inspector/NodeInspectorInNode.cs @@ -1,8 +1,8 @@ using System.Reflection; -using TNodeCore.Attribute; using TNodeCore.Editor.NodeGraphView; using TNodeCore.Editor.Serialization; -using TNodeCore.Models; +using TNodeCore.Runtime.Attributes; +using TNodeCore.Runtime.Models; using TNodeGraphViewImpl.Editor.NodeViews; using UnityEditor; using UnityEditor.UIElements; diff --git a/TNode/TNodeGraphViewImpl/Editor/NodeGraphView/DataGraphView.cs b/TNode/TNodeGraphViewImpl/Editor/NodeGraphView/DataGraphView.cs index c16e838..3796fb7 100644 --- a/TNode/TNodeGraphViewImpl/Editor/NodeGraphView/DataGraphView.cs +++ b/TNode/TNodeGraphViewImpl/Editor/NodeGraphView/DataGraphView.cs @@ -4,15 +4,15 @@ using System.Linq; using System.Reflection; using System.Threading.Tasks; using TNode.Editor.Inspector; -using TNodeCore.Components; +using TNodeCore.Editor; using TNodeCore.Editor.Blackboard; using TNodeCore.Editor.EditorPersistence; using TNodeCore.Editor.NodeGraphView; using TNodeCore.Editor.Tools.NodeCreator; -using TNodeCore.Models; using TNodeCore.Runtime; -using TNodeCore.RuntimeCache; -using TNodeEditor.Editor; +using TNodeCore.Runtime.Components; +using TNodeCore.Runtime.Models; +using TNodeCore.Runtime.RuntimeCache; using TNodeGraphViewImpl.Editor.Cache; using TNodeGraphViewImpl.Editor.NodeViews; using TNodeGraphViewImpl.Editor.Search; @@ -304,7 +304,6 @@ namespace TNodeGraphViewImpl.Editor.NodeGraphView{ input = inputNodeView.inputContainer.Q(edge.inPort.portEntryName), output = outputNodeView.outputContainer.Q(edge.outPort.portEntryName) }; - newEdge.input?.Connect(newEdge); newEdge.output?.Connect(newEdge); AddElement(newEdge); diff --git a/TNode/TNodeGraphViewImpl/Editor/NodeViews/DefaultNodeView.cs b/TNode/TNodeGraphViewImpl/Editor/NodeViews/DefaultNodeView.cs index 4f837c0..40ad361 100644 --- a/TNode/TNodeGraphViewImpl/Editor/NodeViews/DefaultNodeView.cs +++ b/TNode/TNodeGraphViewImpl/Editor/NodeViews/DefaultNodeView.cs @@ -1,5 +1,5 @@ using TNode.Editor.NodeViews; -using TNodeCore.Models; +using TNodeCore.Runtime.Models; using TNodeGraphViewImpl.Editor.NodeViews; namespace TNode.Editor{ diff --git a/TNode/TNodeGraphViewImpl/Editor/NodeViews/DragNodeView.cs b/TNode/TNodeGraphViewImpl/Editor/NodeViews/DragNodeView.cs index 4ab71dc..6f329d9 100644 --- a/TNode/TNodeGraphViewImpl/Editor/NodeViews/DragNodeView.cs +++ b/TNode/TNodeGraphViewImpl/Editor/NodeViews/DragNodeView.cs @@ -1,6 +1,6 @@ -using TNodeCore.Attribute; -using TNodeCore.Editor.Serialization; -using TNodeCore.Models; +using TNodeCore.Editor.Serialization; +using TNodeCore.Runtime.Attributes; +using TNodeCore.Runtime.Models; using TNodeGraphViewImpl.Editor.NodeViews; using UnityEditor; using UnityEditor.Experimental.GraphView; diff --git a/TNode/TNodeGraphViewImpl/Editor/NodeViews/NodeView.cs b/TNode/TNodeGraphViewImpl/Editor/NodeViews/NodeView.cs index 7f07be9..0bfb934 100644 --- a/TNode/TNodeGraphViewImpl/Editor/NodeViews/NodeView.cs +++ b/TNode/TNodeGraphViewImpl/Editor/NodeViews/NodeView.cs @@ -3,10 +3,11 @@ using System.Linq; using System.Reflection; using TNode.Editor.Inspector; using TNodeCore; -using TNodeCore.Attribute.Ports; using TNodeCore.Editor.NodeGraphView; using TNodeCore.Editor.Serialization; -using TNodeCore.Models; +using TNodeCore.Runtime; +using TNodeCore.Runtime.Attributes.Ports; +using TNodeCore.Runtime.Models; using UnityEditor; using UnityEditor.Experimental.GraphView; using UnityEngine; diff --git a/TNode/TNodeGraphViewImpl/Editor/Search/NodeSearchWindowProvider.cs b/TNode/TNodeGraphViewImpl/Editor/Search/NodeSearchWindowProvider.cs index 28cf940..133df73 100644 --- a/TNode/TNodeGraphViewImpl/Editor/Search/NodeSearchWindowProvider.cs +++ b/TNode/TNodeGraphViewImpl/Editor/Search/NodeSearchWindowProvider.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using TNodeCore.Editor.NodeGraphView; using TNodeCore.Editor.Tools.NodeCreator; -using TNodeCore.Models; +using TNodeCore.Runtime.Models; using TNodeGraphViewImpl.Editor.Cache; using UnityEditor; using UnityEditor.Experimental.GraphView;