- Added integrated Examples (Samples~). To use: Copy contents from Sa…

…mples~ folder into you Assets project. - Added ability to add new window/ graph types to the graph window lookup
Gentlymad-Studios · Apr 24, 2023 · d0ea7bd · d0ea7bd
1 parent c0a292f
commit d0ea7bd
Show file tree

Hide file tree

Showing 16 changed files with 147 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -195,7 +195,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [0.3.3] - 2023-04-18
 ### Added
 - Added more stable method to retrieve all attributes for a serialized property. [#14](https://github.com/Gentlymad-Studios/NewGraph/issues/14)
-
 ### Fixed
 - Fixed wrong window size for all SearchWindows [#10](https://github.com/Gentlymad-Studios/NewGraph/issues/10)
 - wrapped UnityEditor in #if UNITY_EDITOR preprocessor directives in all graph models
+
+## [0.3.4] - 2023-04-24
+### Added
+- Added integrated Examples (Samples~). To use: Copy contents from  Samples~ folder into you Assets project.
+- Added ability to add new window/ graph types to the graph window lookup
+
diff --git a/Documentation~ b/Documentation~
diff --git a/Editor/Views/GraphWindow.cs b/Editor/Views/GraphWindow.cs
@@ -21,7 +21,7 @@ public class GraphWindow : EditorWindow {
             { typeof(MonoGraphModel), typeof(MonoInspectorController) },
         };
 
-        private static readonly Dictionary<Type, Func<string, IGraphModelData>> lastGraphCreationLookup = new Dictionary<Type, Func<string, IGraphModelData>>() {
+        private static readonly Dictionary<Type, Func<string, IGraphModelData>> lastGraphCreationStrategies = new Dictionary<Type, Func<string, IGraphModelData>>() {
             { typeof(ScriptableGraphModel), ScriptableGraphModel.GetGraphData },
             { typeof(MonoGraphModel), MonoGraphModel.GetGraphData },
         };
@@ -57,12 +57,19 @@ private static Type CurrentWindowType {
         [NonSerialized]
         private static bool loadRequested = false;
 
-        [MenuItem(menuItemBase + nameof(GraphWindow))]
-        private static void InitializeScriptableWindow() {
+        //[MenuItem(menuItemBase + nameof(GraphWindow))]
+        /*private static void InitializeScriptableWindow() {
             InitializeWindowBase(typeof(ScriptableGraphModel));
+        }*/
+
+        public static void AddWindowType(Type windowType, Type inspectorControllerType, Func<string, IGraphModelData> lastGraphCreationStrategy) {
+            if (!inspectorControllerLookup.ContainsKey(windowType)) {
+                inspectorControllerLookup.Add(windowType, inspectorControllerType);
+                lastGraphCreationStrategies.Add(windowType, lastGraphCreationStrategy);
+            }
         }
- 
-        private static void InitializeWindowBase(Type windowType) {
+
+        public static void InitializeWindowBase(Type windowType) {
             if (window != null && CurrentWindowType != windowType) {
                 window.Close();
             }
@@ -135,7 +142,7 @@ public static void LoadGraph(IGraphModelData graph =null) {
             } else {
                 LastGraphInfo lastGraphInfo = LastOpenedGraphInfo;
                 if (lastGraphInfo != null) {
-                    graph = lastGraphCreationLookup[lastGraphInfo.graphType](lastGraphInfo.GUID);
+                    graph = lastGraphCreationStrategies[lastGraphInfo.graphType](lastGraphInfo.GUID);
                 }
             }
 

diff --git a/Models/MonoGraphModel.cs b/Models/MonoGraphModel.cs
@@ -20,7 +20,9 @@ public class MonoGraphModel : MonoBehaviour, IGraphModelData {
 
 #if UNITY_EDITOR
         private const string lastOpenedMonoGraphPrefsKey = nameof(NewGraph) + "." + nameof(lastOpenedMonoGraphPrefsKey);
+
         public List<NodeModel> UtilityNodes => baseModel.utilityNodes;
+
         public SerializedObject SerializedGraphData {
             get {
                 if (baseModel.serializedGraphData == null) {
@@ -97,13 +99,13 @@ private int CreateID() {
             return id;
         }
 
-        private void OnValidate() {
+        protected virtual void OnValidate() {
             CreateID();
         }
 
         public static IGraphModelData GetGraphData(string GUID) {
             if (!string.IsNullOrEmpty(GUID)) {
-                MonoGraphModel[] graphModels = UnityEngine.Object.FindObjectsByType<MonoGraphModel>(FindObjectsInactive.Include, FindObjectsSortMode.None);
+                MonoGraphModel[] graphModels = FindObjectsByType<MonoGraphModel>(FindObjectsInactive.Include, FindObjectsSortMode.None);
                 foreach (var gm in graphModels) {
                     if (gm.GUID == GUID) {
                         return gm;

diff --git a/Samples~/CustomMonoGraphModel.cs b/Samples~/CustomMonoGraphModel.cs
@@ -0,0 +1,7 @@
+namespace NewGraph.Samples {
+    public class CustomMonoGraphModel : MonoGraphModel {
+        protected override void OnValidate() {
+            base.OnValidate();
+        }
+    }
+}
diff --git a/Samples~/CustomMonoGraphModel.cs.meta b/Samples~/CustomMonoGraphModel.cs.meta
diff --git a/Samples~/Editor.meta b/Samples~/Editor.meta
diff --git a/Samples~/Editor/CustomMonoGraphModelEditor.cs b/Samples~/Editor/CustomMonoGraphModelEditor.cs
@@ -0,0 +1,8 @@
+using UnityEditor;
+
+namespace NewGraph.Samples {
+    [CustomEditor(typeof(CustomMonoGraphModel))]
+    public class CustomMonoGraphModelEditor : MonoGraphModelEditor {
+
+    }
+}
diff --git a/Samples~/Editor/CustomMonoGraphModelEditor.cs.meta b/Samples~/Editor/CustomMonoGraphModelEditor.cs.meta
diff --git a/Samples~/Editor/CustomMonoGraphModelInitializer.cs b/Samples~/Editor/CustomMonoGraphModelInitializer.cs
@@ -0,0 +1,16 @@
+using UnityEditor;
+
+namespace NewGraph.Samples {
+    public class CustomMonoGraphModelInitializer {
+
+        [InitializeOnLoadMethod]
+        private static void AddWindowType() {
+            GraphWindow.AddWindowType(typeof(CustomMonoGraphModel), typeof(MonoInspectorController), MonoGraphModel.GetGraphData);
+        }
+
+        [MenuItem(GraphSettings.menuItemBase + "CustomWindow")]
+        private static void AddMenu() {
+            GraphWindow.InitializeWindowBase(typeof(CustomMonoGraphModel));
+        }
+    }
+}
diff --git a/Samples~/Editor/CustomMonoGraphModelInitializer.cs.meta b/Samples~/Editor/CustomMonoGraphModelInitializer.cs.meta
diff --git a/Samples~/Editor/Samples.Editor.asmdef b/Samples~/Editor/Samples.Editor.asmdef
@@ -0,0 +1,20 @@
+{
+    "name": "Samples.Editor",
+    "rootNamespace": "",
+    "references": [
+        "GUID:7a19ff388de17fe459f8d1303f265e19",
+        "GUID:8cb24aa76bfc1e0478428cd510709af1",
+        "GUID:f5337683be0c9ed49824f4d1e7862f29"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
diff --git a/Samples~/Editor/Samples.Editor.asmdef.meta b/Samples~/Editor/Samples.Editor.asmdef.meta
diff --git a/Samples~/Samples.asmdef b/Samples~/Samples.asmdef
@@ -0,0 +1,16 @@
+{
+    "name": "Samples",
+    "rootNamespace": "",
+    "references": [
+        "GUID:f5337683be0c9ed49824f4d1e7862f29"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
diff --git a/Samples~/Samples.asmdef.meta b/Samples~/Samples.asmdef.meta
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.gentlymad.newgraph",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "displayName": "NewGraph",
   "description": "A general data oriented node graph solution. This is build upon the idea to visualize complex data structures as graph networks without having to modify already established data classes, except adding [Node], [Port] and [SerializeReference] attributes to call classes that should show in the Graph View.",
   "unity": "2022.2",