refactor: move around namespace

main
taoria 3 years ago
parent ebcde5e5d9
commit 99da3593be
  1. 2
      TNode/TNodeCore/Editor/Blackboard/IBlackboardView.cs
  2. 2
      TNode/TNodeCore/Editor/EditorPersistence/GraphEditorData.cs
  3. 5
      TNode/TNodeCore/Editor/GraphEditor.cs
  4. 2
      TNode/TNodeCore/Editor/Inspector/INodeDataBindingBase.cs
  5. 4
      TNode/TNodeCore/Editor/NodeGraphView/IBaseDataGraphView.cs
  6. 3
      TNode/TNodeCore/Editor/NodeGraphView/IDataGraphView.cs
  7. 3
      TNode/TNodeCore/Editor/Serialization/BlackboardDataWrapper.cs
  8. 3
      TNode/TNodeCore/Editor/Serialization/NodeDataWrapper.cs
  9. 2
      TNode/TNodeCore/Editor/Tools/NodeCreator/NodeCreator.cs
  10. 2
      TNode/TNodeCore/Runtime/Attributes/DisableOnInspector.cs
  11. 5
      TNode/TNodeCore/Runtime/Attributes/GraphUsageAttribute.cs
  12. 2
      TNode/TNodeCore/Runtime/Attributes/InternalUsageAttribute.cs
  13. 4
      TNode/TNodeCore/Runtime/Attributes/NodeAttribute.cs
  14. 2
      TNode/TNodeCore/Runtime/Attributes/PortTypeConversion.cs
  15. 2
      TNode/TNodeCore/Runtime/Attributes/Ports/BatchInputAttribute.cs
  16. 2
      TNode/TNodeCore/Runtime/Attributes/Ports/BatchOutputAttribute.cs
  17. 2
      TNode/TNodeCore/Runtime/Attributes/Ports/InputAttribute.cs
  18. 2
      TNode/TNodeCore/Runtime/Attributes/Ports/OutputAttribute.cs
  19. 2
      TNode/TNodeCore/Runtime/Attributes/Ports/PortAttribute.cs
  20. 5
      TNode/TNodeCore/Runtime/Attributes/RuntimeNodeAttribute.cs
  21. 2
      TNode/TNodeCore/Runtime/Attributes/ShowInNodeViewAttribute.cs
  22. 2
      TNode/TNodeCore/Runtime/Attributes/ViewComponentAttribute.cs
  23. 2
      TNode/TNodeCore/Runtime/Components/RuntimeDataSaver.cs
  24. 7
      TNode/TNodeCore/Runtime/Components/RuntimeGraph.cs
  25. 3
      TNode/TNodeCore/Runtime/DataWrapper.cs
  26. 2
      TNode/TNodeCore/Runtime/Models/BlackboardData.cs
  27. 9
      TNode/TNodeCore/Runtime/Models/BlackboardDragNodeData.cs
  28. 2
      TNode/TNodeCore/Runtime/Models/GraphData.cs
  29. 4
      TNode/TNodeCore/Runtime/Models/IModel.cs
  30. 4
      TNode/TNodeCore/Runtime/Models/NodeData.cs
  31. 2
      TNode/TNodeCore/Runtime/Models/NodeLink.cs
  32. 3
      TNode/TNodeCore/Runtime/Models/PortInfo.cs
  33. 2
      TNode/TNodeCore/Runtime/Models/SceneObjectWrapper.cs
  34. 2
      TNode/TNodeCore/Runtime/RuntimeCache/IModelPropertyAccessor.cs
  35. 7
      TNode/TNodeCore/Runtime/RuntimeCache/RuntimeCache.cs
  36. 5
      TNode/TNodeCore/Runtime/RuntimeNode.cs
  37. 2
      TNode/TNodeCore/Runtime/Runtimeblackboard.cs
  38. 5
      TNode/TNodeGraphViewImpl/Editor/Cache/NodeEditorExtensions.cs
  39. 4
      TNode/TNodeGraphViewImpl/Editor/GraphBlackboard/DefaultGraphBlackboardView.cs
  40. 2
      TNode/TNodeGraphViewImpl/Editor/GraphBlackboard/GraphBlackboardView.cs
  41. 2
      TNode/TNodeGraphViewImpl/Editor/Inspector/NodeInspector.cs
  42. 4
      TNode/TNodeGraphViewImpl/Editor/Inspector/NodeInspectorInNode.cs
  43. 9
      TNode/TNodeGraphViewImpl/Editor/NodeGraphView/DataGraphView.cs
  44. 2
      TNode/TNodeGraphViewImpl/Editor/NodeViews/DefaultNodeView.cs
  45. 6
      TNode/TNodeGraphViewImpl/Editor/NodeViews/DragNodeView.cs
  46. 5
      TNode/TNodeGraphViewImpl/Editor/NodeViews/NodeView.cs
  47. 2
      TNode/TNodeGraphViewImpl/Editor/Search/NodeSearchWindowProvider.cs

@ -1,5 +1,5 @@
using TNodeCore.Editor.NodeGraphView;
using TNodeCore.Models;
using TNodeCore.Runtime.Models;
using UnityEditor;
namespace TNodeCore.Editor.Blackboard{

@ -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{

@ -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;

@ -1,4 +1,4 @@
using TNodeCore.Models;
using TNodeCore.Runtime.Models;
namespace TNodeCore.Editor.Inspector{
public interface INodeDataBindingBase{

@ -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{

@ -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<T> : IBaseDataGraphView where T:GraphData{

@ -1,4 +1,5 @@
using TNodeCore.Models;
using TNodeCore.Runtime;
using TNodeCore.Runtime.Models;
namespace TNodeCore.Editor.Serialization{
public class BlackboardDataWrapper:DataWrapper<BlackboardDataWrapper,BlackboardData>{

@ -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{

@ -1,5 +1,5 @@
using System;
using TNodeCore.Models;
using TNodeCore.Runtime.Models;
namespace TNodeCore.Editor.Tools.NodeCreator{
public static class NodeCreator{

@ -1,6 +1,6 @@
using System;
namespace TNodeCore.Attribute{
namespace TNodeCore.Runtime.Attributes{
/// <summary>
/// Use this attribute to mark a field as disabled.An disable field will not be edit by the inspector.
/// </summary>

@ -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{
/// <summary>
/// Use this attribute to claim the usage of a type derived IModel IModel
/// it can be applied to the same node multiple times.

@ -1,4 +1,4 @@
namespace TNodeCore.Attribute{
namespace TNodeCore.Runtime.Attributes{
/// <summary>
/// Internal use only. so that Editor Cache and Runtime cache could register it globally.
/// </summary>

@ -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))]

@ -1,3 +1,3 @@
namespace TNode.TNodeCore.Runtime.Attributes{
namespace TNodeCore.Runtime.Attributes{
}

@ -1,4 +1,4 @@
namespace TNode.TNodeCore.Runtime.Attributes.Ports{
namespace TNodeCore.Runtime.Attributes.Ports{
public class BatchInputAttribute{
}

@ -1,6 +1,6 @@
using System;
namespace TNodeCore.Attribute.Ports{
namespace TNodeCore.Runtime.Attributes.Ports{
/// <summary>
/// Batch out port attribute could specify a batch out port,allowing large scale calculation.
/// </summary>

@ -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{

@ -1,4 +1,4 @@
namespace TNodeCore.Attribute.Ports{
namespace TNodeCore.Runtime.Attributes.Ports{
public class OutputAttribute:PortAttribute{

@ -1,7 +1,7 @@
using System;
using JetBrains.Annotations;
namespace TNodeCore.Attribute.Ports{
namespace TNodeCore.Runtime.Attributes.Ports{
public enum PortNameHandling{
Auto,

@ -1,6 +1,3 @@
using JetBrains.Annotations;
using TNodeCore.Models;
namespace TNodeCore.Attribute{
namespace TNodeCore.Runtime.Attributes{
}

@ -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{

@ -1,7 +1,7 @@
using System;
using JetBrains.Annotations;
namespace TNodeCore.Attribute{
namespace TNodeCore.Runtime.Attributes{
//Check if the ide is Rider

@ -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";

@ -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{
/// <summary>
/// Graph data reference to be used in runtime
@ -42,6 +41,7 @@ namespace TNodeCore.Components{
/// <summary>
/// Entry nodes of the graph. These are the nodes that has no input.
/// </summary>
[NonSerialized]
public readonly List<RuntimeNode> EntryNodes = new List<RuntimeNode>();
/// <summary>
/// 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);

@ -1,9 +1,8 @@
using System;
using System.Collections.Generic;
using UnityEditor;
using UnityEngine;
namespace TNodeCore{
namespace TNodeCore.Runtime{
[Serializable]
public class DataWrapper<TWrapper,TData>:ScriptableObject where TWrapper:DataWrapper<TWrapper,TData>,new(){
[SerializeReference]

@ -1,6 +1,6 @@
using System;
namespace TNodeCore.Models{
namespace TNodeCore.Runtime.Models{
/// <summary>
/// Black board data can store scene data
/// </summary>

@ -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{

@ -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<string,NodeData> NodeDictionary = new Dictionary<string,NodeData>();

@ -1,6 +1,4 @@
using System;
namespace TNodeCore.Models{
namespace TNodeCore.Runtime.Models{
public interface IModel{
}

@ -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{
/// <summary>
/// this class is used to store the data of a node
/// inherit it to implement your own node

@ -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{

@ -1,7 +1,6 @@
using System;
using UnityEngine.Serialization;
namespace TNodeCore.Models{
namespace TNodeCore.Runtime.Models{
[Serializable]
public class PortInfo{
public string portEntryName;

@ -4,7 +4,7 @@ using UnityEngine;
using UnityEngine.SceneManagement;
using Object = UnityEngine.Object;
namespace TNodeCore.Models{
namespace TNodeCore.Runtime.Models{
/// <summary>
/// Scene Object wrapper use to serialize blackboard data

@ -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);

@ -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<T1, T2>:IModelPropertyAccessor{
public readonly Func<T1, T2> Get;
public readonly Action<T1, T2> Set;

@ -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{

@ -1,4 +1,4 @@
using TNodeCore.Models;
using TNodeCore.Runtime.Models;
namespace TNodeCore.Runtime{
public class RuntimeBlackboard<T> where T:BlackboardData{

@ -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

@ -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;

@ -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;

@ -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;

@ -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;

@ -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<Port>(edge.inPort.portEntryName),
output = outputNodeView.outputContainer.Q<Port>(edge.outPort.portEntryName)
};
newEdge.input?.Connect(newEdge);
newEdge.output?.Connect(newEdge);
AddElement(newEdge);

@ -1,5 +1,5 @@
using TNode.Editor.NodeViews;
using TNodeCore.Models;
using TNodeCore.Runtime.Models;
using TNodeGraphViewImpl.Editor.NodeViews;
namespace TNode.Editor{

@ -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;

@ -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;

@ -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;

Loading…
Cancel
Save