Merge pull request #9 from kxn4t/add-undo-for-material-swap

add Undo support in Material Swap

Author: kxn4t

Editor/MaterialSwapHelper/MaterialSwapGenerator.cs

@@ -39,6 +39,10 @@ public static GenerationResult CreateMaterialSwap(GameObject targetRoot, CopiedM
 
             try
             {
+                // Set up Undo group for this operation
+                Undo.SetCurrentGroupName("Create Material Swap");
+                int undoGroup = Undo.GetCurrentGroup();
+
                 var (colorMenu, isNewMenu) = EnsureColorMenu(targetRoot);
                 var groups = MaterialSwapHelperSession.GetCopiedDataGroups();
 
@@ -97,6 +101,9 @@ public static GenerationResult CreateMaterialSwap(GameObject targetRoot, CopiedM
 
                 EditorUtility.SetDirty(targetRoot);
 
+                // Collapse all Undo operations into a single operation
+                Undo.CollapseUndoOperations(undoGroup);
+
                 string resultMessage = isNewMenu
                     ? $"Created Color Menu with {groups.Count} color variations (Color{startingColorNumber}-Color{startingColorNumber + groups.Count - 1})"
                     : $"Added {groups.Count} color variations (Color{startingColorNumber}-Color{startingColorNumber + groups.Count - 1})";
@@ -128,6 +135,10 @@ public static GenerationResult CreateMaterialSwapPerObject(GameObject targetRoot
 
             try
             {
+                // Set up Undo group for this operation
+                Undo.SetCurrentGroupName("Create Material Swap Per Object");
+                int undoGroup = Undo.GetCurrentGroup();
+
                 var (colorMenu, isNewMenu) = EnsureColorMenu(targetRoot);
                 var groups = MaterialSwapHelperSession.GetCopiedDataGroups();
 
@@ -154,8 +165,11 @@ public static GenerationResult CreateMaterialSwapPerObject(GameObject targetRoot
                     var colorVariation = new GameObject(colorName);
                     colorVariation.transform.SetParent(colorMenu, false);
 
+                    // Register the created GameObject with Undo system
+                    Undo.RegisterCreatedObjectUndo(colorVariation, "Create Color Variation");
+
 #if MODULAR_AVATAR_INSTALLED
-                    var menuItem = colorVariation.AddComponent<ModularAvatarMenuItem>();
+                    var menuItem = Undo.AddComponent<ModularAvatarMenuItem>(colorVariation);
                     ModularAvatarIntegration.ConfigureMenuItemAsToggle(menuItem, colorName, colorNumber, targetRoot.name);
 #endif
                     createdVariations.Add(colorVariation);
@@ -192,6 +206,9 @@ public static GenerationResult CreateMaterialSwapPerObject(GameObject targetRoot
 
                 EditorUtility.SetDirty(targetRoot);
 
+                // Collapse all Undo operations into a single operation
+                Undo.CollapseUndoOperations(undoGroup);
+
                 string resultMessage = isNewMenu
                     ? $"Created Color Menu with {groups.Count} color variations (per-object components)"
                     : $"Added {groups.Count} color variations with per-object components";
@@ -310,8 +327,11 @@ private static (GameObject colorVariation, int nextColorNumber, string newColorN
                 colorVariation = new GameObject(newColorName);
                 colorVariation.transform.SetParent(colorMenu, false);
 
+                // Register the created GameObject with Undo system
+                Undo.RegisterCreatedObjectUndo(colorVariation, "Create Color Variation");
+
 #if MODULAR_AVATAR_INSTALLED
-                var menuItem = colorVariation.AddComponent<ModularAvatarMenuItem>();
+                var menuItem = Undo.AddComponent<ModularAvatarMenuItem>(colorVariation);
                 ModularAvatarIntegration.ConfigureMenuItemAsToggle(menuItem, newColorName, nextColorNumber, gameObjectName);
 #endif
             }

Editor/MaterialSwapHelper/ModularAvatarIntegration.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
+using UnityEditor;
 
 #if MODULAR_AVATAR_INSTALLED
 using System.Reflection;
@@ -105,11 +106,14 @@ public static GameObject CreateColorMenu(GameObject parent, string menuName)
             var colorMenu = new GameObject(menuName);
             colorMenu.transform.SetParent(parent.transform, false);
 
+            // Register the created GameObject with Undo system
+            Undo.RegisterCreatedObjectUndo(colorMenu, "Create Color Menu");
+
             // Add Menu Installer
-            var menuInstaller = colorMenu.AddComponent<ModularAvatarMenuInstaller>();
+            var menuInstaller = Undo.AddComponent<ModularAvatarMenuInstaller>(colorMenu);
 
             // Add Menu Item
-            var menuItem = colorMenu.AddComponent<ModularAvatarMenuItem>();
+            var menuItem = Undo.AddComponent<ModularAvatarMenuItem>(colorMenu);
             ConfigureMenuItemAsSubmenu(menuItem, menuName);
 
             return colorMenu;
@@ -123,11 +127,14 @@ public static GameObject CreateColorVariation(Transform parent, string name, int
             var colorVariation = new GameObject(name);
             colorVariation.transform.SetParent(parent, false);
 
+            // Register the created GameObject with Undo system
+            Undo.RegisterCreatedObjectUndo(colorVariation, "Create Color Variation");
+
             // Add Material Swap component
-            var materialSwap = colorVariation.AddComponent<ModularAvatarMaterialSwap>();
+            var materialSwap = Undo.AddComponent<ModularAvatarMaterialSwap>(colorVariation);
 
             // Add Menu Item component
-            var menuItem = colorVariation.AddComponent<ModularAvatarMenuItem>();
+            var menuItem = Undo.AddComponent<ModularAvatarMenuItem>(colorVariation);
             ConfigureMenuItemAsToggle(menuItem, name, colorNumber, gameObjectName);
 
             return colorVariation;
@@ -141,6 +148,9 @@ public static void SetupMaterialSwap(GameObject swapObject, GameObject rootObjec
             var materialSwap = swapObject.GetComponent<ModularAvatarMaterialSwap>();
             if (materialSwap == null) return;
 
+            // Record the object before modifying it
+            Undo.RecordObject(materialSwap, "Setup Material Swap");
+
             // Set root reference
             materialSwap.Root.Set(rootObject);
 
@@ -158,7 +168,7 @@ public static void SetupMaterialSwap(GameObject swapObject, GameObject rootObjec
         public static ModularAvatarMaterialSwap AddMaterialSwapComponentToObject(GameObject colorVariation, GameObject targetObject, List<(Material from, Material to)> swaps)
         {
             // Add Material Swap component directly to the colorVariation object
-            var materialSwap = colorVariation.AddComponent<ModularAvatarMaterialSwap>();
+            var materialSwap = Undo.AddComponent<ModularAvatarMaterialSwap>(colorVariation);
 
             // Set target object reference
             materialSwap.Root.Set(targetObject);