Merge pull request #7 from Gann4Life/dev

Fix undo when creating collisions
Gann4Life · Jul 12, 2023 · c45cfdd · c45cfdd
2 parents db06593 + b80f946
commit c45cfdd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/Gann4Games/Ragdoll Factory/Scripts/States/BoxColliderComponentState.cs b/Gann4Games/Ragdoll Factory/Scripts/States/BoxColliderComponentState.cs
@@ -35,17 +35,15 @@ public override void Create()
             collisionObject.transform.localPosition = Vector3.zero;
             collisionObject.transform.forward = objB.position - objA.position;
             collisionObject.transform.localScale = Vector3.one;
-            BoxCollider _selectedBoxCollider = Undo.AddComponent<BoxCollider>(collisionObject);
+            BoxCollider _selectedBoxCollider = collisionObject.AddComponent<BoxCollider>();
             _selectedBoxCollider.center = Vector3.forward * height;
             _selectedBoxCollider.size = new Vector3(Context.boxColliderWidth, Context.boxColliderDepth, distance);
 
             Context.boxColliderLength = height;
 
             Undo.RegisterCreatedObjectUndo(collisionObject, "Created Box Collider Object");
-            Undo.RegisterCompleteObjectUndo(Context, "Created Box Collider Object");
-
-
             Select(_selectedBoxCollider);
+            Undo.RegisterCompleteObjectUndo(Context, "Created Box Collider Object");
         }
 
         public override void ConvertTo(Component component)

diff --git a/Gann4Games/Ragdoll Factory/Scripts/States/CapsuleColliderComponentState.cs b/Gann4Games/Ragdoll Factory/Scripts/States/CapsuleColliderComponentState.cs
@@ -32,23 +32,23 @@ public override void Create()
             //     throw new Exception("The second bone must be child of the first bone!");
 
             float distance = Vector3.Distance(objA.position, objB.position);
-            
+
             GameObject collisionObject = new GameObject(objA.name + " - " + objB.name);
             collisionObject.transform.SetParent(objA);
             collisionObject.transform.localPosition = Vector3.zero;
             collisionObject.transform.forward = objB.position - objA.position;
             collisionObject.transform.localScale = Vector3.one;
-            CapsuleCollider selectedCapsuleCollider = Undo.AddComponent<CapsuleCollider>(collisionObject);
+            CapsuleCollider selectedCapsuleCollider = collisionObject.AddComponent<CapsuleCollider>();
             selectedCapsuleCollider.direction = 2;
             selectedCapsuleCollider.radius = Context.capsuleColliderRadius;
             selectedCapsuleCollider.center = Vector3.forward * distance / 2;
             selectedCapsuleCollider.height = distance + selectedCapsuleCollider.radius;
 
             Context.capsuleColliderLength = distance;
 
-            Undo.RegisterCompleteObjectUndo(Context, "Created Capsule Collider Object");
-
+            Undo.RegisterCreatedObjectUndo(collisionObject, "Created Capsule Collider Object");
             Select(selectedCapsuleCollider);
+            Undo.RegisterCompleteObjectUndo(Context, "Created Capsule Collider Object");
         }
 
         public override void ConvertTo(Component component)