add: Static access to collection values

Author: brunomikoski

Scripts/Editor/Utils/CodeGenerationUtility.cs

@@ -239,8 +239,8 @@ private static string[] GetCollectionDirectives(ScriptableObjectCollection colle
         private static void WriteTryGetAccessCollectionStatic(ScriptableObjectCollection collection, StreamWriter writer,
             ref int indentation)
         {
-            string cachedValuesName = $"collection";
-            string valuesName = $"Collection";
+            string cachedValuesName = $"values";
+            string valuesName = $"Values";
             string tryGetValuesName = $"TryGet{valuesName}";
 
             AppendLine(writer, indentation, $"private static {collection.GetType().Name} {cachedValuesName};");
@@ -336,7 +336,7 @@ private static void WriteDirectAccessCollectionStatic(ScriptableObjectCollection
         {
             bool isGeneratingCustomStaticFile = ScriptableObjectCollectionSettings.Instance.IsGeneratingCustomStaticFile(collection);
 
-            string cachedValuesName = "collection";
+            string cachedValuesName = "values";
             AppendLine(writer, indentation, $"private static {collection.GetType().Name} {cachedValuesName};");
 
             for (int i = 0; i < collection.Items.Count; i++)
@@ -348,12 +348,12 @@ private static void WriteDirectAccessCollectionStatic(ScriptableObjectCollection
 
             AppendLine(writer, indentation);
 
-            string valuesName = $"Collection";
+            string valuesName = $"Values";
 
             if(!isGeneratingCustomStaticFile)
             {
                 AppendLine(writer, indentation,
-                $"public new static {collection.GetType().Name} {valuesName}");
+                $"public static {collection.GetType().Name} {valuesName}");
             }
             else
             {

Scripts/Runtime/CollectableScriptableObject.cs

@@ -19,7 +19,7 @@ public string GUID
         [SerializeField, HideInInspector]
         private ScriptableObjectCollection collection;
         public ScriptableObjectCollection Collection => collection;
-
+        
         public void SetCollection(ScriptableObjectCollection collection)
         {
             this.collection = collection;

Scripts/Runtime/CollectionsRegistry.cs

@@ -86,6 +86,7 @@ private void ValidateCurrentGUIDs()
             }
         }
 
+        
         public ScriptableObjectCollection GetCollectionByGUID(string guid)
         {
             for (int i = 0; i < collections.Count; i++)
@@ -113,19 +114,32 @@ public bool TryGetCollection<T>(out T resultCollection) where T: ScriptableObjec
             return false;
         }
 
-        
-        public bool TryGetCollectionForType(Type targetCollectionType, out ScriptableObjectCollection scriptableObjectCollection)
+
+        public bool TryGetCollectionForType(Type targetType, 
+            out ScriptableObjectCollection scriptableObjectCollection)
         {
             for (int i = 0; i < collections.Count; i++)
             {
                 ScriptableObjectCollection collection = collections[i];
-                if (collection.GetCollectionType() == targetCollectionType 
-                    || targetCollectionType.BaseType == collection.GetCollectionType())
+                if(collection.GetCollectionType() == targetType
+                   || targetType.BaseType == collection.GetCollectionType())
                 {
                     scriptableObjectCollection = collection;
                     return true;
                 }
             }
+            
+            scriptableObjectCollection = null;
+            return false;
+        }
+
+        public bool TryGetCollectionForType<TargetType>(out ScriptableObjectCollection<TargetType> scriptableObjectCollection) where TargetType : CollectableScriptableObject
+        {
+            if (TryGetCollectionForType(typeof(TargetType), out ScriptableObjectCollection resultCollection))
+            {
+                scriptableObjectCollection = (ScriptableObjectCollection<TargetType>) resultCollection;
+                return true;
+            }
 
             scriptableObjectCollection = null;
             return false;
@@ -247,6 +261,7 @@ public void PrepareForEditorMode()
         }
 
 #endif
+
     }
 }
 

Scripts/Runtime/ScriptableObjectCollection.cs

@@ -377,21 +377,20 @@ internal void PrepareForEditorMode()
     public class ScriptableObjectCollection<ObjectType> : ScriptableObjectCollection, IList<ObjectType>
         where ObjectType : CollectableScriptableObject
     {
-        
-        [NonSerialized]
-        private bool isReadyOnlyListDirty = true;
-
-        private IReadOnlyList<ObjectType> readOnlyList = new List<ObjectType>();
-        public new IReadOnlyList<ObjectType> Items
+        private static ScriptableObjectCollection<ObjectType> instance;
+        public static ScriptableObjectCollection<ObjectType> Values
         {
             get
             {
-                if (isReadyOnlyListDirty)
+                if (instance == null)
                 {
-                    readOnlyList = items.Cast<ObjectType>().ToList().AsReadOnly();
-                    isReadyOnlyListDirty = false;
+                    if (CollectionsRegistry.Instance.TryGetCollectionForType(out ScriptableObjectCollection<ObjectType> result))
+                    {
+                        instance = result;
+                    }
                 }
-                return readOnlyList;
+                
+                return instance;
             }
         }
 
@@ -428,13 +427,11 @@ public ObjectType GetCollectableByGUID(string targetGUID)
         public void Add(ObjectType item)
         {
             base.Add(item);
-            isReadyOnlyListDirty = true;
         }
 
         public ObjectType Add(Type itemType = null)
         {
             ObjectType collectableScriptableObject = base.Add(itemType) as ObjectType;
-            isReadyOnlyListDirty = true;
             return collectableScriptableObject;
         }
 
@@ -456,13 +453,11 @@ public int IndexOf(ObjectType item)
         public void Insert(int index, ObjectType item)
         {
             base.Insert(index, item);
-            isReadyOnlyListDirty = true;
         }
 
         public bool Remove(ObjectType item)
         {
             bool remove = base.Remove(item);
-            isReadyOnlyListDirty = true;
             return remove;
         }