Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 05:37:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui

Browse source
This commit is contained in:
Anthony J. Thibault 2017-01-05 15:06:35 -08:00
commit f63ee4ffe0
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
scripts/system/tablet-ui/tabletUI.js
View file

@ -46,6 +46,15 @@
} }
function updateShowTablet() { function updateShowTablet() {
if (tabletShown) {
var currentMicLevel = getMicLevel();
var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
tablet.updateAudioBar(currentMicLevel);
if (UIWebTablet) {
tablet.updateTabletPosition(UIWebTablet.getPosition());
}
}
if (HMD.showTablet && !tabletShown) { if (HMD.showTablet && !tabletShown) {
showTabletUI(); showTabletUI();
} else if (!HMD.showTablet && tabletShown) { } else if (!HMD.showTablet && tabletShown) {
@ -60,8 +69,7 @@
Messages.subscribe("toggleHand"); Messages.subscribe("toggleHand");
Messages.messageReceived.connect(toggleHand); Messages.messageReceived.connect(toggleHand);
Script.update.connect(updateShowTablet); Script.setInterval(updateShowTablet, 100);
// Script.setInterval(updateShowTablet, 1000);
// Initialise variables used to calculate audio level // Initialise variables used to calculate audio level
var accumulatedLevel = 0.0; var accumulatedLevel = 0.0;
@ -89,16 +97,4 @@
} }
return micLevel; return micLevel;
} }
Script.setInterval(function() {
if (tabletShown) {
var currentMicLevel = getMicLevel();
var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
tablet.updateAudioBar(currentMicLevel);
if (UIWebTablet) {
tablet.updateTabletPosition(UIWebTablet.getPosition());
}
}
}, MIC_LEVEL_UPDATE_INTERVAL_MS);
}()); // END LOCAL_SCOPE }()); // END LOCAL_SCOPE