Skip to content

Commit 121f1e5

Browse files
committed
Added Clock timeScale and updated to use new TimerEvent repeat handling.
1 parent f7097d5 commit 121f1e5

2 files changed

Lines changed: 11 additions & 4 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: '60b859e0-5c21-11e7-a554-cbd3f53fc69e'
2+
build: '4d7b1d40-5ccb-11e7-b6b9-19b8ec5edc8c'
33
};
44
module.exports = CHECKSUM;

v3/src/time/Clock.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ var Clock = new Class({
1111

1212
this.now = Date.now();
1313

14+
// Scale the delta time coming into the Clock by this factor
15+
// which then influences anything using this Clock for calculations, like TimerEvents
16+
this.timeScale = 1;
17+
1418
this.paused = false;
1519

1620
this._active = [];
@@ -56,11 +60,12 @@ var Clock = new Class({
5660
}
5761

5862
var i;
63+
var event;
5964

6065
// Delete old events
6166
for (i = 0; i < toRemove; i++)
6267
{
63-
var event = this._pendingRemoval[i];
68+
event = this._pendingRemoval[i];
6469

6570
var index = this._active.indexOf(event);
6671

@@ -75,7 +80,7 @@ var Clock = new Class({
7580

7681
for (i = 0; i < toInsert; i++)
7782
{
78-
var event = this._pendingInsertion[i];
83+
event = this._pendingInsertion[i];
7984

8085
event.elapsed = event.startAt * event.timeScale;
8186

@@ -99,6 +104,8 @@ var Clock = new Class({
99104
return;
100105
}
101106

107+
delta * this.timeScale;
108+
102109
for (var i = 0; i < this._active.length; i++)
103110
{
104111
var event = this._active[i];
@@ -128,7 +135,7 @@ var Clock = new Class({
128135
event.callback.apply(event.callbackScope, event.args);
129136
}
130137

131-
if (event.loop || event.repeatCount > 0)
138+
if (event.repeatCount > 0)
132139
{
133140
event.repeatCount--;
134141

0 commit comments

Comments
 (0)