Skip to content

Commit b2c95c1

Browse files
SupermediumBotfernandojsg
authored andcommitted
Fixes #2470 Added timer
1 parent fb50df8 commit b2c95c1

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

‎src/core/scene/a-scene.js‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,8 @@ module.exports = registerElement('a-scene', {
389389
if (window.performance) {
390390
window.performance.mark('render-started');
391391
}
392-
sceneEl.render(0);
392+
sceneEl.clock = new THREE.Clock();
393+
sceneEl.render();
393394
sceneEl.renderStarted = true;
394395
sceneEl.emit('renderstart');
395396
}
@@ -441,7 +442,6 @@ module.exports = registerElement('a-scene', {
441442
tick: {
442443
value: function (time, timeDelta) {
443444
var systems = this.systems;
444-
445445
// Animations.
446446
TWEEN.update(time);
447447
// Components.
@@ -465,15 +465,13 @@ module.exports = registerElement('a-scene', {
465465
* Renders with request animation frame.
466466
*/
467467
render: {
468-
value: function (time) {
468+
value: function () {
469469
var effect = this.effect;
470-
var timeDelta = time - this.time;
471-
472-
if (this.isPlaying) { this.tick(time, timeDelta); }
470+
var delta = this.clock.getDelta() * 1000;
473471

472+
if (this.isPlaying) { this.tick(this.clock.elapsedTime * 1000, delta); }
474473
this.animationFrameID = effect.requestAnimationFrame(this.render);
475474
effect.render(this.object3D, this.camera);
476-
this.time = time;
477475
},
478476
writable: true
479477
}

‎src/utils/index.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ module.exports.entity = require('./entity');
1515
module.exports.forceCanvasResizeSafariMobile = require('./forceCanvasResizeSafariMobile');
1616
module.exports.material = require('./material');
1717
module.exports.styleParser = require('./styleParser');
18+
module.exports.Timer = require('./timer');
1819
module.exports.trackedControls = require('./tracked-controls');
1920

2021
module.exports.checkHeadsetConnected = function () {

0 commit comments

Comments
 (0)