mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-03-26 22:49:01 +08:00
Merge branch '3.8' into 3.9-beta
This commit is contained in:
commit
22c29b61a2
Binary file not shown.
@ -785,11 +785,16 @@ package spine {
|
|||||||
|
|
||||||
static private function readCurve(map : Object, timeline : CurveTimeline, frameIndex : int) : void {
|
static private function readCurve(map : Object, timeline : CurveTimeline, frameIndex : int) : void {
|
||||||
var curve : Object = map["curve"];
|
var curve : Object = map["curve"];
|
||||||
if (!curve) return;
|
if (curve == null) return;
|
||||||
if (curve == "stepped")
|
if (curve == "stepped")
|
||||||
timeline.setStepped(frameIndex);
|
timeline.setStepped(frameIndex);
|
||||||
else
|
else {
|
||||||
timeline.setCurve(frameIndex, parseFloat(curve.toString()), Number(map["c2"] || 0), Number(map["c3"] || 1), Number(map["c4"] || 1));
|
var c1: Number = parseFloat(curve.toString());
|
||||||
|
var c2: Number = map["c2"] == null ? 0 : Number(map["c2"]);
|
||||||
|
var c3: Number = map["c3"] == null ? 1 : Number(map["c3"]);
|
||||||
|
var c4: Number = map["c4"] == null ? 1 : Number(map["c4"]);
|
||||||
|
timeline.setCurve(frameIndex, c1, c2, c3, c4);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static private function toColor(hexString : String, colorIndex : int) : Number {
|
static private function toColor(hexString : String, colorIndex : int) : Number {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user