UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-28 04:31:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed percent spacing incorrectly being affected by scale. Made fixed position and fixed spacing be affected by scale.

Browse Source 
Caveats: Fixed position is not affected by scale in setup mode nor for non-constant speed paths.
This commit is contained in:
Nathan Sweet 2018-05-02 22:24:29 +02:00
parent 32f326de0f
commit e4839352ec
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PathConstraint.java
View File

@ -100,22 +100,29 @@ public class PathConstraint implements Constraint {
if (!translate && !rotate) return; if (!translate && !rotate) return;
PathConstraintData data = this.data; PathConstraintData data = this.data;
SpacingMode spacingMode = data.spacingMode; boolean percentSpacing = data.spacingMode == SpacingMode.percent;
boolean lengthSpacing = spacingMode == SpacingMode.length;
RotateMode rotateMode = data.rotateMode; RotateMode rotateMode = data.rotateMode;
boolean tangents = rotateMode == RotateMode.tangent, scale = rotateMode == RotateMode.chainScale; boolean tangents = rotateMode == RotateMode.tangent, scale = rotateMode == RotateMode.chainScale;
int boneCount = this.bones.size, spacesCount = tangents ? boneCount : boneCount + 1; int boneCount = this.bones.size, spacesCount = tangents ? boneCount : boneCount + 1;
Object[] bones = this.bones.items; Object[] bones = this.bones.items;
float[] spaces = this.spaces.setSize(spacesCount), lengths = null; float[] spaces = this.spaces.setSize(spacesCount), lengths = null;
float spacing = this.spacing; float spacing = this.spacing;
if (scale || lengthSpacing) { if (scale || !percentSpacing) {
if (scale) lengths = this.lengths.setSize(boneCount); if (scale) lengths = this.lengths.setSize(boneCount);
boolean lengthSpacing = data.spacingMode == SpacingMode.length;
for (int i = 0, n = spacesCount - 1; i < n;) { for (int i = 0, n = spacesCount - 1; i < n;) {
Bone bone = (Bone)bones[i]; Bone bone = (Bone)bones[i];
float setupLength = bone.data.length; float setupLength = bone.data.length;
if (setupLength < epsilon) { if (setupLength < epsilon) {
if (scale) lengths[i] = 0; if (scale) lengths[i] = 0;
spaces[++i] = 0; spaces[++i] = 0;
} else if (percentSpacing) {
if (scale) {
float x = setupLength * bone.a, y = setupLength * bone.c;
float length = (float)Math.sqrt(x * x + y * y);
lengths[i] = length;
}
spaces[++i] = spacing;
} else { } else {
float x = setupLength * bone.a, y = setupLength * bone.c; float x = setupLength * bone.a, y = setupLength * bone.c;
float length = (float)Math.sqrt(x * x + y * y); float length = (float)Math.sqrt(x * x + y * y);
@ -129,7 +136,7 @@ public class PathConstraint implements Constraint {
} }
float[] positions = computeWorldPositions((PathAttachment)attachment, spacesCount, tangents, float[] positions = computeWorldPositions((PathAttachment)attachment, spacesCount, tangents,
data.positionMode == PositionMode.percent, spacingMode == SpacingMode.percent); data.positionMode == PositionMode.percent, percentSpacing);
float boneX = positions[0], boneY = positions[1], offsetRotation = data.offsetRotation; float boneX = positions[0], boneY = positions[1], offsetRotation = data.offsetRotation;
boolean tip; boolean tip;
if (offsetRotation == 0) if (offsetRotation == 0)
@ -307,7 +314,10 @@ public class PathConstraint implements Constraint {
x1 = x2; x1 = x2;
y1 = y2; y1 = y2;
} }
if (percentPosition) position *= pathLength; if (percentPosition)
position *= pathLength;
else
position *= pathLength / path.getLengths()[curveCount - 1];
if (percentSpacing) { if (percentSpacing) {
for (int i = 0; i < spacesCount; i++) for (int i = 0; i < spacesCount; i++)
spaces[i] *= pathLength; spaces[i] *= pathLength;