UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[unity] Fixed BoneFollower components change Transform scale regardless of settings. Closes #2018.

Browse Source
This commit is contained in:
Harald Csaszar 2022-01-13 12:24:26 +01:00
parent dbf93a5a2f
commit 40f5e2723d
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoneFollower.cs
View File

@ -209,15 +209,16 @@ namespace Spine.Unity {
} }
Bone parentBone = bone.Parent; Bone parentBone = bone.Parent;
Vector3 localScale = new Vector3(1f, 1f, 1f); if (followParentWorldScale || followLocalScale || followSkeletonFlip) {
if (followParentWorldScale && parentBone != null) Vector3 localScale = new Vector3(1f, 1f, 1f);
localScale = new Vector3(parentBone.WorldScaleX, parentBone.WorldScaleY, 1f); if (followParentWorldScale && parentBone != null)
if (followLocalScale) localScale = new Vector3(parentBone.WorldScaleX, parentBone.WorldScaleY, 1f);
localScale.Scale(new Vector3(bone.ScaleX, bone.ScaleY, 1f)); if (followLocalScale)
if (followSkeletonFlip) localScale.Scale(new Vector3(bone.ScaleX, bone.ScaleY, 1f));
localScale.y *= Mathf.Sign(bone.Skeleton.ScaleX * bone.Skeleton.ScaleY) * additionalFlipScale; if (followSkeletonFlip)
thisTransform.localScale = localScale; localScale.y *= Mathf.Sign(bone.Skeleton.ScaleX * bone.Skeleton.ScaleY) * additionalFlipScale;
thisTransform.localScale = localScale;
}
} }
} }
} }

19
spine-unity/Assets/Spine/Runtime/spine-unity/Components/Following/BoneFollowerGraphic.cs
View File

@ -188,15 +188,16 @@ namespace Spine.Unity {
} }
Bone parentBone = bone.Parent; Bone parentBone = bone.Parent;
Vector3 localScale = new Vector3(1f, 1f, 1f); if (followParentWorldScale || followLocalScale || followSkeletonFlip) {
if (followParentWorldScale && parentBone != null) Vector3 localScale = new Vector3(1f, 1f, 1f);
localScale = new Vector3(parentBone.WorldScaleX, parentBone.WorldScaleY, 1f); if (followParentWorldScale && parentBone != null)
if (followLocalScale) localScale = new Vector3(parentBone.WorldScaleX, parentBone.WorldScaleY, 1f);
localScale.Scale(new Vector3(bone.ScaleX, bone.ScaleY, 1f)); if (followLocalScale)
if (followSkeletonFlip) localScale.Scale(new Vector3(bone.ScaleX, bone.ScaleY, 1f));
localScale.y *= Mathf.Sign(bone.Skeleton.ScaleX * bone.Skeleton.ScaleY) * additionalFlipScale; if (followSkeletonFlip)
thisTransform.localScale = localScale; localScale.y *= Mathf.Sign(bone.Skeleton.ScaleX * bone.Skeleton.ScaleY) * additionalFlipScale;
thisTransform.localScale = localScale;
}
} }
} }
} }