Merge pull request #10 from GieziJo/9-on-parent-override-instead-of-resettin

On parent setter override instead of resetting

Author: GieziJo

Editor/SOVariant.cs

@@ -40,9 +40,9 @@ public SOVariant(T targetObject)
             LoadData(targetObject);
         }
 
-        public bool SetParent(T parent)
+        public bool SetParent(T parent, bool setToParentData = true)
         {
-            if (_target is null)
+            if (_target == null)
                 return false;
 
             if (parent)
@@ -71,16 +71,19 @@ public bool SetParent(T parent)
                 RemoveFromChildrenData(AssetImporter.GetAtPath(AssetDatabase.GetAssetPath(_parent)), targetGUID);
 
             this._parent = parent;
+            _overridden = new List<string>();
 
             if (parent)
             {
                 AddToChildrenData(AssetImporter.GetAtPath(AssetDatabase.GetAssetPath(parent)), targetGUID);
 
-                InitialiseNewParent();
+                if (setToParentData)
+                    SetAllFieldsToParent();
+                else
+                    InitialiseNewParentOverrides();
             }
 
-            _overridden = new List<string>();
-            SaveData(new List<string>());
+            SaveData(_overridden);
             return true;
         }
 
@@ -232,7 +235,7 @@ private List<string> DeserializeChildrenData(string data)
             return children;
         }
 
-        private void InitialiseNewParent()
+        private void SetAllFieldsToParent()
         {
             foreach (FieldInfo fieldInfo in FieldInfoHelper.GetAllFields(_parent.GetType()))
             {
@@ -241,6 +244,28 @@ private void InitialiseNewParent()
             }
         }
 
+        public void ResetAllFieldsToParentValue()
+        {
+            List<string> oldOverrides = new List<string>(_overridden);
+            _overridden.Clear();
+            
+            SetAllFieldsToParent();
+            
+            SaveData(_overridden, oldOverrides);
+        }
+
+        private void InitialiseNewParentOverrides()
+        {
+            foreach (FieldInfo fieldInfo in FieldInfoHelper.GetAllFields(_parent.GetType()))
+            {
+                object parentValue = FieldInfoHelper.GetFieldRecursively(_parent.GetType(), fieldInfo.Name).GetValue(_parent);
+                object targetValue = FieldInfoHelper.GetFieldRecursively(_target.GetType(), fieldInfo.Name).GetValue(_target);
+                
+                if(parentValue != targetValue)
+                    _overridden.Add(fieldInfo.Name);
+            }
+        }
+
         private void PropagateValuesToChildren(T target, string targetGUID, ref List<string> children,
             AssetImporter importer, List<string> changedValues)
         {

Editor/SOVariantAttributeProcessor.cs

@@ -31,7 +31,7 @@ public class SOVariantAttributeProcessor<T> : OdinPropertyProcessor<T> where T :
 
         void ParentSetter(T parent)
         {
-            if(!_soVariant.SetParent(parent))
+            if(!_soVariant.SetParent(parent, false))
                 return;
 
             _soVariant._overridden = null;
@@ -69,6 +69,7 @@ public override void ProcessMemberProperties(List<InspectorPropertyInfo> propert
 
                 if (_soVariant._parent != null)
                 {
+                    
                     _soVariant._otherSerializationBackend = new List<string>();
                     foreach (InspectorPropertyInfo propertyInfo in new List<InspectorPropertyInfo>(propertyInfos))
                     {
@@ -88,13 +89,23 @@ public override void ProcessMemberProperties(List<InspectorPropertyInfo> propert
                         // ! enable to debug
                         // propertyInfo.GetEditableAttributesList().Add(new ShowDrawerChainAttribute());
                     }
+                
+                    propertyInfos.AddDelegate("Reset all values to Original", () =>
+                    {
+                        _soVariant.ResetAllFieldsToParentValue();
+                        _soVariant._overridden = null;
+                        Property.RefreshSetup();
+                    });
+
+                    var propertyButton = propertyInfos.Last();
+                    propertyInfos.Insert(0, propertyButton);
+                    propertyInfos.RemoveAt(propertyInfos.Count - 1);
+                    propertyButton.GetEditableAttributesList().Add(bxa);
                 }
 
                 propertyInfos.AddValue("Original", () => _soVariant._parent, ParentSetter);
 
                 InspectorPropertyInfo parentPropertyInfo = propertyInfos.Last();
-
-
                 propertyInfos.Insert(0, parentPropertyInfo);
                 propertyInfos.RemoveAt(propertyInfos.Count - 1);
 

Editor/SOVariantHelper.cs

@@ -17,13 +17,13 @@ namespace Giezi.Tools
 {
     public static class SOVariantHelper<T> where T : ScriptableObject
     {
-        public static bool SetParent(T child, T parent)
+        public static bool SetParent(T child, T parent, bool setToParentValue=true)
         {
             AssertIsSOVariant(parent);
             AssertIsSOVariant(child);
 
             SOVariant<T> soVariant = new SOVariant<T>(child);
-            return soVariant.SetParent(parent);
+            return soVariant.SetParent(parent, setToParentValue);
         }
 
         public static void ChangeFieldOverrideState(T target, string name, bool isOverridden)
@@ -51,25 +51,25 @@ public static void SetFieldOverrideAndSetValue(T target, string name, object val
             soVariant.ChangeValue(name, value);   
         }
 
-        public static void SetParentOverrideValue(T child, T parent, string name, object value)
+        public static void SetParentOverrideValue(T child, T parent, string name, object value, bool setToParentValue=true)
         {
             AssertIsSOVariant(parent);
             AssertIsSOVariant(child);
 
             SOVariant<T> soVariant = new SOVariant<T>(child);
-            soVariant.SetParent(parent);
+            soVariant.SetParent(parent, setToParentValue);
 
             soVariant.NotifyOverrideChangeInState(name, true);
             soVariant.ChangeValue(name, value);
         }
 
-        public static void SetParentOverrideValues(T child, T parent, Dictionary<string, object> values)
+        public static void SetParentOverrideValues(T child, T parent, Dictionary<string, object> values, bool setToParentValue=true)
         {
             AssertIsSOVariant(parent);
             AssertIsSOVariant(child);
 
             SOVariant<T> soVariant = new SOVariant<T>(child);
-            soVariant.SetParent(parent);
+            soVariant.SetParent(parent, setToParentValue);
 
             foreach (KeyValuePair<string, object> value in values)
             {