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

[libgdx] Added a proportional spacing mode to path constraints.

Browse Source 
EsotericSoftware/spine-editor#414
This commit is contained in:
Nathan Sweet 2020-11-15 21:51:59 -08:00
parent da1b280275
commit 10d5a918ca
2 changed files with 74 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,15 +98,50 @@ public class PathConstraint implements Updatable {
if (mixRotate == 0 && mixX == 0 && mixY == 0) return; if (mixRotate == 0 && mixX == 0 && mixY == 0) return;
PathConstraintData data = this.data; PathConstraintData data = this.data;
boolean percentSpacing = data.spacingMode == SpacingMode.percent; boolean tangents = data.rotateMode == RotateMode.tangent, scale = data.rotateMode == RotateMode.chainScale;
RotateMode rotateMode = data.rotateMode;
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 = scale ? this.lengths.setSize(boneCount) : null;
float spacing = this.spacing; float spacing = this.spacing;
if (scale || !percentSpacing) {
if (scale) lengths = this.lengths.setSize(boneCount); switch (data.spacingMode) {
case percent:
for (int i = 0, n = spacesCount - 1; i < n;) {
Bone bone = (Bone)bones[i];
float setupLength = bone.data.length;
if (setupLength < epsilon) {
if (scale) lengths[i] = 0;
spaces[++i] = 0;
} else {
if (scale) {
float x = setupLength * bone.a, y = setupLength * bone.c;
lengths[i] = (float)Math.sqrt(x * x + y * y);
}
spaces[++i] = spacing;
}
}
break;
case proportional:
float sum = 0;
for (int i = 0; i < boneCount;) {
Bone bone = (Bone)bones[i];
float setupLength = bone.data.length;
if (setupLength < epsilon) {
if (scale) lengths[i] = 0;
spaces[++i] = 0;
} else {
float x = setupLength * bone.a, y = setupLength * bone.c;
float length = (float)Math.sqrt(x * x + y * y);
if (scale) lengths[i] = length;
spaces[++i] = length;
sum += length;
}
}
sum = spacesCount / sum * spacing;
for (int i = 1; i < spacesCount; i++)
spaces[i] *= sum;
break;
default:
boolean lengthSpacing = data.spacingMode == SpacingMode.length; 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];
@ -114,13 +149,6 @@ public class PathConstraint implements Updatable {
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);
@ -128,17 +156,13 @@ public class PathConstraint implements Updatable {
spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length / setupLength; spaces[++i] = (lengthSpacing ? setupLength + spacing : spacing) * length / setupLength;
} }
} }
} else {
for (int i = 1; i < spacesCount; i++)
spaces[i] = spacing;
} }
float[] positions = computeWorldPositions((PathAttachment)attachment, spacesCount, tangents, float[] positions = computeWorldPositions((PathAttachment)attachment, spacesCount, tangents);
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)
tip = rotateMode == RotateMode.chain; tip = data.rotateMode == RotateMode.chain;
else { else {
tip = false; tip = false;
Bone p = target.bone; Bone p = target.bone;
@ -192,8 +216,7 @@ public class PathConstraint implements Updatable {
} }
} }
float[] computeWorldPositions (PathAttachment path, int spacesCount, boolean tangents, boolean percentPosition, float[] computeWorldPositions (PathAttachment path, int spacesCount, boolean tangents) {
boolean percentSpacing) {
Slot target = this.target; Slot target = this.target;
float position = this.position; float position = this.position;
float[] spaces = this.spaces.items, out = this.positions.setSize(spacesCount * 3 + 2), world; float[] spaces = this.spaces.items, out = this.positions.setSize(spacesCount * 3 + 2), world;
@ -204,14 +227,24 @@ public class PathConstraint implements Updatable {
float[] lengths = path.getLengths(); float[] lengths = path.getLengths();
curveCount -= closed ? 1 : 2; curveCount -= closed ? 1 : 2;
float pathLength = lengths[curveCount]; float pathLength = lengths[curveCount];
if (percentPosition) position *= pathLength;
if (percentSpacing) { if (data.positionMode == PositionMode.percent) position *= pathLength;
for (int i = 1; i < spacesCount; i++)
spaces[i] *= pathLength; float multiplier;
switch (data.spacingMode) {
case percent:
multiplier = pathLength;
break;
case proportional:
multiplier = pathLength / spacesCount;
break;
default:
multiplier = 1;
} }
world = this.world.setSize(8); world = this.world.setSize(8);
for (int i = 0, o = 0, curve = 0; i < spacesCount; i++, o += 3) { for (int i = 0, o = 0, curve = 0; i < spacesCount; i++, o += 3) {
float space = spaces[i]; float space = spaces[i] * multiplier;
position += space; position += space;
float p = position; float p = position;
@ -312,19 +345,28 @@ public class PathConstraint implements Updatable {
x1 = x2; x1 = x2;
y1 = y2; y1 = y2;
} }
if (percentPosition)
if (data.positionMode == PositionMode.percent)
position *= pathLength; position *= pathLength;
else else
position *= pathLength / path.getLengths()[curveCount - 1]; position *= pathLength / path.getLengths()[curveCount - 1];
if (percentSpacing) {
for (int i = 1; i < spacesCount; i++) float multiplier;
spaces[i] *= pathLength; switch (data.spacingMode) {
case percent:
multiplier = pathLength;
break;
case proportional:
multiplier = pathLength / spacesCount;
break;
default:
multiplier = 1;
} }
float[] segments = this.segments; float[] segments = this.segments;
float curveLength = 0; float curveLength = 0;
for (int i = 0, o = 0, curve = 0, segment = 0; i < spacesCount; i++, o += 3) { for (int i = 0, o = 0, curve = 0, segment = 0; i < spacesCount; i++, o += 3) {
float space = spaces[i]; float space = spaces[i] * multiplier;
position += space; position += space;
float p = position; float p = position;

2
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/PathConstraintData.java
View File

@ -159,7 +159,7 @@ public class PathConstraintData extends ConstraintData {
* <p> * <p>
* See <a href="http://esotericsoftware.com/spine-path-constraints#Spacing-mode">Spacing mode</a> in the Spine User Guide. */ * See <a href="http://esotericsoftware.com/spine-path-constraints#Spacing-mode">Spacing mode</a> in the Spine User Guide. */
static public enum SpacingMode { static public enum SpacingMode {
length, fixed, percent; length, fixed, percent, proportional;
static public final SpacingMode[] values = SpacingMode.values(); static public final SpacingMode[] values = SpacingMode.values();
} }