refactor:just another refactor

TNodeCore/Editor/Binding/IModelBinding.cs

@@ -1,4 +1,4 @@
-namespace TNode.TNodeCore.Editor.Binding{
+namespace TNodeCore.Editor.Binding{
     public interface IModelBinding<T>{
         public T Data{ get; }
         public void Bind(T data);

TNodeCore/Editor/Blackboard/IBlackboardView.cs

@@ -2,7 +2,7 @@
 using TNodeCore.Runtime.Models;
 using UnityEditor;
 
-namespace TNode.TNodeCore.Editor.Blackboard{
+namespace TNodeCore.Editor.Blackboard{
     /// <summary>
     /// View of the blackboard,different in each implementation,but the same in the interface.
     /// </summary>

TNodeCore/Editor/CommentView/CommentView.cs

@@ -1,12 +1,10 @@
-using System;
+using TNodeCore.Editor.Binding;
-using TNode.TNodeCore.Editor.Binding;
+using TNodeCore.Editor.Models;
-using TNode.TNodeCore.Editor.Models;
-using TNodeCore.Editor.NodeGraphView;
 using UnityEditor.Experimental.GraphView;
 using UnityEngine;
 using UnityEngine.UIElements;
 
-namespace TNode.TNodeCore.Editor.CommentView{
+namespace TNodeCore.Editor.CommentView{
     public class CommentView:GraphElement,IModelBinding<Comment>{
         public Comment Data => _data;
         private Comment _data;

TNodeCore/Editor/DeveloperHelper/CleanMissingTypeHelper.cs

@@ -3,7 +3,7 @@ using UnityEditor;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
-namespace TNode.TNodeCore.Editor.DeveloperHelper{
+namespace TNodeCore.Editor.DeveloperHelper{
     /// <summary>
     /// Helper options works on 2021.3 on newer unity versions only.call this in the early version may not work
     /// </summary>

TNodeCore/Editor/EditorPersistence/GraphEditorData.cs

@@ -1,12 +1,10 @@
 using System;
-using System.Collections.Generic;
-using TNodeCore.Editor.EditorPersistence;
 using TNodeCore.Editor.NodeGraphView;
 using TNodeCore.Runtime.Models;
 using UnityEngine;
 using UnityEngine.Serialization;
 
-namespace TNode.TNodeCore.Editor.EditorPersistence{
+namespace TNodeCore.Editor.EditorPersistence{
     /// <summary>
     /// Graph Editor Data hold the config of a type of graph.
     /// it's used by a graph editor to determine which implementation to use and some other config may be stored in here some days later.

TNodeCore/Editor/GraphData.cs

@@ -0,0 +1,5 @@
+namespace TNodeCore.Editor{
+   
+    
+
+}

TNodeCore/Editor/GraphData.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7532ed1b593c4a28bd499d79dfd12ca5
+timeCreated: 1660803680

TNodeCore/Editor/GraphEditor.cs

@@ -1,4 +1,3 @@
-using TNode.TNodeCore.Editor.EditorPersistence;
 using TNodeCore.Editor.EditorPersistence;
 using TNodeCore.Editor.NodeGraphView;
 using TNodeCore.Runtime.Models;

TNodeCore/Editor/Models/Comment.cs

@@ -1,7 +1,8 @@
-using TNodeCore.Runtime.Models;
+using TNode.TNodeCore.Editor.Models;
+using TNodeCore.Runtime.Models;
 using UnityEngine;
 
-namespace TNode.TNodeCore.Editor.Models{
+namespace TNodeCore.Editor.Models{
     public class Comment:EditorModel{
         [SerializeReference]
         public Model CommentedModel;

TNodeCore/Editor/Models/PlacematModel.cs

@@ -1,9 +1,10 @@
 using System;
 using System.Collections.Generic;
+using TNode.TNodeCore.Editor.Models;
 using TNodeCore.Runtime.Models;
 using UnityEngine;
 
-namespace TNode.TNodeCore.Editor.Models{
+namespace TNodeCore.Editor.Models{
     /// <summary>
     /// Placemats hold the nodes
     /// </summary>

TNodeCore/Editor/NodeGraphView/IDataGraphView.cs

@@ -1,5 +1,4 @@
-using TNode.TNodeCore.Editor.EditorPersistence;
+using TNodeCore.Editor.EditorPersistence;
-using TNodeCore.Editor.EditorPersistence;
 using TNodeCore.Runtime.Models;
 
 namespace TNodeCore.Editor.NodeGraphView{

TNodeCore/Editor/Serialization/BlackboardDataWrapper.cs

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

TNodeCore/Editor/Serialization/NodeDataWrapper.cs

@@ -1,7 +1,7 @@
 using TNodeCore.Runtime;
 using TNodeCore.Runtime.Models;
 
-namespace TNode.TNodeCore.Editor.Serialization{
+namespace TNodeCore.Editor.Serialization{
     public class NodeDataWrapper:DataWrapper<NodeDataWrapper,NodeData>{
       
     }

TNodeCore/Editor/Taoria.TNodeCore.Editor.asmdef

@@ -0,0 +1,16 @@
+{
+    "name": "Taoria.TNodeCore.Editor",
+    "rootNamespace": "",
+    "references": [
+        "GUID:940af72691767fa47be979e5dbcf6ba0"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

TNodeCore/Editor/Taoria.TNodeCore.Editor.asmdef.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 646fd469059c44c3b9215226d5e1e13c
+timeCreated: 1660803651

TNodeCore/Editor/Tools/GraphEditorCreator/GraphEditorCreator.cs

@@ -1,6 +1,5 @@
 using System.IO;
 using System.Text.RegularExpressions;
-using TNode.TNodeCore.Editor.EditorPersistence;
 using TNodeCore.Editor.EditorPersistence;
 using UnityEditor;
 using UnityEngine;

TNodeCore/Runtime/Attributes/Ports/PortAttribute.cs

@@ -37,7 +37,16 @@ namespace TNodeCore.Runtime.Attributes.Ports{
         public readonly string Name;
         public readonly PortNameHandling NameHandling;
         public Type HandledType;
+        /// <summary>
+        /// Allow multiple input or output to or from this node
+        /// </summary>
         public bool Multiple = true;
+        /// <summary>
+        /// Treat the according as Group Port,making each element inside the collection a port.
+        /// </summary>
+    
+        public bool Group = false;
+
         public string TypePath;
       
         public TypeHandling TypeHandling{ get; set; }

TNodeCore/Runtime/Models/GraphData.cs

@@ -43,8 +43,7 @@ namespace TNodeCore.Runtime.Models{
                 NodeDictionary.Add(node.id,node);
             }
         }
-        
+#if UNITY_EDITOR
-        #if UNITY_EDITOR
         [SerializeReference] 
         protected List<EditorModel> editorModels ;
         [FormerlySerializedAs("graphViewData")] [SerializeReference]
@@ -65,7 +64,8 @@ namespace TNodeCore.Runtime.Models{
             }
             set => graphViewModel = value;
         }
-        #endif
+#endif
+        
 
     }
 

TNodeCore/Runtime/Taoria.TNodeCore.Runtime.asmdef

@@ -0,0 +1,3 @@
+{
+	"name": "Taoria.TNodeCore.Runtime"
+}

TNodeCore/TNodeCore.asmdef

@@ -1,3 +0,0 @@
-{
-	"name": "TNodeCore"
-}

TNodeGraphViewImpl/Editor/Cache/NodeEditorExtensions.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using TNode.TNodeCore.Editor.Blackboard;
+using TNodeCore.Editor.Blackboard;
-using TNode.TNodeCore.Editor.EditorPersistence;
+using TNodeCore.Editor.EditorPersistence;
 using TNodeCore.Editor.NodeGraphView;
 using TNodeCore.Runtime.Attributes;
 using TNodeCore.Runtime.Models;

TNodeGraphViewImpl/Editor/GraphBlackboard/DefaultGraphBlackboardView.cs

@@ -2,8 +2,8 @@
 using System.Collections;
 using System.Linq;
 using System.Reflection;
-using TNode.TNodeCore.Editor.Serialization;
 using TNodeCore.Editor.NodeGraphView;
+using TNodeCore.Editor.Serialization;
 using TNodeCore.Runtime.Attributes;
 using TNodeCore.Runtime.Models;
 using TNodeGraphViewImpl.Editor.Search;

TNodeGraphViewImpl/Editor/GraphBlackboard/GraphBlackboardView.cs

@@ -1,4 +1,4 @@
-using TNode.TNodeCore.Editor.Blackboard;
+using TNodeCore.Editor.Blackboard;
 using TNodeCore.Editor.NodeGraphView;
 using TNodeCore.Runtime.Models;
 using UnityEditor;

TNodeGraphViewImpl/Editor/Inspector/NodeInspectorInNode.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
-using TNode.TNodeCore.Editor.Serialization;
 using TNodeCore.Editor.NodeGraphView;
+using TNodeCore.Editor.Serialization;
 using TNodeCore.Runtime.Attributes;
 using TNodeCore.Runtime.Models;
 using UnityEditor;

TNodeGraphViewImpl/Editor/NodeGraphView/DataGraphView.cs

@@ -4,11 +4,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
-using TNode.TNodeCore.Editor.Blackboard;
-using TNode.TNodeCore.Editor.CommentView;
-using TNode.TNodeCore.Editor.EditorPersistence;
 using TNode.TNodeCore.Editor.Models;
 using TNodeCore.Editor;
+using TNodeCore.Editor.Blackboard;
+using TNodeCore.Editor.CommentView;
+using TNodeCore.Editor.EditorPersistence;
+using TNodeCore.Editor.Models;
 using TNodeCore.Editor.NodeGraphView;
 using TNodeCore.Editor.Tools.NodeCreator;
 using TNodeCore.Runtime.Components;

TNodeGraphViewImpl/Editor/NodeViews/DragNodeView.cs

@@ -1,4 +1,4 @@
-using TNode.TNodeCore.Editor.Serialization;
+using TNodeCore.Editor.Serialization;
 using TNodeCore.Extensions;
 using TNodeCore.Runtime.Attributes;
 using TNodeCore.Runtime.Models;

TNodeGraphViewImpl/Editor/NodeViews/NodeView.cs

@@ -1,12 +1,15 @@
 using System;
+using System.Collections;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using TNode.TNodeCore.Editor.Serialization;
 using TNodeCore.Editor.NodeGraphView;
+using TNodeCore.Editor.Serialization;
 using TNodeCore.Runtime;
 using TNodeCore.Runtime.Attributes;
 using TNodeCore.Runtime.Attributes.Ports;
 using TNodeCore.Runtime.Models;
+using TNodeCore.Runtime.RuntimeCache;
 using TNodeGraphViewImpl.Editor.Inspector;
 using TNodeGraphViewImpl.Editor.Ports;
 using UnityEditor;
@@ -145,21 +148,61 @@ namespace TNodeGraphViewImpl.Editor.NodeViews{
             throw new Exception("Member is not a property or field");
         }
         protected virtual Type BuildPortType(PortAttribute portAttribute,PropertyInfo propertyInfo){
-            switch (portAttribute.TypeHandling){
+      
-                case TypeHandling.Declared :
+        
-                    return propertyInfo.PropertyType;
+                switch (portAttribute.TypeHandling){
-                case TypeHandling.Implemented:
+                    case TypeHandling.Declared :
-                    return propertyInfo.GetValue(_data)?.GetType();
+                        return propertyInfo.PropertyType;
-                case TypeHandling.Specified:
+                    case TypeHandling.Implemented:
-                    return portAttribute.HandledType??typeof(object);
+                        return propertyInfo.GetValue(_data)?.GetType();
-                case TypeHandling.Path:
+                    case TypeHandling.Specified:
-                    var type = GetDataType(portAttribute.TypePath);
+                        return portAttribute.HandledType??typeof(object);
-                    Debug.Log(type);
+                    case TypeHandling.Path:
-                    return type;
+                        var type = GetDataType(portAttribute.TypePath);
-                default:
+                
-                    throw new ArgumentOutOfRangeException();
+                        return type;
+                    default:
+                        throw new ArgumentOutOfRangeException();
+                }
+            
+        }
+        public virtual Type BuildGroupPortType(PortAttribute portAttribute,PropertyInfo propertyInfo,int index){
+            var iList = propertyInfo.GetValue(_data) as IList;
+            if (iList is Array array){
+                switch (portAttribute.TypeHandling){
+                    case TypeHandling.Declared:
+                        return array.GetType().GetElementType();
+                    case TypeHandling.Implemented:
+                        return array.GetValue(index).GetType();
+                    case TypeHandling.Specified:
+                        return portAttribute.HandledType??typeof(object);
+                    case TypeHandling.Path:
+                        return GetDataType(portAttribute.TypePath);
+                    default:
+                        throw new ArgumentOutOfRangeException();
+                }
             }
+
+            if (iList != null && iList.GetType().IsGenericType){
+                var genericType = iList.GetType().GetGenericArguments()[0];
+                switch (portAttribute.TypeHandling){
+                    case TypeHandling.Declared:
+                        return genericType;
+                    case TypeHandling.Implemented:
+                        return iList[index].GetType();
+                    case TypeHandling.Specified:
+                        return portAttribute.HandledType??typeof(object);
+                    case TypeHandling.Path:
+                        return GetDataType(portAttribute.TypePath);
+                    default:
+                        throw new ArgumentOutOfRangeException();
+                }
+            }
+
+            return null;
+
         }
+        
         /// <summary>
         /// of course you can override this method to build your own port builder
         /// </summary>
@@ -168,18 +211,37 @@ namespace TNodeGraphViewImpl.Editor.NodeViews{
    
             foreach (var propertyInfo in propertyInfos){
                 if (propertyInfo.GetCustomAttributes(typeof(OutputAttribute),true).FirstOrDefault() is OutputAttribute attribute){
-                    Port port = new CustomPort(Orientation.Horizontal, Direction.Output,
+                    if (attribute.Group == false){
-                        attribute.Multiple ? Port.Capacity.Multi : Port.Capacity.Single,
+                        Port port = new CustomPort(Orientation.Horizontal, Direction.Output,
-                        BuildPortType(attribute, propertyInfo));
+                            attribute.Multiple ? Port.Capacity.Multi : Port.Capacity.Single,
-                    BuildPort(port, attribute, propertyInfo,outputContainer);
+                            BuildPortType(attribute, propertyInfo));
+                        BuildPort(port, attribute, propertyInfo,outputContainer);
+                    }
+                    else{
+                        var propertyValue = _data.GetValue(propertyInfo.Name);
+                        if (propertyValue is IList list){
+                            for (var i = 0; i < list.Count; i++){
+                                var port = new CustomPort(Orientation.Horizontal, Direction.Output,
+                                    Port.Capacity.Single,
+                                    BuildGroupPortType(attribute, propertyInfo,i));
+                                BuildPort(port, attribute, propertyInfo,outputContainer);
+                            }
+                        }
+                    }
+
                 }
             }
             foreach (var propertyInfo in propertyInfos){
                 if(propertyInfo.GetCustomAttributes(typeof(InputAttribute),true).FirstOrDefault() is InputAttribute attribute){
-                    Port port = new CustomPort
+                    if (attribute.Group == false){
+                        Port port = new CustomPort
                         (Orientation.Horizontal, 
                             Direction.Input,attribute.Multiple?Port.Capacity.Multi: Port.Capacity.Single,BuildPortType(attribute,propertyInfo));
-                    BuildPort(port,attribute,propertyInfo,inputContainer);
+                        BuildPort(port,attribute,propertyInfo,inputContainer);
+                    }
+                    else{
+                        
+                    }
                 }
             }
         }
@@ -196,6 +258,37 @@ namespace TNodeGraphViewImpl.Editor.NodeViews{
             }
         }
 
+        private void BuildGroupPort(Port port, PortAttribute attribute, PropertyInfo propertyInfo,
+            VisualElement portContainer,object currentElement,int index = 0){
+            portContainer.Add(port);
+            if (currentElement is string str){
+                if (attribute.NameHandling == PortNameHandling.Auto){
+                    port.portName = str;
+                }
+                else{
+                    port.portName = ObjectNames.NicifyVariableName(BuildGroupPortName(attribute, propertyInfo, index));
+                }
+            }
+            
+        }
+
+        private string BuildGroupPortName(PortAttribute attribute, PropertyInfo propertyInfo, int index){
+            switch (attribute.NameHandling){
+                case PortNameHandling.Auto:
+                    return (attribute.Name.Trim(' ').Length>0?attribute.Name:propertyInfo.Name)+":"+index;
+                case PortNameHandling.Manual:
+                    return attribute.Name+":"+index;;
+                case PortNameHandling.MemberName:
+                    return propertyInfo.Name+":"+index;
+                case PortNameHandling.Format:
+                    throw new NotImplementedException();
+                case PortNameHandling.MemberType:
+                    return propertyInfo.PropertyType.Name+":"+index;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+        }
+
         public void StartARenameTitleTextField(){
             var textField = new TextField{
                 value = title,

TNodeGraphViewImpl/Editor/Placemats/PlacematView.cs

@@ -1,4 +1,5 @@
 using TNode.TNodeCore.Editor.Models;
+using TNodeCore.Editor.Models;
 using UnityEditor.Experimental.GraphView;
 using UnityEngine;
 using UnityEngine.UIElements;

TNodeGraphViewImpl/Editor/Search/BlackboardSearchWindowProvider.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using TNode.TNodeCore.Editor.Blackboard;
+using TNodeCore.Editor.Blackboard;
 using TNodeCore.Editor.NodeGraphView;
 using UnityEditor;
 using UnityEditor.Experimental.GraphView;

TNodeGraphViewImpl/TNodeGraphViewImpl.asmdef

@@ -2,7 +2,8 @@
     "name": "TNodeGraphViewImpl",
     "rootNamespace": "",
     "references": [
-        "GUID:940af72691767fa47be979e5dbcf6ba0"
+        "GUID:940af72691767fa47be979e5dbcf6ba0",
+        "GUID:646fd469059c44c3b9215226d5e1e13c"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Tests.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 693e3b5ee51240dfa38db52ca14eecde
+timeCreated: 1660803399

TilemapGenerator.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: cf0168c8ec1f9304c9872577b1e6abdf
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: