Merge pull request #1 from taoria/master

1.Update view
main
taoria 3 years ago committed by GitHub
commit cab74d36f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      TNode/Attribute/NodeComponentAttribute.cs
  2. 3
      TNode/BaseModels.meta
  3. 5
      TNode/BaseModels/IEditorOnlyModel.cs
  4. 3
      TNode/BaseModels/IEditorOnlyModel.cs.meta
  5. 5
      TNode/BaseModels/Model.cs
  6. 0
      TNode/Editor/BaseViews.meta
  7. 13
      TNode/Editor/BaseViews/DataGraphView.cs
  8. 0
      TNode/Editor/BaseViews/DataGraphView.cs.meta
  9. 22
      TNode/Editor/BaseViews/NodeInspector.cs
  10. 3
      TNode/Editor/BaseViews/NodeInspector.cs.meta
  11. 1
      TNode/Editor/BaseViews/NodeView.cs
  12. 0
      TNode/Editor/BaseViews/NodeView.cs.meta
  13. 2
      TNode/Editor/BaseViews/SimpleGraphSubWindow.cs
  14. 0
      TNode/Editor/BaseViews/SimpleGraphSubWindow.cs.meta
  15. 0
      TNode/Editor/Cache.meta
  16. 3
      TNode/Editor/Cache/NodeEditorExtensions.cs
  17. 0
      TNode/Editor/Cache/NodeEditorExtensions.cs.meta
  18. 3
      TNode/Editor/GraphEditor.cs
  19. 3
      TNode/Editor/Model.meta
  20. 13
      TNode/Editor/Model/NodeEditorData.cs
  21. 3
      TNode/Editor/Model/NodeEditorData.cs.meta
  22. 3
      TNode/Models.meta
  23. 2
      TNode/Models/GraphData.cs
  24. 0
      TNode/Models/GraphData.cs.meta
  25. 5
      TNode/Models/NodeData.cs
  26. 0
      TNode/Models/NodeData.cs.meta
  27. 3
      TNode/Models/NodeLink.cs
  28. 0
      TNode/Models/NodeLink.cs.meta
  29. 3
      TNode/Resources.meta
  30. 2
      TNode/TNodeSample/GraphViewTest.cs
  31. 1
      TNode/TNodeSample/NodeDataTest.cs

@ -1,7 +1,7 @@
using System;
using System.Diagnostics.CodeAnalysis;
using JetBrains.Annotations;
using TNode.BaseViews;
namespace TNode.Attribute{

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 54cbaedb5bd248f68813368e888d8854
timeCreated: 1655969230

@ -0,0 +1,5 @@
namespace TNode.BaseModels{
public interface IEditorOnlyModel{
}
}

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 051a8933e6bf4b4ebdff2df9be042774
timeCreated: 1655969265

@ -0,0 +1,5 @@
namespace TNode.BaseModels{
public interface IModel{
}
}

@ -1,5 +1,5 @@

using TNode.Tools;
using TNode.Cache;
using TNode.Models;
using UnityEditor.Experimental.GraphView;
using UnityEngine;
using UnityEngine.UIElements;
@ -46,14 +46,15 @@ namespace TNode.BaseViews{
}
//A Constructor for the DataGraphView ,never to override it
public DataGraphView(){
styleSheets.Add(Resources.Load<StyleSheet>("GraphViewBackground"));
var grid = new GridBackground();
Insert(0,grid);
grid.StretchToParentSize();
this.AddManipulator(new ContentDragger());
this.AddManipulator(new SelectionDragger());
this.AddManipulator(new RectangleSelector());
SetupZoom(ContentZoomer.DefaultMinScale, ContentZoomer.DefaultMaxScale);
//Default Color
style.backgroundColor = new Color(0.1f, 0.1f, 0.1f, 1);
// ReSharper disable once VirtualMemberCallInConstructor
OnInit();
}
//OnDataChanged event

@ -0,0 +1,22 @@
using TNode.Models;
using UnityEditor.Experimental.GraphView;
namespace TNode.BaseViews{
public class NodeInspector<T>:SimpleGraphSubWindow{
private NodeData _data;
public NodeData Data{
get => _data;
set{
_data = value;
UpdateData();
}
}
private void UpdateData(){
if (_data != null){
}
}
}
}

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: e0febc13b11349779178ce0ac30c1773
timeCreated: 1655965285

@ -1,4 +1,5 @@
using Dialogue;
using TNode.Models;
using UnityEditor.Experimental.GraphView;
namespace TNode.BaseViews{

@ -25,11 +25,9 @@ namespace TNode.BaseViews{
BuildWindow(uxml);
}
}
public SimpleGraphSubWindow(VisualTreeAsset visualTreeAsset){
ConstructWindowBasicSetting();
BuildWindow(visualTreeAsset);
}
}
}

@ -2,10 +2,9 @@
using System.Collections.Generic;
using TNode.Attribute;
using TNode.BaseViews;
using UnityEditor.Experimental.GraphView;
using UnityEngine;
namespace TNode.Tools{
namespace TNode.Cache{
internal class NodeEditorSingleton{
private static NodeEditorSingleton _instance;
public readonly Dictionary<Type,Type> FromGenericToSpecific = new Dictionary<Type, Type>();

@ -1,6 +1,7 @@
using Codice.CM.Common;
using TNode.BaseViews;
using TNode.Tools;
using TNode.Cache;
using TNode.Models;
using UnityEditor;
using UnityEngine;
using UnityEngine.Serialization;

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: e3bc969c46434a308e20796dede95f3b
timeCreated: 1655969991

@ -0,0 +1,13 @@
using System;
using UnityEngine;
using UnityEngine.Serialization;
namespace TNode.Models{
[Serializable]
public class NodeEditorData<T> where T:NodeData{
[SerializeReference]
private T nodeData;
public Rect nodePos;
}
}

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: cde084f079a7426daa86ed86cb80ed1b
timeCreated: 1655969362

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 90ee74ab34fd41c68901e004060bd6c9
timeCreated: 1655969326

@ -3,7 +3,7 @@ using System.Collections.Generic;
using Dialogue;
using UnityEngine;
namespace TNode{
namespace TNode.Models{
[Serializable]
public class GraphData:ScriptableObject{

@ -1,9 +1,10 @@
using System;
using TNode.BaseModels;
using UnityEngine;
namespace TNode{
namespace TNode.Models{
[Serializable]
public class NodeData{
public class NodeData:IModel{
public NodeData() : base(){
//Object Registration

@ -1,6 +1,7 @@
using System;
using Dialogue;
namespace Dialogue{
namespace TNode.Models{
//Node links are stored in output side of the two node port.
[Serializable]
public class NodeLink{

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: df0b7f32b46d4c8882228c4310c2eb67
timeCreated: 1655962243

@ -1,6 +1,6 @@
using Dialogue;
using TNode.Attribute;
using TNode.BaseViews;
namespace TNode.TNodeSample{

@ -1,5 +1,6 @@
using Dialogue;
using TNode.Attribute;
using TNode.Models;
namespace TNode.TNodeSample{
public class NodeDataTest:NodeData{

Loading…
Cancel
Save