Merge remote-tracking branch 'upstream/main' into #34-Add-Prefabs-AssetsItemBuilder

Author: marc-antoine-girard

.editorconfig

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           token: ${{ secrets.GH_TOKEN }}
       - name: Setup Node.js

.github/workflows/release.yml

@@ -1,3 +1,17 @@
+### [1.7.3](https://github.com/Thundernerd/Unity3D-SerializableInterface/compare/v1.7.2...v1.7.3) (2022-07-22)
+
+
+### Refactors
+
+* property drawer now reuses cached reference drawers ([f930d8e](https://github.com/Thundernerd/Unity3D-SerializableInterface/commit/f930d8ed92b8358e417d075f9a089f7161cadc50))
+
+### [1.7.2](https://github.com/Thundernerd/Unity3D-SerializableInterface/compare/v1.7.1...v1.7.2) (2022-07-22)
+
+
+### Bug Fixes
+
+* updated actions/checkout to version 3 ([ef748e1](https://github.com/Thundernerd/Unity3D-SerializableInterface/commit/ef748e176b864cd3dfc00f3b96e9cedb8783055d))
+
 ### [1.7.1](https://github.com/Thundernerd/Unity3D-SerializableInterface/compare/v1.7.0...v1.7.1) (2022-06-18)
 
 

CHANGELOG.md

@@ -8,15 +8,38 @@ namespace TNRD.Drawers
 {
     internal class RawReferenceDrawer : ReferenceDrawer, IReferenceDrawer
     {
-        private readonly GUIContent label;
+        private GUIContent label;
+        private FieldInfo fieldInfo;
 
-        private static object previousReferenceValue;
-        private static string previousPropertyPath;
+        private object previousReferenceValue;
+        private string previousPropertyPath;
 
-        /// <inheritdoc />
-        public RawReferenceDrawer(SerializedProperty property, GUIContent label, Type genericType, FieldInfo fieldInfo)
-            : base(property, genericType, fieldInfo)
+        private object RawReferenceValue
+        {
+            get
+            {
+#if UNITY_2021_1_OR_NEWER
+                return RawReferenceProperty.managedReferenceValue;
+#else
+                ISerializableInterface instance =
+                    (ISerializableInterface)fieldInfo.GetValue(Property.serializedObject.targetObject);
+                return instance.GetRawReference();
+#endif
+            }
+
+            set
+            {
+#if UNITY_2021_1_OR_NEWER
+                RawReferenceProperty.managedReferenceValue = value;
+#else
+                fieldInfo.SetValue(Property.serializedObject.targetObject, value);
+#endif
+            }
+        }
+
+        public void Initialize(SerializedProperty property, Type genericType, GUIContent label, FieldInfo fieldInfo)
         {
+            Initialize(property, genericType);
             this.label = label;
         }
 

Editor/Drawers/RawReferenceDrawer.cs

@@ -22,10 +22,11 @@ private enum DragAndDropMode
 
         private DragAndDropMode dragAndDropMode;
 
-        protected readonly SerializedProperty Property;
-        protected readonly Type GenericType;
         protected readonly CustomObjectDrawer CustomObjectDrawer;
 
+        protected SerializedProperty Property { get; private set; }
+        protected Type GenericType { get; private set; }
+
         protected SerializedProperty ReferenceModeProperty => Property.FindPropertyRelative("mode");
         protected SerializedProperty RawReferenceProperty => Property.FindPropertyRelative("rawReference");
         protected SerializedProperty UnityReferenceProperty => Property.FindPropertyRelative("unityReference");
@@ -91,19 +92,21 @@ protected object PropertyValue
             }
         }
 
-        protected ReferenceDrawer(SerializedProperty property, Type genericType, FieldInfo fieldInfo)
+        protected ReferenceDrawer()
         {
-            Property = property;
-            GenericType = genericType;
-            this.fieldInfo = fieldInfo;
-
             CustomObjectDrawer = new CustomObjectDrawer();
             CustomObjectDrawer.ButtonClicked += OnButtonClicked;
             CustomObjectDrawer.Clicked += OnClicked;
             CustomObjectDrawer.DeletePressed += OnDeletePressed;
             CustomObjectDrawer.PropertiesClicked += OnPropertiesClicked;
         }
 
+        protected void Initialize(SerializedProperty property, Type genericType)
+        {
+            Property = property;
+            GenericType = genericType;
+        }
+
         private void OnButtonClicked(Rect position)
         {
             AdvancedDropdownState state = new AdvancedDropdownState();

Editor/Drawers/ReferenceDrawer.cs

@@ -9,11 +9,11 @@ namespace TNRD.Drawers
 {
     internal class UnityReferenceDrawer : ReferenceDrawer, IReferenceDrawer
     {
-        private readonly GUIContent label;
+        private GUIContent label;
 
-        public UnityReferenceDrawer(SerializedProperty property, GUIContent label, Type genericType, FieldInfo fieldInfo)
-            : base(property, genericType, fieldInfo)
+        public void Initialize(SerializedProperty property, Type genericType, GUIContent label)
         {
+            Initialize(property, genericType);
             this.label = label;
         }
 

Editor/Drawers/UnityReferenceDrawer.cs

@@ -4,10 +4,9 @@ namespace TNRD.Items
 {
     public class NoneDropdownItem  : AdvancedDropdownItem, IDropdownItem
     {
-        private ReferenceMode mode => ReferenceMode.Raw;
         public NoneDropdownItem() : base("None") { }
 
-        ReferenceMode IDropdownItem.Mode => mode;
+        ReferenceMode IDropdownItem.Mode => ReferenceMode.Raw;
 
         public object GetValue()
         {

Editor/Items/NoneDropdownItem.cs

@@ -10,11 +10,12 @@ namespace TNRD
     [CustomPropertyDrawer(typeof(SerializableInterface<>), true)]
     internal sealed class SerializableInterfacePropertyDrawer : PropertyDrawer
     {
+        private readonly RawReferenceDrawer rawReferenceDrawer = new RawReferenceDrawer();
+        private readonly UnityReferenceDrawer unityReferenceDrawer = new UnityReferenceDrawer();
+
         private SerializedProperty serializedProperty;
         private Type genericType;
 
-        private IReferenceDrawer activeDrawer;
-
         /// <inheritdoc />
         public override bool CanCacheInspectorGUI(SerializedProperty property) => false;
 
@@ -23,7 +24,6 @@ private void Initialize(SerializedProperty property)
             if (serializedProperty == property)
                 return;
 
-            activeDrawer = null;
             serializedProperty = property;
             genericType = GetGenericArgument();
             Assert.IsNotNull(genericType, "Unable to find generic argument, are you doing some shady inheritance?");
@@ -33,16 +33,14 @@ private void Initialize(SerializedProperty property)
         public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
         {
             Initialize(property);
-            activeDrawer = GetReferenceDrawer(activeDrawer, property, label);
-            return activeDrawer.GetHeight();
+            return GetReferenceDrawer(property, label).GetHeight();
         }
 
         /// <inheritdoc />
         public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
         {
             Initialize(property);
-            activeDrawer = GetReferenceDrawer(activeDrawer, property, label);
-            activeDrawer.OnGUI(position);
+            GetReferenceDrawer(property, label).OnGUI(position);
         }
 
         private Type GetGenericArgument()
@@ -81,25 +79,19 @@ private Type GetGenericArgument()
             return null;
         }
 
-        private IReferenceDrawer GetReferenceDrawer(
-            IReferenceDrawer original,
-            SerializedProperty property,
-            GUIContent label
-        )
+        private IReferenceDrawer GetReferenceDrawer(SerializedProperty property, GUIContent label)
         {
             SerializedProperty modeProperty = serializedProperty.FindPropertyRelative("mode");
             ReferenceMode referenceMode = (ReferenceMode)modeProperty.enumValueIndex;
 
             switch (referenceMode)
             {
                 case ReferenceMode.Raw:
-                    return original is RawReferenceDrawer
-                        ? original
-                        : new RawReferenceDrawer(property, label, genericType, fieldInfo);
+                    rawReferenceDrawer.Initialize(property, genericType, label, fieldInfo);
+                    return rawReferenceDrawer;
                 case ReferenceMode.Unity:
-                    return original is UnityReferenceDrawer
-                        ? original
-                        : new UnityReferenceDrawer(property, label, genericType, fieldInfo);
+                    unityReferenceDrawer.Initialize(property, genericType, label, fieldInfo);
+                    return unityReferenceDrawer;
                 default:
                     throw new ArgumentOutOfRangeException();
             }

Editor/SerializableInterfacePropertyDrawer.cs

@@ -48,7 +48,7 @@ protected override AdvancedDropdownItem BuildRoot()
                 .AddChild(new ClassesItemBuilder(interfaceType).Build())
                 .AddChild(new SceneItemBuilder(interfaceType, relevantScene).Build());
 
-            foreach (var dropdownItem in item.children)
+            foreach (AdvancedDropdownItem dropdownItem in item.children)
             {
                 dropdownItem.AddChild(new NoneDropdownItem());
             }

Editor/Utilities/SerializableInterfaceAdvancedDropdown.cs

@@ -9,7 +9,7 @@ namespace TNRD
     /// </summary>
     /// <typeparam name="TInterface">The type of the interface you want to serialize</typeparam>
     [Serializable]
-    public class SerializableInterface<TInterface> : ISerializableInterface
+    public class SerializableInterface<TInterface> : ISerializableInterface where TInterface : class
     {
         [HideInInspector, SerializeField] private ReferenceMode mode = ReferenceMode.Unity;
         [HideInInspector, SerializeField] private UnityEngine.Object unityReference;
@@ -21,8 +21,8 @@ public TInterface Value
             {
                 return mode switch
                 {
-                    ReferenceMode.Raw => (TInterface)rawReference,
-                    ReferenceMode.Unity => (TInterface)(object)unityReference,
+                    ReferenceMode.Raw => rawReference as TInterface,
+                    ReferenceMode.Unity => (object)unityReference as TInterface,
                     _ => throw new ArgumentOutOfRangeException()
                 };
             }