Merge pull request #21 from GieziJo/SOData

Author: GieziJo

Editor/SOContextMenu.cs

@@ -8,9 +8,7 @@ namespace Giezi.Tools
 {
     public static class SOContextMenu
     {
-        private const string GieziToolsCreateSOvariantChildKey = "Giezi.Tools.CreateSoVariant.Child";
-        private const string GieziToolsCreateSOvariantParentKey = "Giezi.Tools.CreateSoVariant.Parent";
-
+        
         [MenuItem("Assets/Create/Create SO Variant", false, 2000)]
         static void CreateSOVariant()
         {
@@ -19,70 +17,38 @@ static void CreateSOVariant()
 
             string assetPath = AssetDatabase.GetAssetPath(activeObject);
             string newAssetPath = GetNewAssetName(assetPath);
-
+        
             ScriptableObject newAsset = ScriptableObject.CreateInstance(soType);
 
             AssetDatabase.CreateAsset(newAsset, newAssetPath);
             EditorUtility.SetDirty(newAsset);
 
-            PlayerPrefs.SetString(GieziToolsCreateSOvariantChildKey, newAssetPath);
-            PlayerPrefs.SetString(GieziToolsCreateSOvariantParentKey, assetPath);
+            SOVariantHelper<ScriptableObject>.SetParent(newAsset, (ScriptableObject)activeObject);
 
             AssetDatabase.SaveAssets();
-            
-            AssetDatabase.Refresh();
-            EditorUtility.RequestScriptReload();
         }
-
+        
         [MenuItem("Assets/Create/Create SO Variant", true)]
         static bool ValidateCreateSOVariant()
         {
             return (Selection.activeObject is ScriptableObject &&
                     Selection.activeObject.GetType().IsDefined(typeof(SOVariantAttribute), true));
         }
-
-        [UnityEditor.Callbacks.DidReloadScripts]
-        static void SetParentAfterReload()
-        {
-            if (!PlayerPrefs.HasKey(GieziToolsCreateSOvariantChildKey))
-                return;
-            
-            if(AssetImporter.GetAtPath(PlayerPrefs.GetString(GieziToolsCreateSOvariantChildKey)) == null)
-            {
-                Debug.Log("<color=orange>SOVariant: </color>Asset Importer does not exist yet, waiting for Unity to reload.");
-                return;
-            }
-            
-            ScriptableObject parent =
-                AssetDatabase.LoadAssetAtPath<ScriptableObject>(
-                    PlayerPrefs.GetString(GieziToolsCreateSOvariantParentKey));
-            
-            ScriptableObject child =
-                AssetDatabase.LoadAssetAtPath<ScriptableObject>(
-                    PlayerPrefs.GetString(GieziToolsCreateSOvariantChildKey));
-            
-            SOVariantHelper<ScriptableObject>.SetParent(child, parent);
-            
-            PlayerPrefs.DeleteKey(GieziToolsCreateSOvariantParentKey);
-            PlayerPrefs.DeleteKey(GieziToolsCreateSOvariantChildKey);
-            
-            Debug.Log($"<color=orange>SOVariant: </color>Created new SO Variant {child.name} with parent.");
-        }
-
+        
         private static string GetNewAssetName(string assetPath)
         {
             string newAssetPath = Path.Combine(Path.GetDirectoryName(assetPath),
                 Path.GetFileNameWithoutExtension(assetPath) + " Variant" + Path.GetExtension(assetPath));
-
+        
             int counter = 0;
-
+        
             while (AssetDatabase.LoadAssetAtPath<ScriptableObject>(newAssetPath) != null)
             {
                 counter++;
                 newAssetPath = Path.Combine(Path.GetDirectoryName(assetPath),
                     Path.GetFileNameWithoutExtension(assetPath) + " Variant_" + counter + Path.GetExtension(assetPath));
             }
-
+        
             return newAssetPath;
         }
     }

Editor/SOVFixer.cs

@@ -0,0 +1,60 @@
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+
+namespace Giezi.Tools
+{
+    public class SOVFixer
+    {
+        [MenuItem("Tools/GieziTools/SOVariant/Fix SOVs")]
+        public static void FixSOVs()
+        {
+            IEnumerable<ScriptableObject> scriptableObjects =
+                AssetDatabase.GetAllAssetPaths()
+                    .Where(s => s.EndsWith(".asset") && s.StartsWith("Assets/"))
+                    .Select(AssetDatabase.LoadAssetAtPath<ScriptableObject>)
+                    .Where(o => o != null)
+                    .Where(o => o.GetType().IsDefined(typeof(SOVariantAttribute), true));
+
+            var _library = SOVariantDataAccessor.SoVariantDataLibrary;
+            Dictionary<ScriptableObject, SOVariantData> _localLibrary = new();
+            foreach (ScriptableObject scriptableObject in scriptableObjects)
+            {
+                _localLibrary.Add(scriptableObject, _library.GetSOVariantDataForTarget(scriptableObject));
+            }
+
+            foreach (SOVariantData soVariantData in _localLibrary.Values)
+            {
+                soVariantData.Children = new List<ScriptableObject>();
+            }
+
+            foreach (KeyValuePair<ScriptableObject,SOVariantData> keyValuePair in _localLibrary)
+            {
+                if (keyValuePair.Value.Parent != null)
+                {
+                    _localLibrary[keyValuePair.Value.Parent].Children.Add(keyValuePair.Key);
+                }
+            }
+
+            foreach (KeyValuePair<ScriptableObject,SOVariantData> keyValuePair in _localLibrary)
+            {
+                _library.WriteToLibrary(keyValuePair.Key, keyValuePair.Value.Parent,
+                    keyValuePair.Value.Overridden, keyValuePair.Value.Children);
+            }
+
+            foreach (KeyValuePair<ScriptableObject,SOVariantData> keyValuePair in _localLibrary)
+            {
+                if (keyValuePair.Value.Children is { Count: > 0 })
+                {
+                    SOVariant<ScriptableObject> sov = new SOVariant<ScriptableObject>(keyValuePair.Key);
+                    sov.SaveData(keyValuePair.Value.Overridden);
+                }
+            }
+            
+            EditorUtility.SetDirty(_library);
+            AssetDatabase.SaveAssets();
+            AssetDatabase.Refresh();
+        }
+    }
+}