Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 14:03:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #9348 from howard-stearns/talking-glow-node

Browse source 
Talking glow node
This commit is contained in:
Zach Fox 2017-01-10 14:12:09 -08:00 committed by GitHub
commit 0b574e170a
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
scripts/system/pal.js
View file

@ -58,8 +58,13 @@ ExtendedOverlay.prototype.editOverlay = function (properties) { // change displa
Overlays.editOverlay(this.activeOverlay, properties);
};
function color(selected) {
return selected ? SELECTED_COLOR : UNSELECTED_COLOR;
function color(selected, level) {
var base = selected ? SELECTED_COLOR : UNSELECTED_COLOR;
function scale(component) {
var delta = 0xFF - component;
return component + (delta * level);
}
return {red: scale(base.red), green: scale(base.green), blue: scale(base.blue)};
}
function textures(selected) {
@ -71,7 +76,7 @@ ExtendedOverlay.prototype.select = function (selected) {
return;
}
this.editOverlay({color: color(selected)});
this.editOverlay({color: color(selected, this.audioLevel)});
if (this.model) {
this.model.editOverlay({textures: textures(selected)});
}
@ -204,7 +209,7 @@ function addAvatarNode(id) {
drawInFront: true,
solid: true,
alpha: 0.8,
color: color(selected),
color: color(selected, 0.0),
ignoreRayIntersection: false}, selected, true);
}
function populateUserList() {
@ -288,6 +293,7 @@ function updateOverlays() {
overlay.ping = pingPong;
overlay.editOverlay({
color: color(ExtendedOverlay.isSelected(id), overlay.audioLevel),
position: target,
dimensions: 0.032 * distance
});
@ -422,7 +428,7 @@ var LOUDNESS_FLOOR = 11.0;
var LOUDNESS_SCALE = 2.8 / 5.0;
var LOG2 = Math.log(2.0);
var AUDIO_LEVEL_UPDATE_INTERVAL_MS = 100; // 10hz for now (change this and change the AVERAGING_RATIO too)
var accumulatedLevels = {};
var myData = {}; // we're not includied in ExtendedOverlay.get.
function getAudioLevel(id) {
// the VU meter should work similarly to the one in AvatarInputs: log scale, exponentially averaged
@ -430,13 +436,18 @@ function getAudioLevel(id) {
// of updating (the latter for efficiency too).
var avatar = AvatarList.getAvatar(id);
var audioLevel = 0.0;
var data = id ? ExtendedOverlay.get(id) : myData;
if (!data) {
print('no data for', id);
return audioLevel;
}
// we will do exponential moving average by taking some the last loudness and averaging
accumulatedLevels[id] = AVERAGING_RATIO * (accumulatedLevels[id] || 0) + (1 - AVERAGING_RATIO) * (avatar.audioLoudness);
data.accumulatedLevel = AVERAGING_RATIO * (data.accumulatedLevel || 0) + (1 - AVERAGING_RATIO) * (avatar.audioLoudness);
// add 1 to insure we don't go log() and hit -infinity. Math.log is
// natural log, so to get log base 2, just divide by ln(2).
var logLevel = Math.log(accumulatedLevels[id] + 1) / LOG2;
var logLevel = Math.log(data.accumulatedLevel + 1) / LOG2;
if (logLevel <= LOUDNESS_FLOOR) {
audioLevel = logLevel / LOUDNESS_FLOOR * LOUDNESS_SCALE;
@ -446,6 +457,7 @@ function getAudioLevel(id) {
if (audioLevel > 1.0) {
audioLevel = 1;
}
data.audioLevel = audioLevel;
return audioLevel;
}
@ -455,7 +467,7 @@ function getAudioLevel(id) {
Script.setInterval(function () {
if (pal.visible) {
var param = {};
AvatarList.getAvatarIdentifiers().sort().forEach(function (id) {
AvatarList.getAvatarIdentifiers().forEach(function (id) {
var level = getAudioLevel(id);
// qml didn't like an object with null/empty string for a key, so...
var userId = id || 0;