Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions src/core/scene/a-scene.js
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,8 @@ module.exports = registerElement('a-scene', {
if (window.performance) {
window.performance.mark('render-started');
}
sceneEl.render(0);
sceneEl.clock = new THREE.Clock();
sceneEl.render();
sceneEl.renderStarted = true;
sceneEl.emit('renderstart');
}
Expand Down Expand Up @@ -441,7 +442,6 @@ module.exports = registerElement('a-scene', {
tick: {
value: function (time, timeDelta) {
var systems = this.systems;

// Animations.
TWEEN.update(time);
// Components.
Expand All @@ -465,15 +465,13 @@ module.exports = registerElement('a-scene', {
* Renders with request animation frame.
*/
render: {
value: function (time) {
value: function () {
var effect = this.effect;
var timeDelta = time - this.time;

if (this.isPlaying) { this.tick(time, timeDelta); }

var delta = this.clock.getDelta() * 1000;
this.time = this.clock.elapsedTime * 1000;
if (this.isPlaying) { this.tick(this.time, delta); }
this.animationFrameID = effect.requestAnimationFrame(this.render);
effect.render(this.object3D, this.camera);
this.time = time;
},
writable: true
}
Expand Down
14 changes: 14 additions & 0 deletions tests/core/scene/a-scene.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,20 @@ helpers.getSkipCISuite()('a-scene (with renderer)', function () {
sinon.assert.called(Component.tick);
sinon.assert.calledWith(Component.tick, scene.time);
});

test('clock', function () {
var scene = this.el;

assert.isAbove(scene.time, 0);
var prevTime = scene.time;
assert.ok(scene.time, scene.clock.elapsedTime);
for (var i = 0; i < 10; i++) {
scene.render();
assert.isAbove(scene.time, prevTime);
assert.ok(scene.time, scene.clock.elapsedTime);
prevTime = scene.time;
}
});
});

suite('scenes', function () {
Expand Down