Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 04:33:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

poll for ready, and include physics in definition of ready, based on #8723

Browse source
This commit is contained in:
howard-stearns 2016-10-04 10:23:10 -07:00
parent 8388e1044a
commit 5ea4d48e36
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
scripts/developer/tests/performance/domain-check.js
View file

@ -20,7 +20,7 @@ var EXPECTED_HMD_FRAMERATE = 90;
var MAXIMUM_LOAD_TIME = 60; // seconds var MAXIMUM_LOAD_TIME = 60; // seconds
var MINIMUM_AVATARS = 25; // FIXME: not implemented yet. Requires agent scripts. Idea is to have them organize themselves to the right number. var MINIMUM_AVATARS = 25; // FIXME: not implemented yet. Requires agent scripts. Idea is to have them organize themselves to the right number.
var version = 1; var version = 2;
function debug() { function debug() {
print.apply(null, [].concat.apply(['hrs fixme', version], [].map.call(arguments, JSON.stringify))); print.apply(null, [].concat.apply(['hrs fixme', version], [].map.call(arguments, JSON.stringify)));
} }
@ -76,10 +76,17 @@ function startTwirl(targetRotation, degreesPerUpdate, interval, strafeDistance,
function doLoad(place, continuationWithLoadTime) { // Go to place and call continuationWithLoadTime(loadTimeInSeconds) function doLoad(place, continuationWithLoadTime) { // Go to place and call continuationWithLoadTime(loadTimeInSeconds)
var start = Date.now(), timeout, onDownloadUpdate, finishedTwirl = false, loadTime; var start = Date.now(), timeout, onDownloadUpdate, finishedTwirl = false, loadTime;
// There are two ways to learn of changes: connect to change signals, or poll.
// Until we get reliable results, we'll poll.
var POLL_INTERVAL = 500, poll;
function setHandlers() {
//Stats.downloadsPendingChanged.connect(onDownloadUpdate); downloadsChanged, and physics...
poll = Script.setInterval(onDownloadUpdate, POLL_INTERVAL);
}
function clearHandlers() { function clearHandlers() {
debug('clearHandlers'); debug('clearHandlers');
Stats.downloadsPendingChanged.disconnect(onDownloadUpdate); //Stats.downloadsPendingChanged.disconnect(onDownloadUpdate); downloadsChanged, and physics..
Stats.downloadsChanged.disconnect(onDownloadUpdate); Script.clearInterval(poll);
} }
function waitForLoad(flag) { function waitForLoad(flag) {
debug('entry', place, 'initial downloads/pending', Stats.downloads, Stats.downloadsPending); debug('entry', place, 'initial downloads/pending', Stats.downloads, Stats.downloadsPending);
@ -96,13 +103,11 @@ function doLoad(place, continuationWithLoadTime) { // Go to place and call conti
continuationWithLoadTime(loadTime); continuationWithLoadTime(loadTime);
} }
}); });
Stats.downloadsPendingChanged.connect(onDownloadUpdate); setHandlers();
Stats.downloadsChanged.connect(onDownloadUpdate);
} }
function isLoading() { function isLoading() {
// FIXME: This tells us when download are completed, but it doesn't tell us when the objects are parsed and loaded. // FIXME: We should also confirm that textures have loaded.
// We really want something like _physicsEnabled, but that isn't signalled. return Stats.downloads || Stats.downloadsPending || !Window.isPhysicsEnabled();
return Stats.downloads || Stats.downloadsPending;
} }
onDownloadUpdate = function onDownloadUpdate() { onDownloadUpdate = function onDownloadUpdate() {
debug('update downloads/pending', Stats.downloads, Stats.downloadsPending); debug('update downloads/pending', Stats.downloads, Stats.downloadsPending);
@ -170,7 +175,7 @@ You would want to say 'no' (and make other preparations) if you were testing the
function maybeRunTribbles(continuation) { function maybeRunTribbles(continuation) {
if (Window.confirm("Run tribbles?\n\n\ if (Window.confirm("Run tribbles?\n\n\
At most, only one participant should say yes.")) { At most, only one participant should say yes.")) {
Script.load('http://cdn.highfidelity.com/davidkelly/production/scripts/tests/performance/tribbles.js'); // FIXME: replace with AWS Script.load('http://cdn.highfidelity.com/davidkelly/production/scripts/tests/performance/tribbles.js');
Script.setTimeout(continuation, 3000); Script.setTimeout(continuation, 3000);
} else { } else {
continuation(); continuation();