UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 09:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Unity] Fixed SkeletonRootMotion out of bounds access when selecting non-default Root Motion Bone with a TransformConstraint. Closes #2110.

Browse Source
This commit is contained in:
Harald Csaszar 2022-07-13 12:19:21 +02:00
parent 766105189f
commit 2ef38e4f01
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spine-unity/Assets/Spine/Runtime/spine-unity/Components/RootMotion/SkeletonRootMotionBase.cs
View File

@ -372,7 +372,7 @@ namespace Spine.Unity {
Vector2 invMixXY = timeline.EvaluateTranslateXYMix(time); Vector2 invMixXY = timeline.EvaluateTranslateXYMix(time);
Vector2 constraintPos; Vector2 constraintPos;
if (useLastConstraintPos) if (useLastConstraintPos)
constraintPos = transformConstraintLastPos[constraintIndex]; constraintPos = transformConstraintLastPos[GetConstraintLastPosIndex(constraintIndex)];
else { else {
Bone targetBone = constraint.Target; Bone targetBone = constraint.Target;
constraintPos = new Vector2(targetBone.X, targetBone.Y); constraintPos = new Vector2(targetBone.X, targetBone.Y);
@ -391,7 +391,7 @@ namespace Spine.Unity {
float invMixRotate = timeline.EvaluateRotateMix(time); float invMixRotate = timeline.EvaluateRotateMix(time);
float constraintRotation; float constraintRotation;
if (useLastConstraintRotation) if (useLastConstraintRotation)
constraintRotation = transformConstraintLastRotation[constraintIndex]; constraintRotation = transformConstraintLastRotation[GetConstraintLastPosIndex(constraintIndex)];
else { else {
Bone targetBone = constraint.Target; Bone targetBone = constraint.Target;
constraintRotation = targetBone.Rotation; constraintRotation = targetBone.Rotation;
@ -403,7 +403,7 @@ namespace Spine.Unity {
foreach (int constraintIndex in this.transformConstraintIndices) { foreach (int constraintIndex in this.transformConstraintIndices) {
TransformConstraint constraint = transformConstraintsItems[constraintIndex]; TransformConstraint constraint = transformConstraintsItems[constraintIndex];
Bone targetBone = constraint.Target; Bone targetBone = constraint.Target;
transformConstraintLastPos[constraintIndex] = new Vector2(targetBone.X, targetBone.Y); transformConstraintLastPos[GetConstraintLastPosIndex(constraintIndex)] = new Vector2(targetBone.X, targetBone.Y);
} }
} }
@ -411,7 +411,7 @@ namespace Spine.Unity {
foreach (int constraintIndex in this.transformConstraintIndices) { foreach (int constraintIndex in this.transformConstraintIndices) {
TransformConstraint constraint = transformConstraintsItems[constraintIndex]; TransformConstraint constraint = transformConstraintsItems[constraintIndex];
Bone targetBone = constraint.Target; Bone targetBone = constraint.Target;
transformConstraintLastRotation[constraintIndex] = targetBone.Rotation; transformConstraintLastRotation[GetConstraintLastPosIndex(constraintIndex)] = targetBone.Rotation;
} }
} }
@ -440,6 +440,12 @@ namespace Spine.Unity {
return rootMotion; return rootMotion;
} }
int GetConstraintLastPosIndex (int constraintIndex) {
var constraints = skeletonComponent.Skeleton.TransformConstraints;
TransformConstraint targetConstraint = constraints.Items[constraintIndex];
return constraints.FindIndex(constraint => constraint == targetConstraint);
}
void FindTransformConstraintsAffectingBone () { void FindTransformConstraintsAffectingBone () {
var constraints = skeletonComponent.Skeleton.TransformConstraints; var constraints = skeletonComponent.Skeleton.TransformConstraints;
var constraintsItems = constraints.Items; var constraintsItems = constraints.Items;