Merge pull request #45 from brunomikoski/feature/bugfix_and_qol

Feature/bugfix and qol

Author: brunomikoski

CHANGELOG.MD

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.3.1]
+### Added
+- Added basic copy/paste functionality between colelctables
+
+### Changed
+ - Removed multiple `AssetDatabase.SaveAssets();` to improve general performance when adding / removing objects
+ - Fixed indirect reference issues with the new Advanced Dropdown search
+ - Removed static `.Values` from the Colletion, was redundant and error prone
+
 ## [1.3.0]
 ### Added
  - Advanced dropdown for better searching on big collections;
@@ -158,6 +167,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### [Unreleased]
 
+[1.3.1]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.3.1
 [1.3.0]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.3.0
 [1.2.9]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.2.9
 [1.2.8]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.2.8

Scripts/Editor/CollectableScriptableObjectPropertyDrawer.cs

@@ -148,7 +148,7 @@ private void Initialize(SerializedProperty property)
             else
                 collectableType = fieldInfo.FieldType;
 
-            if (!CollectionsRegistry.Instance.TryGetCollectionForType(collectableType,
+            if (!CollectionsRegistry.Instance.TryGetCollectionFromCollectableType(collectableType,
                 out ScriptableObjectCollection resultCollection))
             {
                 optionsAttribute.DrawType = DrawType.AsReference;

Scripts/Editor/CopyCollectableUtils.cs

@@ -0,0 +1,33 @@
+using UnityEditor;
+
+namespace BrunoMikoski.ScriptableObjectCollections
+{
+    public static class CopyCollectableUtils
+    {
+        private static CollectableScriptableObject source;
+
+        public static void SetSource(CollectableScriptableObject targetSource)
+        {
+            source = targetSource;
+        }
+
+        public static bool CanPasteToTarget(CollectableScriptableObject target)
+        {
+            if (source == null)
+                return false;
+
+            return target.GetType() == source.GetType();
+        }
+        
+        public static void ApplySourceToStart(CollectableScriptableObject target)
+        {
+            if (source == null)
+                return;
+
+            Undo.RecordObject(target, "Paste Changes");
+            EditorUtility.CopySerializedManagedFieldsOnly(source, target);
+            EditorUtility.SetDirty(target);
+        }
+        
+    }
+}

Scripts/Editor/CopyCollectableUtils.cs.meta

@@ -76,7 +76,7 @@ private void OnGUI()
                         }
                         else
                         {
-                            if (CollectionsRegistry.Instance.TryGetCollectionForType(targetType,
+                            if (CollectionsRegistry.Instance.TryGetCollectionFromCollectableType(targetType,
                                 out ScriptableObjectCollection collection))
                             {
                                 MonoScript scriptObj = MonoScript.FromScriptableObject(collection);

Scripts/Editor/CreateNewCollectableType.cs

@@ -173,11 +173,7 @@ private void CheckForNullItemsOrType()
                     continue;
 
                 if (item.objectReferenceValue == null || item.objectReferenceInstanceIDValue == 0)
-                {
-                    Debug.LogError($"Removing item at position {i} since it has a null script",
-                        serializedObject.context);
                     continue;
-                }
 
                 validItems.Add(item.objectReferenceValue as CollectableScriptableObject);
                 needToRewrite = true;
@@ -282,7 +278,7 @@ public static void AfterStaticAssemblyReload()
 
             Type targetType = Type.GetType($"{lastCollectionFullName}, {assemblyName}");
 
-            if (CollectionsRegistry.Instance.TryGetCollectionForType(targetType,
+            if (CollectionsRegistry.Instance.TryGetCollectionFromCollectableType(targetType,
                 out ScriptableObjectCollection collection))
             {
                 Selection.activeObject = null;
@@ -386,6 +382,22 @@ private void DrawItem(int index)
                                 filteredSerializedList[index].ApplyModifiedProperties();
                         }
                     }
+
+                    using (new EditorGUILayout.HorizontalScope())
+                    {
+                        if (GUILayout.Button("Copy", EditorStyles.toolbarButton))
+                        {
+                            CopyCollectableUtils.SetSource(collectionItem);
+                        }
+
+                        using (new EditorGUI.DisabledScope(!CopyCollectableUtils.CanPasteToTarget(collectionItem)))
+                        {
+                            if (GUILayout.Button("Paste", EditorStyles.toolbarButton))
+                            {
+                                CopyCollectableUtils.ApplySourceToStart(collectionItem);
+                            }
+                        }
+                    }
                     EditorGUI.indentLevel--;
                 }
             }

Scripts/Editor/ScriptableObjectCollectionCustomEditor.cs

@@ -115,7 +115,7 @@ public bool TryGetCollectionOfType<T>(out T resultCollection) where T: Scriptabl
         }
 
 
-        public bool TryGetCollectionForType(Type targetType, 
+        public bool TryGetCollectionFromCollectableType(Type targetType, 
             out ScriptableObjectCollection scriptableObjectCollection)
         {
             for (int i = 0; i < collections.Count; i++)
@@ -133,9 +133,9 @@ public bool TryGetCollectionForType(Type targetType,
             return false;
         }
 
-        public bool TryGetCollectionForType<TargetType>(out ScriptableObjectCollection<TargetType> scriptableObjectCollection) where TargetType : CollectableScriptableObject
+        public bool TryGetCollectionFromCollectableType<TargetType>(out ScriptableObjectCollection<TargetType> scriptableObjectCollection) where TargetType : CollectableScriptableObject
         {
-            if (TryGetCollectionForType(typeof(TargetType), out ScriptableObjectCollection resultCollection))
+            if (TryGetCollectionFromCollectableType(typeof(TargetType), out ScriptableObjectCollection resultCollection))
             {
                 scriptableObjectCollection = (ScriptableObjectCollection<TargetType>) resultCollection;
                 return true;

Scripts/Runtime/CollectionsRegistry.cs

@@ -161,8 +161,7 @@ public CollectableScriptableObject AddNew(Type collectionType, string assetName
 
             this.Add(item);
             UnityEditor.AssetDatabase.CreateAsset(item, newFileName);
-            UnityEditor.AssetDatabase.SaveAssets();
-            UnityEditor.AssetDatabase.Refresh();
+            ObjectUtility.SetDirty(this);
             isReadyOnlyListDirty = true;
             return item;
         }

Scripts/Runtime/ScriptableObjectCollection.cs

@@ -1,7 +1,7 @@
 {
   "name": "com.brunomikoski.scriptableobjectcollection",
   "displayName": "Scriptable Object Collection",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "unity": "2018.4",
   "description": "Scriptable Object Collection",
   "keywords": [
@@ -10,12 +10,12 @@
     "code generation"
   ],
   "category": "editor extensions",
-  "homepage": "https://github.com/badawe/ScriptableObjectCollection",
+  "homepage": "https://github.com/brunomikoski/ScriptableObjectCollection",
   "repository": {
     "type": "git",
-    "url": "https://github.com/badawe/ScriptableObjectCollection.git"
+    "url": "https://github.com/brunomikoski/ScriptableObjectCollection.git"
   },
-  "bugs": "https://github.com/badawe/ScriptableObjectCollection/issues",
+  "bugs": "https://github.com/brunomikoski/ScriptableObjectCollection/issues",
   "author": {
     "name": "Bruno Mikoski",
     "url": "https://www.brunomikoski.com"