- Added more stable method to retrieve all attributes for a serialize…

…d property. [#14](#14)

- Fixed wrong window size for all SearchWindows [#10](#10)
- wrapped UnityEditor in #if UNITY_EDITOR preprocessor directives in all graph models

CHANGELOG.md

@@ -190,4 +190,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Graphs can now be created in a scene context and use scene references. To create a graph add the MonoGraphModel component to a gameobject.
 - Added ability to rename the GraphWindow [#11](https://github.com/Gentlymad-Studios/NewGraph/issues/11)
 ### Fixed
-- Major refactoring and minor bugfixes
+- Major refactoring and minor bugfixes
+
+## [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

Editor/Serialization/AttributesBag.cs

@@ -1,58 +1,56 @@
-using OdinSerializer.Utilities;
 using System;
-using System.Collections.Generic;
 using System.Reflection;
+using UnityEditor;
 
 namespace NewGraph {
     public class AttributesBag {
-        private const BindingFlags AllBindingFlags = (BindingFlags)(-1);
+
+        private delegate FieldInfo GetFieldInfoAndStaticTypeFromProperty(SerializedProperty aProperty, out Type aType);
+        private static GetFieldInfoAndStaticTypeFromProperty m_GetFieldInfoAndStaticTypeFromProperty;
+
         public object[] attributes = new object[] { };
         public Type type = null;
 
         /// <summary>
-        /// Retrieve all attributes by a given propertyPath string (from a SerializedProperty)
+        /// get attributes directly by the property
         /// </summary>
-        /// <param name="targetObjectType"></param>
-        /// <param name="relativePropPath"></param>
+        /// <param name="property"></param>
         /// <param name="inherit"></param>
-        public void GetAttributes(Type targetObjectType, string relativePropPath, bool inherit) {
-            attributes = new object[] { };
-            type = null;
-
-            FieldInfo fieldInfo = null;
-            System.Reflection.PropertyInfo propertyInfo = null;
-            IEnumerable<Type> allTypes;
-
-            foreach (var name in relativePropPath.Split('.')) {
-
-                allTypes = targetObjectType.GetBaseTypes(true);
-                foreach (Type type in allTypes) {
-                    fieldInfo = type.GetField(name, AllBindingFlags);
-                    if (fieldInfo != null) {
-                        break;
-                    }
-                }
-
-                if (fieldInfo == null) {
-                    propertyInfo = targetObjectType.GetProperty(name, AllBindingFlags);
-                    if (propertyInfo == null) {
-                        return;
-                    }
-                    targetObjectType = propertyInfo.PropertyType;
-                } else {
-                    targetObjectType = fieldInfo.FieldType;
-                }
-            }
-
+        public void GetAttributes(SerializedProperty property, bool inherit) {
+            FieldInfo fieldInfo = GetFieldInfoAndStaticType(property, out _);
             if (fieldInfo != null) {
                 type = fieldInfo.FieldType;
-
                 attributes = fieldInfo.GetCustomAttributes(inherit);
+            }
+        }
 
-            } else if (propertyInfo != null) {
-                type = propertyInfo.PropertyType;
-                attributes = propertyInfo.GetCustomAttributes(inherit);
+        /// <summary>
+        /// Get the field info and type directly by the property.
+        /// Uses an internal unity method.
+        /// Based on: https://forum.unity.com/threads/get-a-general-object-value-from-serializedproperty.327098/#post-6432620
+        /// </summary>
+        /// <param name="prop"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        private static FieldInfo GetFieldInfoAndStaticType(SerializedProperty prop, out Type type) {
+            if (m_GetFieldInfoAndStaticTypeFromProperty == null) {
+                foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies()) {
+                    foreach (var t in assembly.GetTypes()) {
+                        if (t.Name == "ScriptAttributeUtility") {
+                            MethodInfo mi = t.GetMethod(nameof(GetFieldInfoAndStaticTypeFromProperty), BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic);
+                            m_GetFieldInfoAndStaticTypeFromProperty = (GetFieldInfoAndStaticTypeFromProperty)Delegate.CreateDelegate(typeof(GetFieldInfoAndStaticTypeFromProperty), mi);
+                            break;
+                        }
+                    }
+                    if (m_GetFieldInfoAndStaticTypeFromProperty != null) break;
+                }
+                if (m_GetFieldInfoAndStaticTypeFromProperty == null) {
+                    UnityEngine.Debug.LogError("GetFieldInfoAndStaticType::Reflection failed!");
+                    type = null;
+                    return null;
+                }
             }
+            return m_GetFieldInfoAndStaticTypeFromProperty(prop, out type);
         }
     }
 }

Editor/Serialization/PropertyBag.cs

@@ -202,6 +202,7 @@ private void DoVisibilityRecursive(GraphPropertyInfo graphProperty, GroupInfo pa
             }
         }
 
+
         /// <summary>
         /// Retrieve attributes for the currently active property
         /// </summary>
@@ -212,7 +213,8 @@ private int RetrieveCurrentAttributes() {
             currentGraphDisplayAttribute = null;
 
             // retrieve all attributes
-            attributeBag.GetAttributes(nodeType, currentRelativePropertyPath, true);
+            //attributeBag.GetAttributes(nodeType, currentRelativePropertyPath, true);
+            attributeBag.GetAttributes(currentProperty, true);
 
             // remember: we are only on ONE property!
             // and every property can have SEVERAL attributes!

Editor/Views/SearchWindow.cs

@@ -384,7 +384,7 @@ private void RebuildSearch() {
                 bool didMatchAll = true;
                 bool didMatchStart = false;
 
-                // See if we match ALL the seaarch words.
+                // See if we match ALL the search words.
                 for (int w = 0; w < searchWords.Length; w++) {
                     string search = searchWords[w];
                     if (name.Contains(search)) {
@@ -463,7 +463,7 @@ private void ListGUI(SearchTreeEntry[] tree, float anim, SearchTreeGroupEntry pa
             animRect.y = k_HeaderHeight;
             //animRect.height -= k_HeaderHeight;
             animRect.width -= 2;
-
+            animRect.height -= k_HeaderHeight;
             // Start of animated area (the part that moves left and right)
             GUILayout.BeginArea(animRect);
 
@@ -491,6 +491,7 @@ private void ListGUI(SearchTreeEntry[] tree, float anim, SearchTreeGroupEntry pa
             ListGUI(tree, parent);
 
             GUILayout.EndArea();
+
         }
 
         private void SelectEntry(SearchTreeEntry e, bool shouldInvokeCallback) {

Models/MonoGraphModel.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+#if UNITY_EDITOR
 using UnityEditor;
+#endif
 using UnityEngine;
 
 namespace NewGraph {

Models/ScriptableGraphModel.cs

@@ -1,5 +1,7 @@
 using System.Collections.Generic;
+#if UNITY_EDITOR
 using UnityEditor;
+#endif
 using UnityEngine;
 
 namespace NewGraph {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.gentlymad.newgraph",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "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",