UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-05 10:16:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed curves.

Browse Source 
I shan't be trusted with math.
This commit is contained in:
NathanSweet 2014-07-29 00:08:53 +02:00
parent b9139fc5d4
commit b1d77cc2c4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spine-libgdx/src/com/esotericsoftware/spine/Animation.java
View File

@ -134,7 +134,7 @@ public class Animation {
/** Base class for frames that use an interpolation bezier curve. */ /** Base class for frames that use an interpolation bezier curve. */
abstract static public class CurveTimeline implements Timeline { abstract static public class CurveTimeline implements Timeline {
static public final float LINEAR = 0, STEPPED = 1, BEZIER = 2; static public final float LINEAR = 0, STEPPED = 1, BEZIER = 2;
static private final int BEZIER_SEGMENTS = 10, BEZIER_SIZE = BEZIER_SEGMENTS * 2 - 5; static private final int BEZIER_SEGMENTS = 10, BEZIER_SIZE = BEZIER_SEGMENTS * 2 - 1;
private final float[] curves; // type, x, y, ... private final float[] curves; // type, x, y, ...
@ -180,23 +180,24 @@ public class Animation {
float x = dfx, y = dfy; float x = dfx, y = dfy;
for (int n = i + BEZIER_SIZE - 1; i < n; i += 2) { for (int n = i + BEZIER_SIZE - 1; i < n; i += 2) {
curves[i] = x;
curves[i + 1] = y;
dfx += ddfx; dfx += ddfx;
dfy += ddfy; dfy += ddfy;
ddfx += dddfx; ddfx += dddfx;
ddfy += dddfy; ddfy += dddfy;
x += dfx; x += dfx;
y += dfy; y += dfy;
curves[i] = x;
curves[i + 1] = y;
} }
} }
public float getCurvePercent (int frameIndex, float percent) { public float getCurvePercent (int frameIndex, float percent) {
float[] curves = this.curves; float[] curves = this.curves;
int i = frameIndex * BEZIER_SIZE + 1; int i = frameIndex * BEZIER_SIZE;
float type = curves[i]; float type = curves[i];
if (type == LINEAR) return percent; if (type == LINEAR) return percent;
if (type == STEPPED) return 0; if (type == STEPPED) return 0;
i++;
float x = 0; float x = 0;
for (int start = i, n = i + BEZIER_SIZE - 1; i < n; i += 2) { for (int start = i, n = i + BEZIER_SIZE - 1; i < n; i += 2) {
x = curves[i]; x = curves[i];