Skip to content

Commit bd4161e

Browse files
committed
You can now specify additional ease function values via the easeParams property.
1 parent 11f15fb commit bd4161e

4 files changed

Lines changed: 24 additions & 6 deletions

File tree

v3/src/checksum.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
var CHECKSUM = {
2-
build: '7eb44670-4029-11e7-aed7-5bc93456becc'
2+
build: '54a28910-4032-11e7-bbd7-b5cbb879efb2'
33
};
44
module.exports = CHECKSUM;

v3/src/tween/GetEaseFunction.js

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,27 @@
11
var EaseMap = require('../math/easing/EaseMap');
22

3-
var GetEaseFunction = function (ease)
3+
var GetEaseFunction = function (ease, easeParams)
44
{
55
if (typeof ease === 'string' && EaseMap.hasOwnProperty(ease))
66
{
7-
// String based look-up
8-
return EaseMap[ease];
7+
if (easeParams)
8+
{
9+
var cloneParams = easeParams.slice(0);
10+
11+
cloneParams.unshift(0);
12+
13+
return function (v)
14+
{
15+
cloneParams[0] = v;
16+
17+
return EaseMap[ease].apply(this, cloneParams);
18+
};
19+
}
20+
else
21+
{
22+
// String based look-up
23+
return EaseMap[ease];
24+
}
925
}
1026
else if (typeof ease === 'function')
1127
{

v3/src/tween/ReservedProps.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ module.exports = [
55
'delay',
66
'duration',
77
'ease',
8+
'easeParams',
89
'loop',
910
'loopDelay',
1011
'offset',

v3/src/tween/TweenBuilder.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,8 @@ var TweenBuilder = function (manager, config)
202202
var props = GetProps(config);
203203

204204
// Default Tween values
205-
var ease = GetEaseFunction(GetValue(config, 'ease', 'Power0'));
205+
var easeParams = GetValue(config, 'easeParams', null);
206+
var ease = GetEaseFunction(GetValue(config, 'ease', 'Power0'), easeParams);
206207
var duration = GetNewValue(config, 'duration', 1000);
207208
var yoyo = GetBoolean(config, 'yoyo', false);
208209
var yoyoDelay = GetNewValue(config, 'yoyoDelay', 0);
@@ -226,7 +227,7 @@ var TweenBuilder = function (manager, config)
226227
targets[t],
227228
key,
228229
GetValueOp(key, value),
229-
GetEaseFunction(GetValue(value, 'ease', ease)),
230+
GetEaseFunction(GetValue(value, 'ease', ease), easeParams),
230231
GetNewValue(value, 'delay', delay),
231232
GetNewValue(value, 'duration', duration),
232233
GetBoolean(value, 'yoyo', yoyo),

0 commit comments

Comments
 (0)