Skip to content

Commit 9fa2a04

Browse files
committed
[haxe] Port of commit 5d87203: Fixed additive timelines. Disallow additive for slider and path mix timelines.
1 parent f7a08f5 commit 9fa2a04

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

spine-haxe/spine-haxe/spine/animation/CurveTimeline1.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,13 @@ abstract class CurveTimeline1 extends CurveTimeline {
8989
if (time < frames[0])
9090
return fromSetup ? setup : current;
9191
var value:Float = getCurveValue(time);
92-
return fromSetup ? setup + (value - setup) * alpha : current + (add ? value : value - current) * alpha;
92+
return fromSetup ? setup + (add ? value : value - setup) * alpha : current + (add ? value : value - current) * alpha;
9393
}
9494

9595
public function getAbsoluteValue2(time:Float, alpha:Float, fromSetup:Bool, add:Bool, current:Float, setup:Float, value:Float):Float {
9696
if (time < frames[0])
9797
return fromSetup ? setup : current;
98-
return fromSetup ? setup + (value - setup) * alpha : current + (add ? value : value - current) * alpha;
98+
return fromSetup ? setup + (add ? value : value - setup) * alpha : current + (add ? value : value - current) * alpha;
9999
}
100100

101101
public function getScaleValue(time:Float, alpha:Float, fromSetup:Bool, add:Bool, out:Bool, current:Float, setup:Float):Float {

0 commit comments

Comments
 (0)