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 and BoneFollowerGraphic ignoring negative parent bone scale. Closes #2819.

Browse Source
This commit is contained in:
Harald Csaszar 2025-04-18 19:27:11 +02:00
parent 4bb71296fd
commit fec9347128
3 changed files with 59 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,6 +156,32 @@ namespace Spine.Unity {
Transform thisTransform = this.transform; Transform thisTransform = this.transform;
float additionalFlipScale = 1; float additionalFlipScale = 1;
float scaleSignX = 1;
float scaleSignY = 1;
Bone parentBone = bone.Parent;
if (followParentWorldScale || followLocalScale || followSkeletonFlip) {
Vector3 localScale = new Vector3(1f, 1f, 1f);
if (followParentWorldScale && parentBone != null) {
float cumulativeScaleX = 1.0f;
float cumulativeScaleY = 1.0f;
Bone p = parentBone;
while (p != null) {
cumulativeScaleX *= p.ScaleX;
cumulativeScaleY *= p.ScaleY;
p = p.Parent;
};
scaleSignX = Mathf.Sign(cumulativeScaleX);
scaleSignY = Mathf.Sign(cumulativeScaleY);
localScale = new Vector3(parentBone.WorldScaleX * scaleSignX, parentBone.WorldScaleY * scaleSignY, 1f);
}
if (followLocalScale)
localScale.Scale(new Vector3(bone.ScaleX, bone.ScaleY, 1f));
if (followSkeletonFlip)
localScale.y *= Mathf.Sign(bone.Skeleton.ScaleX * bone.Skeleton.ScaleY) * additionalFlipScale;
thisTransform.localScale = localScale;
}
if (skeletonTransformIsParent) { if (skeletonTransformIsParent) {
// Recommended setup: Use local transform properties if Spine GameObject is the immediate parent // Recommended setup: Use local transform properties if Spine GameObject is the immediate parent
thisTransform.localPosition = new Vector3(followXYPosition ? bone.WorldX : thisTransform.localPosition.x, thisTransform.localPosition = new Vector3(followXYPosition ? bone.WorldX : thisTransform.localPosition.x,
@ -165,6 +191,8 @@ namespace Spine.Unity {
float halfRotation = Mathf.Atan2(bone.C, bone.A) * 0.5f; float halfRotation = Mathf.Atan2(bone.C, bone.A) * 0.5f;
if (followLocalScale && bone.ScaleX < 0) // Negate rotation from negative scaleX. Don't use negative determinant. local scaleY doesn't factor into used rotation. if (followLocalScale && bone.ScaleX < 0) // Negate rotation from negative scaleX. Don't use negative determinant. local scaleY doesn't factor into used rotation.
halfRotation += Mathf.PI * 0.5f; halfRotation += Mathf.PI * 0.5f;
if (followParentWorldScale && scaleSignX < 0)
halfRotation += Mathf.PI * 0.5f;
Quaternion q = default(Quaternion); Quaternion q = default(Quaternion);
q.z = Mathf.Sin(halfRotation); q.z = Mathf.Sin(halfRotation);
@ -196,6 +224,8 @@ namespace Spine.Unity {
if ((skeletonLossyScale.y * parentLossyScale.y < 0)) if ((skeletonLossyScale.y * parentLossyScale.y < 0))
boneWorldRotation += 180f; boneWorldRotation += 180f;
} }
if (followParentWorldScale && scaleSignX < 0)
boneWorldRotation += 180f;
Vector3 worldRotation = skeletonTransform.rotation.eulerAngles; Vector3 worldRotation = skeletonTransform.rotation.eulerAngles;
if (followLocalScale && bone.ScaleX < 0) boneWorldRotation += 180f; if (followLocalScale && bone.ScaleX < 0) boneWorldRotation += 180f;
@ -207,18 +237,6 @@ namespace Spine.Unity {
additionalFlipScale = Mathf.Sign(skeletonLossyScale.x * parentLossyScale.x additionalFlipScale = Mathf.Sign(skeletonLossyScale.x * parentLossyScale.x
* skeletonLossyScale.y * parentLossyScale.y); * skeletonLossyScale.y * parentLossyScale.y);
} }
Bone parentBone = bone.Parent;
if (followParentWorldScale || followLocalScale || followSkeletonFlip) {
Vector3 localScale = new Vector3(1f, 1f, 1f);
if (followParentWorldScale && parentBone != null)
localScale = new Vector3(parentBone.WorldScaleX, parentBone.WorldScaleY, 1f);
if (followLocalScale)
localScale.Scale(new Vector3(bone.ScaleX, bone.ScaleY, 1f));
if (followSkeletonFlip)
localScale.y *= Mathf.Sign(bone.Skeleton.ScaleX * bone.Skeleton.ScaleY) * additionalFlipScale;
thisTransform.localScale = localScale;
}
} }
} }
} }

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

@ -141,8 +141,33 @@ namespace Spine.Unity {
float scale = skeletonGraphic.MeshScale; float scale = skeletonGraphic.MeshScale;
Vector2 offset = skeletonGraphic.MeshOffset; Vector2 offset = skeletonGraphic.MeshOffset;
float additionalFlipScale = 1; float additionalFlipScale = 1;
float scaleSignX = 1;
float scaleSignY = 1;
Bone parentBone = bone.Parent;
if (followParentWorldScale || followLocalScale || followSkeletonFlip) {
Vector3 localScale = new Vector3(1f, 1f, 1f);
if (followParentWorldScale && parentBone != null) {
float cumulativeScaleX = 1.0f;
float cumulativeScaleY = 1.0f;
Bone p = parentBone;
while (p != null) {
cumulativeScaleX *= p.ScaleX;
cumulativeScaleY *= p.ScaleY;
p = p.Parent;
};
scaleSignX = Mathf.Sign(cumulativeScaleX);
scaleSignY = Mathf.Sign(cumulativeScaleY);
localScale = new Vector3(parentBone.WorldScaleX * scaleSignX, parentBone.WorldScaleY * scaleSignY, 1f);
}
if (followLocalScale)
localScale.Scale(new Vector3(bone.ScaleX, bone.ScaleY, 1f));
if (followSkeletonFlip)
localScale.y *= Mathf.Sign(bone.Skeleton.ScaleX * bone.Skeleton.ScaleY) * additionalFlipScale;
thisTransform.localScale = localScale;
}
if (skeletonTransformIsParent) { if (skeletonTransformIsParent) {
// Recommended setup: Use local transform properties if Spine GameObject is the immediate parent // Recommended setup: Use local transform properties if Spine GameObject is the immediate parent
thisTransform.localPosition = new Vector3(followXYPosition ? bone.WorldX * scale + offset.x : thisTransform.localPosition.x, thisTransform.localPosition = new Vector3(followXYPosition ? bone.WorldX * scale + offset.x : thisTransform.localPosition.x,
@ -175,6 +200,8 @@ namespace Spine.Unity {
if ((skeletonLossyScale.y * parentLossyScale.y < 0)) if ((skeletonLossyScale.y * parentLossyScale.y < 0))
boneWorldRotation += 180f; boneWorldRotation += 180f;
} }
if (followParentWorldScale && scaleSignX < 0)
boneWorldRotation += 180f;
Vector3 worldRotation = skeletonTransform.rotation.eulerAngles; Vector3 worldRotation = skeletonTransform.rotation.eulerAngles;
if (followLocalScale && bone.ScaleX < 0) boneWorldRotation += 180f; if (followLocalScale && bone.ScaleX < 0) boneWorldRotation += 180f;
@ -186,18 +213,6 @@ namespace Spine.Unity {
additionalFlipScale = Mathf.Sign(skeletonLossyScale.x * parentLossyScale.x additionalFlipScale = Mathf.Sign(skeletonLossyScale.x * parentLossyScale.x
* skeletonLossyScale.y * parentLossyScale.y); * skeletonLossyScale.y * parentLossyScale.y);
} }
Bone parentBone = bone.Parent;
if (followParentWorldScale || followLocalScale || followSkeletonFlip) {
Vector3 localScale = new Vector3(1f, 1f, 1f);
if (followParentWorldScale && parentBone != null)
localScale = new Vector3(parentBone.WorldScaleX, parentBone.WorldScaleY, 1f);
if (followLocalScale)
localScale.Scale(new Vector3(bone.ScaleX, bone.ScaleY, 1f));
if (followSkeletonFlip)
localScale.y *= Mathf.Sign(bone.Skeleton.ScaleX * bone.Skeleton.ScaleY) * additionalFlipScale;
thisTransform.localScale = localScale;
}
} }
} }
} }

2
spine-unity/Assets/Spine/package.json
View File

@ -2,7 +2,7 @@
"name": "com.esotericsoftware.spine.spine-unity", "name": "com.esotericsoftware.spine.spine-unity",
"displayName": "spine-unity Runtime", "displayName": "spine-unity Runtime",
"description": "This plugin provides the spine-unity runtime core.", "description": "This plugin provides the spine-unity runtime core.",
"version": "4.3.0", "version": "4.3.1",
"unity": "2018.3", "unity": "2018.3",
"author": { "author": {
"name": "Esoteric Software", "name": "Esoteric Software",