Allow editor values to cross 0 when propagation is on (rewrite of #81)

Co-Authored-By: Caraxi <[email protected]>

Author: RisaDev

CustomizePlus/Core/Data/BoneTransform.cs

@@ -71,11 +71,18 @@ internal void OnDeserialized(StreamingContext context)
         _scaling = ClampToDefaultLimits(_scaling);
     }
 
-    public bool IsEdited()
+    //"considerPropagationAsEdit" only should be true if you know what you are doing
+    //currently is here only to allow bones to be not removed when live editing is off in the editor and propagation is on on the bone
+    public bool IsEdited(bool considerPropagationAsEdit = false)
     {
+        bool propagation = false;
+        if (considerPropagationAsEdit)
+            propagation = PropagateTranslation || PropagateRotation || PropagateScale;
+
         return !Translation.IsApproximately(Vector3.Zero, 0.00001f)
                || !Rotation.IsApproximately(Vector3.Zero, 0.1f)
-               || !Scaling.IsApproximately(Vector3.One, 0.00001f);
+               || !Scaling.IsApproximately(Vector3.One, 0.00001f)
+               || propagation;
     }
 
     public BoneTransform DeepCopy()

CustomizePlus/Templates/Data/Template.cs

@@ -66,6 +66,9 @@ public Template(Template original) : this()
     {
         foreach (var kvp in original.Bones)
         {
+            if (!kvp.Value.IsEdited()) //do not copy unedited bones
+                continue;
+
             Bones[kvp.Key] = new BoneTransform();
             Bones[kvp.Key].UpdateToMatch(kvp.Value);
         }

CustomizePlus/Templates/TemplateManager.cs

@@ -67,7 +67,7 @@ public void LoadTemplates()
                 if (_templates.Any(f => f.UniqueId == template.UniqueId))
                     throw new Exception($"ID {template.UniqueId} was not unique.");
 
-                PruneIdempotentTransforms(template);
+                PruneUneditedBones(template);
 
                 _templates.Add(template);
             }
@@ -100,7 +100,7 @@ public Template Create(string name, Dictionary<string, BoneTransform>? bones, bo
         };
 
         if (template.Bones.Count > 0)
-            PruneIdempotentTransforms(template);
+            PruneUneditedBones(template);
 
         _templates.Add(template);
         _logger.Debug($"Added new template {template.UniqueId}.");
@@ -220,7 +220,7 @@ public bool ModifyBoneTransform(Template template, string boneName, BoneTransfor
             if (boneTransform == transform)
                 return false;
 
-            if (transform.IsEdited())
+            if (transform.IsEdited(true)) //true here to allow values of bones with propagations on to cross 0 during editing
             {
                 template.Bones[boneName].UpdateToMatch(transform);
 
@@ -240,7 +240,7 @@ public bool ModifyBoneTransform(Template template, string boneName, BoneTransfor
         else
         {
 
-            if (!transform.IsEdited())
+            if (!transform.IsEdited(true)) //true here to allow values of bones with propagations on to cross 0 during editing
                 return false;
 
             template.Bones[boneName] = new BoneTransform(transform);
@@ -263,7 +263,7 @@ private void DeleteBoneTransform(Template template, string boneName)
         _event.Invoke(TemplateChanged.Type.DeletedBone, template, boneName);
     }
 
-    private static void PruneIdempotentTransforms(Template template)
+    private void PruneUneditedBones(Template template)
     {
         foreach (var kvp in template.Bones)
         {
@@ -276,6 +276,8 @@ private static void PruneIdempotentTransforms(Template template)
 
     private void SaveTemplate(Template template)
     {
+        PruneUneditedBones(template);
+
         template.ModifiedDate = DateTimeOffset.UtcNow;
         _saveService.QueueSave(template);
     }