Fix #86 issues

midona-rhel · web-flow · commit 2220e3744ab6 · 2025-11-22T22:35:37.000+03:00
diff --git a/CustomizePlus/Api/CustomizePlusIpc.Profile.cs b/CustomizePlus/Api/CustomizePlusIpc.Profile.cs
@@ -240,7 +240,7 @@ private int SetProfilePriorityByUniqueId(Guid uniqueId, int priority)
                 kvp.Value.PropagateRotation,
                 kvp.Value.PropagateScale,
                 kvp.Value.ChildScaling,
-                kvp.Value.ChildScalingLinked)).ToList();
+                kvp.Value.ChildScalingIndependent)).ToList();
 
             list.Add(
                 new IPCTemplateStatusTuple(
diff --git a/CustomizePlus/Api/Data/IPCCharacterProfile.cs b/CustomizePlus/Api/Data/IPCCharacterProfile.cs
@@ -39,7 +39,7 @@ public static IPCCharacterProfile FromFullProfile(Profile profile)
                     Rotation = kvPair.Value.Rotation,
                     Scaling = kvPair.Value.Scaling,
                     ChildScaling = kvPair.Value.ChildScaling,
-                    ChildScaleLinked = kvPair.Value.ChildScalingLinked,
+                    ChildScaleIndependent = kvPair.Value.ChildScalingIndependent,
                     PropagateTranslation = kvPair.Value.PropagateTranslation,
                     PropagateRotation = kvPair.Value.PropagateRotation,
                     PropagateScale = kvPair.Value.PropagateScale
@@ -82,7 +82,7 @@ public static (Profile, Template) ToFullProfile(IPCCharacterProfile profile, boo
                     Rotation = kvPair.Value.Rotation,
                     Scaling = kvPair.Value.Scaling,
                     ChildScaling = kvPair.Value.ChildScaling,
-                    ChildScalingLinked = kvPair.Value.ChildScaleLinked,
+                    ChildScalingIndependent = kvPair.Value.ChildScaleIndependent,
                     PropagateTranslation = kvPair.Value.PropagateTranslation,
                     PropagateRotation = kvPair.Value.PropagateRotation,
                     PropagateScale = kvPair.Value.PropagateScale
@@ -139,7 +139,7 @@ public Vector3 ChildScaling
     /// </summary>
     public bool PropagateScale { get; set; }
 
-    public bool ChildScaleLinked { get; set; } = false;
+    public bool ChildScaleIndependent { get; set; } = false;
 
     /// <summary>
     /// Clamp all vector values to be within allowed limits.
diff --git a/CustomizePlus/Api/Data/Tuples.cs b/CustomizePlus/Api/Data/Tuples.cs
@@ -36,10 +36,10 @@
     bool PropagateRotation,
     bool PropagateScale,
     System.Numerics.Vector3 ChildScale,
-    bool ChildScaleLinked);
+    bool ChildScaleIndependent);
 
 global using IPCTemplateStatusTuple = (
     System.Guid UniqueId,
     string Name,
-    System.Collections.Generic.List<(string Name, System.Numerics.Vector3 Translation, System.Numerics.Vector3 Rotation, System.Numerics.Vector3 Scale, bool PropagateTranslation, bool PropagateRotation, bool PropagateScale, System.Numerics.Vector3 ChildScale, bool ChildScaleLinked)> Bones,
+    System.Collections.Generic.List<(string Name, System.Numerics.Vector3 Translation, System.Numerics.Vector3 Rotation, System.Numerics.Vector3 Scale, bool PropagateTranslation, bool PropagateRotation, bool PropagateScale, System.Numerics.Vector3 ChildScale, bool ChildScaleIndependent)> Bones,
     bool IsEnabled);    
diff --git a/CustomizePlus/Armatures/Data/ModelBone.cs b/CustomizePlus/Armatures/Data/ModelBone.cs
@@ -335,7 +335,7 @@ public void ApplyModelTransform(CharacterBase* cBase)
 
         var childScaleToUse = access2->Scale.ToVector3();
 
-        if (!CustomizedTransform.ChildScalingLinked)
+        if (CustomizedTransform.ChildScalingIndependent)
         {
             childScaleToUse = new Vector3(
                 initialScale.X * CustomizedTransform.ChildScaling.X,
@@ -346,7 +346,7 @@ public void ApplyModelTransform(CharacterBase* cBase)
 
         var shouldPropagateScale = CustomizedTransform.PropagateScale &&
             (!CustomizedTransform.Scaling.Equals(Vector3.One) ||
-             (!CustomizedTransform.ChildScalingLinked && !CustomizedTransform.ChildScaling.Equals(Vector3.One)));
+             (CustomizedTransform.ChildScalingIndependent && !CustomizedTransform.ChildScaling.Equals(Vector3.One)));
 
         PropagateChildren(cBase, access2, initialPos, initialRot, initialScale,
             CustomizedTransform.PropagateTranslation && !CustomizedTransform.Translation.Equals(Vector3.Zero),
diff --git a/CustomizePlus/Core/Data/BoneTransform.cs b/CustomizePlus/Core/Data/BoneTransform.cs
@@ -70,9 +70,9 @@ public Vector3 ChildScaling
     public bool PropagateTranslation = false;
     public bool PropagateRotation = false;
     public bool PropagateScale = false;
-    public bool ChildScalingLinked = true;
+    public bool ChildScalingIndependent = false;
 
-    public bool ShouldSerializeChildScaling() => !ChildScalingLinked;
+    public bool ShouldSerializeChildScaling() => ChildScalingIndependent;
 
     [OnDeserialized]
     internal void OnDeserialized(StreamingContext context)
@@ -82,7 +82,7 @@ internal void OnDeserialized(StreamingContext context)
         _rotation = ClampAngles(_rotation);
         _scaling = ClampToDefaultLimits(_scaling);
 
-        if (_childScaling == Vector3.Zero && ChildScalingLinked)
+        if (_childScaling == Vector3.Zero && !ChildScalingIndependent)
             _childScaling = Vector3.One;
         else
             _childScaling = ClampToDefaultLimits(_childScaling);
@@ -99,7 +99,7 @@ public bool IsEdited(bool considerPropagationAsEdit = false)
         return !Translation.IsApproximately(Vector3.Zero, 0.00001f)
                || !Rotation.IsApproximately(Vector3.Zero, 0.1f)
                || !Scaling.IsApproximately(Vector3.One, 0.00001f)
-               || (!ChildScalingLinked && !ChildScaling.IsApproximately(Vector3.One, 0.00001f))
+               || (ChildScalingIndependent && !ChildScaling.IsApproximately(Vector3.One, 0.00001f))
                || propagation;
     }
 
@@ -114,7 +114,7 @@ public BoneTransform DeepCopy()
             PropagateRotation = PropagateRotation,
             PropagateScale = PropagateScale,
             ChildScaling = ChildScaling,
-            ChildScalingLinked = ChildScalingLinked
+            ChildScalingIndependent = ChildScalingIndependent
         };
     }
 
@@ -141,7 +141,7 @@ public void UpdateAttribute(BoneAttribute which, Vector3 newValue, bool shouldPr
             if (!shouldPropagate)
             {
                 ChildScaling = Vector3.One;
-                ChildScalingLinked = true;
+                ChildScalingIndependent = false;
             }
         }
     }
@@ -155,7 +155,7 @@ public void UpdateToMatch(BoneTransform newValues)
         PropagateTranslation = newValues.PropagateTranslation;
         PropagateRotation = newValues.PropagateRotation;
         PropagateScale = newValues.PropagateScale;
-        ChildScalingLinked = newValues.ChildScalingLinked;
+        ChildScalingIndependent = newValues.ChildScalingIndependent;
     }
 
     /// <summary>
@@ -173,7 +173,7 @@ public BoneTransform GetStandardReflection()
             PropagateTranslation = PropagateTranslation,
             PropagateRotation = PropagateRotation,
             PropagateScale = PropagateScale,
-            ChildScalingLinked = ChildScalingLinked
+            ChildScalingIndependent = ChildScalingIndependent
         };
     }
 
@@ -192,7 +192,7 @@ public BoneTransform GetSpecialReflection()
             PropagateTranslation = PropagateTranslation,
             PropagateRotation = PropagateRotation,
             PropagateScale = PropagateScale,
-            ChildScalingLinked = ChildScalingLinked
+            ChildScalingIndependent = ChildScalingIndependent
         };
     }
 
diff --git a/CustomizePlus/Core/Helpers/Base64Helper.cs b/CustomizePlus/Core/Helpers/Base64Helper.cs
@@ -17,7 +17,7 @@ public class BoneTransformData // literally not cooking
     public Vector3 Rotation { get; set; }
     public Vector3 Scaling { get; set; }
     public Vector3 ChildScaling { get; set; }
-    public bool ChildScalingLinked { get; set; }
+    public bool ChildScalingIndependent { get; set; }
     public bool PropagateTranslation { get; set; }
     public bool PropagateRotation { get; set; }
     public bool PropagateScale { get; set; }
@@ -87,7 +87,7 @@ public static string ExportEditedBonesToBase64(IEnumerable<(string BoneCodeName,
                 Rotation = b.Transform.Rotation,
                 Scaling = b.Transform.Scaling,
                 ChildScaling = b.Transform.ChildScaling,
-                ChildScalingLinked = b.Transform.ChildScalingLinked,
+                ChildScalingIndependent = b.Transform.ChildScalingIndependent,
                 PropagateTranslation = b.Transform.PropagateTranslation,
                 PropagateRotation = b.Transform.PropagateRotation,
                 PropagateScale = b.Transform.PropagateScale
diff --git a/CustomizePlus/Templates/TemplateEditorManager.cs b/CustomizePlus/Templates/TemplateEditorManager.cs
@@ -256,7 +256,7 @@ public bool ResetBoneAttributeChanges(string boneName, BoneAttribute attribute)
                 if ((resetValue == CurrentlyEditedTemplate!.Bones[boneName].Scaling) &&
                     (defaultPropagationState == CurrentlyEditedTemplate!.Bones[boneName].PropagateScale) &&
                     (Vector3.One == CurrentlyEditedTemplate!.Bones[boneName].ChildScaling) &&
-                    (true == CurrentlyEditedTemplate!.Bones[boneName].ChildScalingLinked))
+                    (false == CurrentlyEditedTemplate!.Bones[boneName].ChildScalingIndependent))
                     return false;
                 break;
         }
@@ -306,15 +306,15 @@ public bool RevertBoneAttributeChanges(string boneName, BoneAttribute attribute)
                     originalValue = _currentlyEditedTemplateOriginal.Bones[boneName].Scaling;
                     originalPropagationState = _currentlyEditedTemplateOriginal.Bones[boneName].PropagateScale;
                     var originalChildScaling = _currentlyEditedTemplateOriginal.Bones[boneName].ChildScaling;
-                    var originalChildScalingLinked = _currentlyEditedTemplateOriginal.Bones[boneName].ChildScalingLinked;
+                    var originalChildScalingIndependent = _currentlyEditedTemplateOriginal.Bones[boneName].ChildScalingIndependent;
                     if ((originalValue == CurrentlyEditedTemplate!.Bones[boneName].Scaling) &&
                         (originalPropagationState == CurrentlyEditedTemplate!.Bones[boneName].PropagateScale) &&
                         (originalChildScaling == CurrentlyEditedTemplate!.Bones[boneName].ChildScaling) &&
-                        (originalChildScalingLinked == CurrentlyEditedTemplate!.Bones[boneName].ChildScalingLinked))
+                        (originalChildScalingIndependent == CurrentlyEditedTemplate!.Bones[boneName].ChildScalingIndependent))
                         return false;
 
                     CurrentlyEditedTemplate!.Bones[boneName].ChildScaling = originalChildScaling;
-                    CurrentlyEditedTemplate!.Bones[boneName].ChildScalingLinked = originalChildScalingLinked;
+                    CurrentlyEditedTemplate!.Bones[boneName].ChildScalingIndependent = originalChildScalingIndependent;
                     break;
             }
         }
diff --git a/CustomizePlus/UI/Windows/MainWindow/Tabs/Debug/StateMonitoringTab.cs b/CustomizePlus/UI/Windows/MainWindow/Tabs/Debug/StateMonitoringTab.cs
@@ -184,9 +184,9 @@ private void DrawSingleTemplate(string prefix, Template template, string? additi
         foreach (var kvPair in template.Bones)
         {
 #if !INCOGNIFY_STRINGS
-            ImGui.Text($"{kvPair.Key}: p: {kvPair.Value.Translation} | r: {kvPair.Value.Rotation} | s: {kvPair.Value.Scaling} | cs: {kvPair.Value.ChildScaling}{(kvPair.Value.ChildScalingLinked ? " (link)" : "")}");
+            ImGui.Text($"{kvPair.Key}: p: {kvPair.Value.Translation} | r: {kvPair.Value.Rotation} | s: {kvPair.Value.Scaling} | cs: {kvPair.Value.ChildScaling}{(!kvPair.Value.ChildScalingIndependent ? " (link)" : "")}");
 #else
-            ImGui.Text($"{BoneData.GetBoneDisplayName(kvPair.Key)} ({kvPair.Key}): p: {(kvPair.Value.Translation.IsApproximately(Vector3.Zero) ? "Approx. not changed" : "Changed")} | r: {(kvPair.Value.Rotation.IsApproximately(Vector3.Zero) ? "Approx. not changed" : "Changed")} | s: {(kvPair.Value.Scaling.IsApproximately(Vector3.One) ? "Not changed" : "Changed")} | cs: {(kvPair.Value.ChildScalingLinked ? "Link" : (kvPair.Value.ChildScaling.IsApproximately(Vector3.One) ? "Not changed" : "Changed"))}");
+            ImGui.Text($"{BoneData.GetBoneDisplayName(kvPair.Key)} ({kvPair.Key}): p: {(kvPair.Value.Translation.IsApproximately(Vector3.Zero) ? "Approx. not changed" : "Changed")} | r: {(kvPair.Value.Rotation.IsApproximately(Vector3.Zero) ? "Approx. not changed" : "Changed")} | s: {(kvPair.Value.Scaling.IsApproximately(Vector3.One) ? "Not changed" : "Changed")} | cs: {(!kvPair.Value.ChildScalingIndependent ? "Link" : (kvPair.Value.ChildScaling.IsApproximately(Vector3.One) ? "Not changed" : "Changed"))}");
 #endif
         }
     }
diff --git a/CustomizePlus/UI/Windows/MainWindow/Tabs/Templates/BoneEditorPanel.cs b/CustomizePlus/UI/Windows/MainWindow/Tabs/Templates/BoneEditorPanel.cs
@@ -393,7 +393,7 @@ public void Draw()
                                             Rotation = boneData.Rotation,
                                             Scaling = boneData.Scaling,
                                             ChildScaling = boneData.ChildScaling,
-                                            ChildScalingLinked = boneData.ChildScalingLinked,
+                                            ChildScalingIndependent = boneData.ChildScalingIndependent,
                                             PropagateTranslation = boneData.PropagateTranslation,
                                             PropagateRotation = boneData.PropagateRotation,
                                             PropagateScale = boneData.PropagateScale
@@ -898,9 +898,9 @@ private void RenderChildScalingRow(EditRowParams bone, BoneTransform transform)
         var codename = bone.BoneCodeName;
         var displayName = bone.BoneDisplayName;
 
-        bool isChildScaleLinked = transform.ChildScalingLinked;
+        bool isChildScaleIndependent = transform.ChildScalingIndependent;
         bool childScaleChanged = false;
-        var childScale = isChildScaleLinked ? transform.Scaling : transform.ChildScaling;
+        var childScale = isChildScaleIndependent ? transform.ChildScaling : transform.Scaling;
 
         using var id = ImRaii.PushId($"{codename}_childscale");
 
@@ -910,7 +910,7 @@ private void RenderChildScalingRow(EditRowParams bone, BoneTransform transform)
 
         using (var disabled = ImRaii.Disabled(!_isUnlocked))
         {
-            var wasLinked = isChildScaleLinked;
+            var wasLinked = !isChildScaleIndependent;
 
             if (wasLinked)
                 ImGui.PushStyleColor(ImGuiCol.Text, Constants.Colors.Active);
@@ -919,29 +919,29 @@ private void RenderChildScalingRow(EditRowParams bone, BoneTransform transform)
             {
                 SaveStateForUndo(CaptureCurrentState());
 
-                isChildScaleLinked = !isChildScaleLinked;
-                if (!isChildScaleLinked)
+                isChildScaleIndependent = !isChildScaleIndependent;
+                if (isChildScaleIndependent)
                 {
                     childScale = transform.Scaling;
                 }
                 else
                 {
                     transform.ChildScaling = Vector3.One;
                 }
-                transform.ChildScalingLinked = isChildScaleLinked;
+                transform.ChildScalingIndependent = isChildScaleIndependent;
                 childScaleChanged = true;
             }
 
             if (wasLinked)
                 ImGui.PopStyleColor();
 
-            if (isChildScaleLinked)
+            if (!isChildScaleIndependent)
                 ImGui.PushStyleColor(ImGuiCol.Text, Constants.Colors.Active);
 
             CtrlHelper.AddHoverText(
                 $"Link '{BoneData.GetBoneDisplayName(codename)}' child bone scaling to parent scaling");
 
-            if (isChildScaleLinked)
+            if (!isChildScaleIndependent)
                 ImGui.PopStyleColor();
         }
 
@@ -971,7 +971,7 @@ private void RenderChildScalingRow(EditRowParams bone, BoneTransform transform)
         var bottomRight = new Vector2(rightEdgeX + bracketWidth, bottomY);
 
         drawList.AddLine(topRightM, topLeft, bracketColor, lineThickness);   // Top
-        if (isChildScaleLinked)
+        if (!isChildScaleIndependent)
         {
             drawList.AddLine(topLeft, bottomLeft, bracketColor, lineThickness); // Middle
         }
@@ -984,7 +984,7 @@ private void RenderChildScalingRow(EditRowParams bone, BoneTransform transform)
         }
         drawList.AddLine(bottomLeftM, bottomRight, bracketColor, lineThickness); // Bottom
 
-        using (var disabled = ImRaii.Disabled(!_isUnlocked || isChildScaleLinked))
+        using (var disabled = ImRaii.Disabled(!_isUnlocked || !isChildScaleIndependent))
         {
             ImGui.TableNextColumn();
             float tempChildX = childScale.X;

Original file line number	Diff line number	Diff line change
`@@ -184,9 +184,9 @@ private void DrawSingleTemplate(string prefix, Template template, string? additi`
`184`	`184`	`foreach (var kvPair in template.Bones)`
`185`	`185`	`{`
`186`	`186`	`#if !INCOGNIFY_STRINGS`
`187`		`- ImGui.Text($"{kvPair.Key}: p: {kvPair.Value.Translation} \| r: {kvPair.Value.Rotation} \| s: {kvPair.Value.Scaling} \| cs: {kvPair.Value.ChildScaling}{(kvPair.Value.ChildScalingLinked ? " (link)" : "")}");`
	`187`	`+ ImGui.Text($"{kvPair.Key}: p: {kvPair.Value.Translation} \| r: {kvPair.Value.Rotation} \| s: {kvPair.Value.Scaling} \| cs: {kvPair.Value.ChildScaling}{(!kvPair.Value.ChildScalingIndependent ? " (link)" : "")}");`
`188`	`188`	`#else`
`189`		- ImGui.Text($"{BoneData.GetBoneDisplayName(kvPair.Key)} ({kvPair.Key}): p: {(kvPair.Value.Translation.IsApproximately(Vector3.Zero) ? "Approx. not changed" : "Changed")} \| r: {(kvPair.Value.Rotation.IsApproximately(Vector3.Zero) ? "Approx. not changed" : "Changed")} \| s: {(kvPair.Value.Scaling.IsApproximately(Vector3.One) ? "Not changed" : "Changed")} \| cs: {(kvPair.Value.ChildScalingLinked ? "Link" : (kvPair.Value.ChildScaling.IsApproximately(Vector3.One) ? "Not changed" : "Changed"))}");
	`189`	+ ImGui.Text($"{BoneData.GetBoneDisplayName(kvPair.Key)} ({kvPair.Key}): p: {(kvPair.Value.Translation.IsApproximately(Vector3.Zero) ? "Approx. not changed" : "Changed")} \| r: {(kvPair.Value.Rotation.IsApproximately(Vector3.Zero) ? "Approx. not changed" : "Changed")} \| s: {(kvPair.Value.Scaling.IsApproximately(Vector3.One) ? "Not changed" : "Changed")} \| cs: {(!kvPair.Value.ChildScalingIndependent ? "Link" : (kvPair.Value.ChildScaling.IsApproximately(Vector3.One) ? "Not changed" : "Changed"))}");
`190`	`190`	`#endif`
`191`	`191`	`}`
`192`	`192`	`}`