Merge pull request #24 from badawe/feature/fix-generation-of-indirect

Feature/fix generation of indirect

Author: brunomikoski

CHANGELOG.MD

@@ -4,6 +4,7 @@ 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.2.0]
 ## Changed
  - Fixed issue with the wizzard that was not generating the target Scriptable Object
@@ -107,6 +108,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
  - Add a setup wizzard for first time settings creation
 
+[1.2.1]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.2.1
 [1.2.0]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.2.0
 [1.1.9]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.1.9
 [1.1.8]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.1.8

Scripts/Editor/CollectableIndirectReferenceDrawer.cs

@@ -1,4 +1,3 @@
-using BrunoMikoski.ScriptableObjectCollections.Core;
 using UnityEditor;
 using UnityEngine;
 
@@ -7,31 +6,48 @@ namespace BrunoMikoski.ScriptableObjectCollections
     [CustomPropertyDrawer(typeof(CollectableIndirectReference), true)]
     public sealed class CollectableIndirectReferenceDrawer : PropertyDrawer
     {
-        private const string EDITOR_ASSET_PROPERTY_PATH = "editorAsset";
+        private const string OBJECT_ASSET_PROPERTY_PATH = "editorAsset";
         private const string COLLECTABLE_GUID_PROPERTY_PATH = "collectableGUID";
         private const string COLLECTION_GUID_PROPERTY_PATh = "collectionGUID";
 
 
-        private SerializedProperty editorAssetproperty;
+        private SerializedProperty objectAssetProperty;
         private SerializedProperty collectableGUIDProperty;
         private SerializedProperty collectionGUIDProperty;
 
+        private CollectableScriptableObject collectableScriptableObject;
+        
         public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
         {
-            editorAssetproperty = property.FindPropertyRelative(EDITOR_ASSET_PROPERTY_PATH);
+            objectAssetProperty = property.FindPropertyRelative(OBJECT_ASSET_PROPERTY_PATH);
             collectableGUIDProperty = property.FindPropertyRelative(COLLECTABLE_GUID_PROPERTY_PATH);
             collectionGUIDProperty = property.FindPropertyRelative(COLLECTION_GUID_PROPERTY_PATh);
 
+            if (objectAssetProperty.exposedReferenceValue == null
+                && !string.IsNullOrEmpty(collectableGUIDProperty.stringValue)
+                && !string.IsNullOrEmpty(collectionGUIDProperty.stringValue))
+            {
+                if (CollectionsRegistry.Instance.TryGetCollectionByGUID(collectionGUIDProperty.stringValue,
+                    out ScriptableObjectCollection collection))
+                {
+                    if (collection.TryGetCollectableByGUID(collectableGUIDProperty.stringValue,
+                        out CollectableScriptableObject collectable))
+                    {
+                        objectAssetProperty.objectReferenceValue = collectable;
+                    }
+                }
+            }
+            
             using (EditorGUI.ChangeCheckScope scope = new EditorGUI.ChangeCheckScope())
             {
-                EditorGUI.PropertyField(position, editorAssetproperty, label, true);
+                EditorGUI.PropertyField(position, objectAssetProperty, label, true);
 
                 if (scope.changed)
                 {
                     string collectableGUID = string.Empty;
                     string collectionGUID = string.Empty;
 
-                    if (editorAssetproperty.objectReferenceValue != null && editorAssetproperty.objectReferenceValue is CollectableScriptableObject collectable)
+                    if (objectAssetProperty.objectReferenceValue != null && objectAssetProperty.objectReferenceValue is CollectableScriptableObject collectable)
                     {
                         collectableGUID = collectable.GUID;
                         collectionGUID = collectable.Collection.GUID;

Scripts/Editor/CollectableScriptableObjectPropertyDrawer.cs

@@ -145,7 +145,6 @@ private void Initialize(SerializedProperty property)
                 collectableType = arrayOrListType;
             else
                 collectableType = fieldInfo.FieldType;
-
 
             if (!CollectionsRegistry.Instance.TryGetCollectionForType(collectableType,
                 out ScriptableObjectCollection resultCollection))

Scripts/Editor/CreateCollectionWizzard.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using UnityEditor;
 using UnityEditor.Callbacks;
 using UnityEditor.Compilation;
@@ -227,12 +229,37 @@ private void CreateIndirectAccess()
             if (createFoldForThisCollectionScripts)
                 folderPath = Path.Combine(folderPath, $"{collectionName}");
 
-            CodeGenerationUtility.CreateNewEmptyScript($"{collectableName}IndirectReference", 
-                folderPath,
-                TargetNameSpace, 
-                "[Serializable]",
-                $"public sealed class {collectableName}IndirectReference : CollectableIndirectReference<{collectableName}>",
-                typeof(CollectableScriptableObject).Namespace, TargetNameSpace, "System");
+            string fileName = $"{collectableName}IndirectReference";
+
+            AssetDatabaseUtils.CreatePathIfDontExist(folderPath);
+            using (StreamWriter writer = new StreamWriter(Path.Combine(folderPath, $"{fileName}.cs")))
+            {
+                int indentation = 0;
+                List<string> directives = new List<string>();
+                directives.Add(typeof(CollectableScriptableObject).Namespace);
+                directives.Add(TargetNameSpace);
+                directives.Add("System");
+                directives.Add("UnityEngine");
+
+                CodeGenerationUtility.AppendHeader(writer, ref indentation, TargetNameSpace, "[Serializable]",
+                    $"public sealed class {collectableName}IndirectReference : CollectableIndirectReference<{collectableName}>",
+                    directives.Distinct().ToArray());
+
+                CodeGenerationUtility.AppendLine(writer, 0,
+                    $"#if UNITY_EDITOR");
+                
+                CodeGenerationUtility.AppendLine(writer, indentation,
+                    $"[SerializeField]");
+                
+                CodeGenerationUtility.AppendLine(writer, indentation,
+                    $"private {collectableName} editorAsset;");
+                
+                CodeGenerationUtility.AppendLine(writer, 0,
+                    $"#endif");
+                
+                indentation--;
+                CodeGenerationUtility.AppendFooter(writer, ref indentation, TargetNameSpace);
+            }
         }
 
         private string CreateCollectionObject()

Scripts/Editor/Utils/CodeGenerationUtility.cs

@@ -65,7 +65,7 @@ private static string GetIndentation(int identation)
             return stringBuilder.ToString();
         }
 
-        public static void AppendHeader(StreamWriter writer, ref int identation, string nameSpace, string className,
+        public static void AppendHeader(StreamWriter writer, ref int identation, string nameSpace, string classAttributes, string className,
             bool isPartial, bool isStatic, params string[] directives)
         {
             writer.WriteLine("//  Automatically generated");
@@ -92,6 +92,9 @@ public static void AppendHeader(StreamWriter writer, ref int identation, string
                 identation++;
             }
 
+            if (!string.IsNullOrEmpty(classAttributes))
+                writer.WriteLine($"{GetIndentation(identation)}{classAttributes}");
+            
             string finalClassDeclaration = "";
             finalClassDeclaration += GetIndentation(identation);
             finalClassDeclaration += "public ";
@@ -109,6 +112,43 @@ public static void AppendHeader(StreamWriter writer, ref int identation, string
 
             identation++;
         }
+        
+        
+        public static void AppendHeader(StreamWriter writer, ref int identation, string nameSpace, string classAttributes, string classDeclaration, params string[] directives)
+        {
+            writer.WriteLine("//  Automatically generated");
+            writer.WriteLine("//");
+            writer.WriteLine();
+            for (int i = 0; i < directives.Length; i++)
+            {
+                string directive = directives[i];
+
+                if (string.IsNullOrEmpty(directive))
+                    continue;
+                
+                writer.WriteLine($"using {directive};");
+            }
+
+            writer.WriteLine();
+
+            bool hasNameSpace = !string.IsNullOrEmpty(nameSpace);
+            if (hasNameSpace)
+            {
+                writer.WriteLine($"namespace {nameSpace}");
+                writer.WriteLine("{");
+
+                identation++;
+            }
+
+            if (!string.IsNullOrEmpty(classAttributes))
+                writer.WriteLine($"{GetIndentation(identation)}{classAttributes}");
+
+            writer.WriteLine($"{GetIndentation(identation)}{classDeclaration}");
+            writer.WriteLine(GetIndentation(identation) + "{");
+
+            identation++;
+        }
+        
 
         public static void AppendLine(StreamWriter writer, int identation, string input = "")
         {
@@ -157,7 +197,7 @@ public static void GenerateStaticCollectionScript(ScriptableObjectCollection col
                 directives.Add(collection.GetType().Namespace);
                 directives.AddRange(GetCollectionDirectives(collection));
 
-                AppendHeader(writer, ref indentation, nameSpace,
+                AppendHeader(writer, ref indentation, nameSpace,"",
                     collection.GetCollectionType().Name, true, false, directives.Distinct().ToArray());
 
                 GeneratedStaticFileType staticFileTypeForCollection = ScriptableObjectCollectionSettings.Instance.GetStaticFileTypeForCollection(collection);

Scripts/Runtime/CollectableIndirectReference.cs

@@ -4,28 +4,24 @@
 namespace BrunoMikoski.ScriptableObjectCollections
 {
     [Serializable]
-    public class CollectableIndirectReference
+    public abstract class CollectableIndirectReference
     {
 #pragma warning disable 0649
         [SerializeField]
         private string name;
 #pragma warning restore 0649
 
         [SerializeField]
-        protected string collectableGUID = String.Empty;
+        protected string collectableGUID;
 
         [SerializeField]
         protected string collectionGUID;
-    }
+    }                                                                      
 
     [Serializable]
-    public class CollectableIndirectReference<TObject> : CollectableIndirectReference
+    public abstract class CollectableIndirectReference<TObject> : CollectableIndirectReference
         where TObject : CollectableScriptableObject
     {
-#if UNITY_EDITOR
-        [SerializeField]
-        private TObject editorAsset;
-#endif
         [NonSerialized]
         private TObject cachedRef;
         public TObject Ref
@@ -35,10 +31,10 @@ public TObject Ref
                 if (cachedRef != null)
                     return cachedRef;
 
-                if (CollectionsRegistry.Instance.TryGetCollectionByGUID(collectableGUID,
+                if (CollectionsRegistry.Instance.TryGetCollectionByGUID(collectionGUID,
                     out ScriptableObjectCollection<TObject> collection))
                 {
-                    if (collection.TryGetCollectableByGUID(collectionGUID,
+                    if (collection.TryGetCollectableByGUID(collectableGUID,
                         out CollectableScriptableObject collectable))
                     {
                         cachedRef = collectable as TObject;
@@ -53,9 +49,6 @@ public void FromCollectable(CollectableScriptableObject collectableScriptableObj
         {
             collectableGUID = collectableScriptableObject.GUID;
             collectionGUID = collectableScriptableObject.Collection.GUID;
-#if UNITY_EDITOR
-            editorAsset = collectableScriptableObject as TObject;
-#endif
         }
     }
 }