From 0ed8ac6404890d0129f3c92c1bf93cfbc26de5f5 Mon Sep 17 00:00:00 2001
From: Thor Brigsted <thorbrigsted@gmail.com>
Date: Sun, 4 Aug 2019 23:07:55 +0200
Subject: [PATCH] Started working on node groups

---
 Scripts/Editor/NodeEditorGUI.cs               |  14 ++-
 Scripts/Editor/NodeEditorResources.cs         |   7 +-
 Scripts/Editor/NodeGraphEditor.cs             |  14 +++
 Scripts/Editor/Resources/xnode_group.png      | Bin 0 -> 19936 bytes
 Scripts/Editor/Resources/xnode_group.png.meta |  99 ++++++++++++++++++
 .../Editor/Resources/xnode_node_workfile.psd  | Bin 33269 -> 33945 bytes
 Scripts/NodeGraph.cs                          |   2 +
 Scripts/NodeGroup.cs                          |  10 ++
 Scripts/NodeGroup.cs.meta                     |  11 ++
 9 files changed, 153 insertions(+), 4 deletions(-)
 create mode 100644 Scripts/Editor/Resources/xnode_group.png
 create mode 100644 Scripts/Editor/Resources/xnode_group.png.meta
 create mode 100644 Scripts/NodeGroup.cs
 create mode 100644 Scripts/NodeGroup.cs.meta

diff --git a/Scripts/Editor/NodeEditorGUI.cs b/Scripts/Editor/NodeEditorGUI.cs
index 3fc5f21..aa6919d 100644
--- a/Scripts/Editor/NodeEditorGUI.cs
+++ b/Scripts/Editor/NodeEditorGUI.cs
@@ -28,7 +28,10 @@ namespace XNodeEditor {
             DrawGrid(position, zoom, panOffset);
             DrawConnections();
             DrawDraggedConnection();
+            BeginZoomed(position, zoom, topPadding);
+            DrawGroups();
             DrawNodes();
+            EndZoomed(position, zoom, topPadding);
             DrawSelectionBox();
             DrawTooltip();
             DrawGraphOnGUI();
@@ -272,8 +275,6 @@ namespace XNodeEditor {
                 if (onValidate != null) EditorGUI.BeginChangeCheck();
             }
 
-            BeginZoomed(position, zoom, topPadding);
-
             Vector2 mousePos = Event.current.mousePosition;
 
             if (e.type != EventType.Layout) {
@@ -403,7 +404,6 @@ namespace XNodeEditor {
             }
 
             if (e.type != EventType.Layout && currentActivity == NodeActivity.DragGrid) Selection.objects = preSelection.ToArray();
-            EndZoomed(position, zoom, topPadding);
 
             //If a change in is detected in the selected node, call OnValidate method. 
             //This is done through reflection because OnValidate is only relevant in editor, 
@@ -411,6 +411,14 @@ namespace XNodeEditor {
             if (onValidate != null && EditorGUI.EndChangeCheck()) onValidate.Invoke(Selection.activeObject, null);
         }
 
+        private void DrawGroups() {
+            for (int i = 0; i < graph.groups.Count; i++) {
+                GUIStyle style = new GUIStyle(graphEditor.GetGroupStyle());
+                Rect groupRect = GridToWindowRectNoClipped(graph.groups[i].position);
+                GUI.Box(groupRect, "", style);
+            }
+        }
+
         private bool ShouldBeCulled(XNode.Node node) {
 
             Vector2 nodePos = GridToWindowPositionNoClipped(node.position);
diff --git a/Scripts/Editor/NodeEditorResources.cs b/Scripts/Editor/NodeEditorResources.cs
index 0a84e0a..1737991 100644
--- a/Scripts/Editor/NodeEditorResources.cs
+++ b/Scripts/Editor/NodeEditorResources.cs
@@ -12,13 +12,15 @@ namespace XNodeEditor {
         private static Texture2D _nodeBody;
         public static Texture2D nodeHighlight { get { return _nodeHighlight != null ? _nodeHighlight : _nodeHighlight = Resources.Load<Texture2D>("xnode_node_highlight"); } }
         private static Texture2D _nodeHighlight;
+        public static Texture2D groupBody { get { return _groupBody != null ? _groupBody : _groupBody = Resources.Load<Texture2D>("xnode_group"); } }
+        private static Texture2D _groupBody;
 
         // Styles
         public static Styles styles { get { return _styles != null ? _styles : _styles = new Styles(); } }
         public static Styles _styles = null;
         public static GUIStyle OutputPort { get { return new GUIStyle(EditorStyles.label) { alignment = TextAnchor.UpperRight }; } }
         public class Styles {
-            public GUIStyle inputPort, nodeHeader, nodeBody, tooltip, nodeHighlight;
+            public GUIStyle inputPort, nodeHeader, nodeBody, tooltip, nodeHighlight, group;
 
             public Styles() {
                 GUIStyle baseStyle = new GUIStyle("Label");
@@ -38,6 +40,9 @@ namespace XNodeEditor {
                 nodeBody.border = new RectOffset(32, 32, 32, 32);
                 nodeBody.padding = new RectOffset(16, 16, 4, 16);
 
+                group = new GUIStyle(nodeBody);
+                group.normal.background = NodeEditorResources.groupBody;
+
                 nodeHighlight = new GUIStyle();
                 nodeHighlight.normal.background = NodeEditorResources.nodeHighlight;
                 nodeHighlight.border = new RectOffset(32, 32, 32, 32);
diff --git a/Scripts/Editor/NodeGraphEditor.cs b/Scripts/Editor/NodeGraphEditor.cs
index 110c506..b002c1d 100644
--- a/Scripts/Editor/NodeGraphEditor.cs
+++ b/Scripts/Editor/NodeGraphEditor.cs
@@ -56,6 +56,7 @@ namespace XNodeEditor {
                 });
             }
             menu.AddSeparator("");
+            menu.AddItem(new GUIContent("New Group"), false, () => AddNewGroup(pos));
             if (NodeEditorWindow.copyBuffer != null && NodeEditorWindow.copyBuffer.Length > 0) menu.AddItem(new GUIContent("Paste"), false, () => NodeEditorWindow.current.PasteNodes(pos));
             else menu.AddDisabledItem(new GUIContent("Paste"));
             menu.AddItem(new GUIContent("Preferences"), false, () => NodeEditorReflection.OpenPreferences());
@@ -70,6 +71,10 @@ namespace XNodeEditor {
             return NodeEditorPreferences.GetTypeColor(type);
         }
 
+        public virtual GUIStyle GetGroupStyle() {
+            return NodeEditorResources.styles.group;
+        }
+
         public virtual string GetPortTooltip(XNode.NodePort port) {
             Type portType = port.ValueType;
             string tooltip = "";
@@ -112,6 +117,15 @@ namespace XNodeEditor {
             if (NodeEditorPreferences.GetSettings().autoSave) AssetDatabase.SaveAssets();
         }
 
+        /// <summary> Add a new group and instantly start editing its title </summary>
+        public virtual void AddNewGroup(Vector2 position) {
+            XNode.NodeGroup group = new XNode.NodeGroup() {
+                name = "New Group",
+                position = new Rect(position, new Vector2(100, 100))
+            };
+            target.groups.Add(group);
+        }
+
         [AttributeUsage(AttributeTargets.Class)]
         public class CustomNodeGraphEditorAttribute : Attribute,
             XNodeEditor.Internal.NodeEditorBase<NodeGraphEditor, NodeGraphEditor.CustomNodeGraphEditorAttribute, XNode.NodeGraph>.INodeEditorAttrib {
diff --git a/Scripts/Editor/Resources/xnode_group.png b/Scripts/Editor/Resources/xnode_group.png
new file mode 100644
index 0000000000000000000000000000000000000000..a07f90598b0ea1a861d368f7269118cbf136f81c
GIT binary patch
literal 19936
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

literal 0
HcmV?d00001

diff --git a/Scripts/Editor/Resources/xnode_group.png.meta b/Scripts/Editor/Resources/xnode_group.png.meta
new file mode 100644
index 0000000..1c4f73a
--- /dev/null
+++ b/Scripts/Editor/Resources/xnode_group.png.meta
@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: 14772c8dd8fde6d4aa7e364285743b82
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 7
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: 1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 2
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Scripts/Editor/Resources/xnode_node_workfile.psd b/Scripts/Editor/Resources/xnode_node_workfile.psd
index a578c46f72983f361977f536f07fe3642b1ad2eb..f41c333fa4ad18a764937b30264ba75be4206673 100644
GIT binary patch
delta 5222
zcmc(g3rtg27{||j7Rq3yGz2G)UMTngW??9gOmGrW5LBR;8J3J9Iz@y9P}z(-#x2?A
zHdL-U&9+RlEql75-77PTE=y)&VlrecbcNfBna&KTI6&H7dUtwhE3Juvw1azcAOG)u
z=bZ0;_xqhQ_9}k*P5dYm&gZNyE+a|cIu;#!a>22Jg|dBR)xGUMDxOaNH+#7Agrn?i
zJrSOro|&UjXXIt(=Bbyn`-ogW%g@AqRbAcI+}iCqE7H|D>WuUinOWNO+~wNL^lbI=
z+T86=X|uA_nY!o5L2^c(Y(r>{?<BhOp&w+)h<jqNQUC<;(5=f)#W29O7A(UE-NyxE
zk1t3;9vC`TxzEc0sL>-K)m_*ag+oo$iB%aFhdWM|C%(S+S8J;3bn%8C{``B=dij&_
zp9=QhO-)uE|L4HhM>t;k{H~AgU&1d`6mRIfdgfIBgksY(@@S>{+q>_t4_Vp%<`Uue
zQU21cxO@DU$-A}*Ky7{ZuPxPamX4Ff`B&PK&vT(m>e#`3hYqygEiT>ME{T}<Vqq-&
z#`2=|a0wK;JbhR0@bta2q*&EaQh_eV&$+xl6R*hk`Y3;<EaJ$rt2)Ey;EkmhJ5QA!
zTH8^wQ+00g;435R2Z{TKOX__@YFomZE7z8FW?wvf;kOmv4>cZCeJU8y@78Up49CK=
z^D=Xk-XGecdFwH;5?m<*;BEG+swYYs_cSy#)z&MK0bkR&yBXbGSw+VtZR?I{cj?}3
zTU(o&%d{=K8nwH(p*L>7(wCZ*NGaIZ?TbSIh;Kt@DN9%7g=jzydJ$=1*Hv-2bV9dy
z^DUABl}$xE+2ra(_Px#d?1wcW>^s#d>B!G}tZi;o)-~;^^%~H_>IUTl8*8anV1>G|
z>PdnEMa@OevXUCta7)?B8U<0@*uvJ=lq@Jb=pCT)Wu>yJv9%~^Q(MC-z+S6q(dBDj
z!{i<Zt@~2|(EU-HLDCzukM8}hLKpVJQEck@i0<qTIt<Ey0?0r#y2?Q$dU|w|i{6j+
zdHAgyjjaGNXcig3eH%ok`3wN!^BVv}>6o4YIa0xGp5*)ef?ou&L3EoC2q*8b8*PN$
z!8`4OT_BzO&`q<Eqs;?%Ms2*47aRiawB79HNXyVT@0>)M;%{<&y#}LRV(9JT%!A|n
zq`;$|!(5+1ucr<DoW*K$I+2Y)p1s|As+a4(J;u8%xWmj{*HZ?LgEvMTqQ%Z}U3!7T
z`>l3S+uXWu*yf{6LqXLL5AuMs91n8SJ6QDh3@8WFLK@Kz8%BG4ZC&QzX^6WL9mD}=
zIUW>d*&)dO5EbJ?88A;}#8Z0q0i;RJ<S9+Z9Z~nXOPAnBEnK&m;`)s4@+O?NA#*oJ
znR*691RMg%j}Kb<dpO$EYaBoXxd4(l`Ee_}eWSn6WRmpt-?(iR$+8QyledkHScgqR
z^ssegOytj>Q8&I*5C_083<ksjFbqZLrxpAhYdE#)1TlcwF$}$n+x##HAFQVH5&)dG
zoCh_488YnIe*%Iy0EXdoko_T_gN+z^cj5pb4uDzr`tRELgUH~_1M;l@egVu5;s6+i
zzTX{G1ZJ|aL%+n&bpY^@6V4Fg05)Ri-H8K$7%>byZ2}M&K~hGVphyC<13MrwLLRF$
zGPE)-I*cYT9ykDw(XrhOnIMOu1U88b6cNj$6_y({lJdedMi~`KOadNtjbzfw^%}Z7
zjY*Kvm=oCu<XPCQp$eJA7%3rINF`H=EENnBA3?e-IK?ns8iBzRWt6CCw@!+reY6V7
z{S0%gp=ypN^qUXjeug>LkeTBN{pN$HNdBh`5cE`8mNSgI><B8(UAiiFVUm!H_Ez{J
zclFXlSOS8f!l((UKrkewc<LOZ<;re`QZ0@XS#SW72#rce>|totqLetfix~%yU__`a
pCO$FAq>>~h#>dD+!t8*?2wEB;i!{mUNLhqb1aSf=d}*Dc_&;vOchdj>

delta 4591
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
CE#0O7

diff --git a/Scripts/NodeGraph.cs b/Scripts/NodeGraph.cs
index 6a0cead..2ccbc38 100644
--- a/Scripts/NodeGraph.cs
+++ b/Scripts/NodeGraph.cs
@@ -10,6 +10,8 @@ namespace XNode {
         /// <summary> All nodes in the graph. <para/>
         /// See: <see cref="AddNode{T}"/> </summary>
         [SerializeField] public List<Node> nodes = new List<Node>();
+        /// <summary> All groups in the graph. </summary>
+        [SerializeField] public List<NodeGroup> groups = new List<NodeGroup>();
 
         /// <summary> Add a node to the graph by type (convenience method - will call the System.Type version) </summary>
         public T AddNode<T>() where T : Node {
diff --git a/Scripts/NodeGroup.cs b/Scripts/NodeGroup.cs
new file mode 100644
index 0000000..025bfc0
--- /dev/null
+++ b/Scripts/NodeGroup.cs
@@ -0,0 +1,10 @@
+using System;
+using UnityEngine;
+
+namespace XNode {
+	[Serializable]
+	public class NodeGroup {
+		public string name;
+		public Rect position;
+	}
+}
\ No newline at end of file
diff --git a/Scripts/NodeGroup.cs.meta b/Scripts/NodeGroup.cs.meta
new file mode 100644
index 0000000..c202486
--- /dev/null
+++ b/Scripts/NodeGroup.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7aa18e940963e0744bcfe540789d8e85
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: