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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/core/scene/a-scene.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export class AScene extends AEntity {
var self;
super();
self = this;
self.clock = new THREE.Clock();
self.timer = new THREE.Timer();
self.isIOS = isIOS;
self.isMobile = isMobile;
self.hasWebXR = isWebXRAvailable;
Expand Down Expand Up @@ -688,8 +688,9 @@ export class AScene extends AEntity {
var renderer = this.renderer;

this.frame = frame;
this.delta = this.clock.getDelta() * 1000;
this.time = this.clock.elapsedTime * 1000;
this.timer.update();
this.delta = this.timer.getDelta() * 1000;
this.time = this.timer.getElapsed() * 1000;

if (this.isPlaying) { this.tick(this.time, this.delta); }
var savedBackground = null;
Expand Down
7 changes: 4 additions & 3 deletions src/core/scene/loadingScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export function setup (el, getCanvasSize) {
var sphereMesh2;
var sphereMesh3;
var camera;
var clock;
var timer;
var time;
var render;

Expand All @@ -38,11 +38,12 @@ export function setup (el, getCanvasSize) {
sphereMesh2 = sphereMesh1.clone();
sphereMesh3 = sphereMesh1.clone();
camera = new THREE.PerspectiveCamera(80, window.innerWidth / window.innerHeight, 0.0005, 10000);
clock = new THREE.Clock();
timer = new THREE.Timer();
time = 0;
render = function () {
sceneEl.renderer.render(loaderScene, camera);
time = clock.getElapsedTime() % 4;
timer.update();
time = timer.getElapsed() % 4;
sphereMesh1.visible = time >= 1;
sphereMesh2.visible = time >= 2;
sphereMesh3.visible = time >= 3;
Expand Down
14 changes: 0 additions & 14 deletions tests/core/scene/a-scene.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -716,20 +716,6 @@ helpers.getSkipCISuite()('a-scene (with renderer)', function () {
sinon.assert.called(Component.tock);
sinon.assert.calledWith(Component.tock, scene.time);
});

test.skip('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
Loading