Skip to content

Commit 76b6fc0

Browse files
committed
Added Call Action, and added inc property to all Spread actions.
1 parent 59c8e35 commit 76b6fc0

7 files changed

Lines changed: 69 additions & 22 deletions

File tree

v3/src/actions/Call.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
var Call = function (items, callback, thisArg)
2+
{
3+
for (var i = 0; i < items.length; i++)
4+
{
5+
var item = items[i];
6+
7+
callback.call(thisArg, item);
8+
}
9+
10+
return items;
11+
};
12+
13+
module.exports = Call;

v3/src/actions/SmoothStep.js

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,25 @@
11
var MathSmoothStep = require('../math/SmoothStep');
22

3-
var SmoothStep = function (items, property, min, max)
3+
var SmoothStep = function (items, property, min, max, inc)
44
{
5+
if (inc === undefined) { inc = false; }
6+
57
var step = Math.abs(max - min) / items.length;
8+
var i;
69

7-
for (var i = 0; i < items.length; i++)
10+
if (inc)
811
{
9-
var item = items[i];
10-
11-
item[property] = MathSmoothStep(i * step, min, max);
12+
for (i = 0; i < items.length; i++)
13+
{
14+
items[i][property] += MathSmoothStep(i * step, min, max);
15+
}
16+
}
17+
else
18+
{
19+
for (i = 0; i < items.length; i++)
20+
{
21+
items[i][property] = MathSmoothStep(i * step, min, max);
22+
}
1223
}
1324

1425
return items;

v3/src/actions/SmootherStep.js

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,25 @@
11
var MathSmootherStep = require('../math/SmootherStep');
22

3-
var SmootherStep = function (items, property, min, max)
3+
var SmootherStep = function (items, property, min, max, inc)
44
{
5+
if (inc === undefined) { inc = false; }
6+
57
var step = Math.abs(max - min) / items.length;
8+
var i;
69

7-
for (var i = 0; i < items.length; i++)
10+
if (inc)
811
{
9-
var item = items[i];
10-
11-
item[property] = MathSmootherStep(i * step, min, max);
12+
for (i = 0; i < items.length; i++)
13+
{
14+
items[i][property] += MathSmootherStep(i * step, min, max);
15+
}
16+
}
17+
else
18+
{
19+
for (i = 0; i < items.length; i++)
20+
{
21+
items[i][property] = MathSmootherStep(i * step, min, max);
22+
}
1223
}
1324

1425
return items;

v3/src/actions/Spread.js

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
1-
var Spread = function (items, property, min, max)
1+
var Spread = function (items, property, min, max, inc)
22
{
3+
if (inc === undefined) { inc = false; }
4+
35
var step = Math.abs(max - min) / items.length;
6+
var i;
47

5-
for (var i = 0; i < items.length; i++)
8+
if (inc)
69
{
7-
var item = items[i];
8-
9-
item[property] = i * step;
10+
for (i = 0; i < items.length; i++)
11+
{
12+
items[i][property] += i * step;
13+
}
14+
}
15+
else
16+
{
17+
for (i = 0; i < items.length; i++)
18+
{
19+
items[i][property] = i * step;
20+
}
1021
}
1122

1223
return items;

v3/src/actions/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
module.exports = {
44

55
Angle: require('./Angle'),
6+
Call: require('./Call'),
67
GridAlign: require('./GridAlign'),
78
IncAlpha: require('./IncAlpha'),
89
IncX: require('./IncX'),

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: '01670a50-13c3-11e7-afb8-27083fa0efa0'
2+
build: '922ef1b0-13c3-11e7-83ea-a7683f5b2ec0'
33
};
44
module.exports = CHECKSUM;

v3/src/gameobjects/layer/Layer.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -357,23 +357,23 @@ var Layer = new Class({
357357
return this;
358358
},
359359

360-
smootherStep: function (property, min, max)
360+
smootherStep: function (property, min, max, inc)
361361
{
362-
Actions.SmootherStep(this.children.entries, property, min, max);
362+
Actions.SmootherStep(this.children.entries, property, min, max, inc);
363363

364364
return this;
365365
},
366366

367-
smoothStep: function (property, min, max)
367+
smoothStep: function (property, min, max, inc)
368368
{
369-
Actions.SmoothStep(this.children.entries, property, min, max);
369+
Actions.SmoothStep(this.children.entries, property, min, max, inc);
370370

371371
return this;
372372
},
373373

374-
spread: function (property, min, max)
374+
spread: function (property, min, max, inc)
375375
{
376-
Actions.Spread(this.children.entries, property, min, max);
376+
Actions.Spread(this.children.entries, property, min, max, inc);
377377

378378
return this;
379379
},

0 commit comments

Comments
 (0)