mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-03-26 22:49:01 +08:00
[as3][c][cpp][csharp][libgdx][ts] Fixed SkeletonBinary scale not being applied to some timelines.
closes #1928
This commit is contained in:
parent
1bde7527c9
commit
0b01c0036e
@ -1040,7 +1040,7 @@ package spine {
|
|||||||
timeline.setStepped(frame);
|
timeline.setStepped(frame);
|
||||||
break;
|
break;
|
||||||
case CURVE_BEZIER:
|
case CURVE_BEZIER:
|
||||||
setBezier(input, timeline, bezier++, frame, 0, time, time2, value, value2, 1);
|
setBezier(input, timeline, bezier++, frame, 0, time, time2, value, value2, scale);
|
||||||
}
|
}
|
||||||
time = time2;
|
time = time2;
|
||||||
value = value2;
|
value = value2;
|
||||||
|
|||||||
@ -239,7 +239,7 @@ static spTimeline *readTimeline(_dataInput *input, spCurveTimeline1 *timeline, f
|
|||||||
spCurveTimeline_setStepped(timeline, frame);
|
spCurveTimeline_setStepped(timeline, frame);
|
||||||
break;
|
break;
|
||||||
case CURVE_BEZIER:
|
case CURVE_BEZIER:
|
||||||
setBezier(input, SUPER(timeline), bezier++, frame, 0, time, time2, value, value2, 1);
|
setBezier(input, SUPER(timeline), bezier++, frame, 0, time, time2, value, value2, scale);
|
||||||
}
|
}
|
||||||
time = time2;
|
time = time2;
|
||||||
value = value2;
|
value = value2;
|
||||||
|
|||||||
@ -707,7 +707,7 @@ Timeline *SkeletonBinary::readTimeline(DataInput *input, CurveTimeline1 *timelin
|
|||||||
timeline->setStepped(frame);
|
timeline->setStepped(frame);
|
||||||
break;
|
break;
|
||||||
case CURVE_BEZIER:
|
case CURVE_BEZIER:
|
||||||
setBezier(input, timeline, bezier++, frame, 0, time, time2, value, value2, 1);
|
setBezier(input, timeline, bezier++, frame, 0, time, time2, value, value2, scale);
|
||||||
}
|
}
|
||||||
time = time2;
|
time = time2;
|
||||||
value = value2;
|
value = value2;
|
||||||
|
|||||||
@ -1031,7 +1031,7 @@ namespace Spine {
|
|||||||
timeline.SetStepped(frame);
|
timeline.SetStepped(frame);
|
||||||
break;
|
break;
|
||||||
case CURVE_BEZIER:
|
case CURVE_BEZIER:
|
||||||
SetBezier (input, timeline, bezier++, frame, 0, time, time2, value, value2, 1);
|
SetBezier (input, timeline, bezier++, frame, 0, time, time2, value, value2, scale);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
time = time2;
|
time = time2;
|
||||||
|
|||||||
@ -1016,7 +1016,7 @@ public class SkeletonBinary extends SkeletonLoader {
|
|||||||
timeline.setStepped(frame);
|
timeline.setStepped(frame);
|
||||||
break;
|
break;
|
||||||
case CURVE_BEZIER:
|
case CURVE_BEZIER:
|
||||||
setBezier(input, timeline, bezier++, frame, 0, time, time2, value, value2, 1);
|
setBezier(input, timeline, bezier++, frame, 0, time, time2, value, value2, scale);
|
||||||
}
|
}
|
||||||
time = time2;
|
time = time2;
|
||||||
value = value2;
|
value = value2;
|
||||||
|
|||||||
@ -1070,7 +1070,7 @@ module spine {
|
|||||||
timeline.setStepped(frame);
|
timeline.setStepped(frame);
|
||||||
break;
|
break;
|
||||||
case CURVE_BEZIER:
|
case CURVE_BEZIER:
|
||||||
setBezier(input, timeline, bezier++, frame, 0, time, time2, value, value2, 1);
|
setBezier(input, timeline, bezier++, frame, 0, time, time2, value, value2, scale);
|
||||||
}
|
}
|
||||||
time = time2;
|
time = time2;
|
||||||
value = value2;
|
value = value2;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user