From fcd44f58176580db7506f5229ee3c40b819ac0e9 Mon Sep 17 00:00:00 2001 From: gaitat Date: Sat, 15 Feb 2014 08:16:05 -0500 Subject: [PATCH] Fix for Worklist Job #19503 --- examples/audioBall.js | 11 ++++++----- examples/audioBallLifetime.js | 9 +++++---- interface/src/Audio.h | 3 +-- interface/src/avatar/MyAvatar.cpp | 2 +- libraries/avatars/src/AvatarData.h | 9 ++++++--- libraries/avatars/src/HeadData.h | 6 +++--- 6 files changed, 22 insertions(+), 18 deletions(-) diff --git a/examples/audioBall.js b/examples/audioBall.js index b2761a3dd3..cfa08ef3a2 100644 --- a/examples/audioBall.js +++ b/examples/audioBall.js @@ -23,7 +23,7 @@ function vsMult(s, v) { } var sound = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Animals/mexicanWhipoorwill.raw"); -var FACTOR = 0.20; +var FACTOR = 0.75; var countParticles = 0; // the first time around we want to create the particle and thereafter to modify it. var particleID; @@ -42,14 +42,15 @@ function updateParticle() options.volume = 0.75; Audio.playSound(sound, options); - var audioCardAverageLoudness = MyAvatar.audioCardAverageLoudness * FACTOR; + var audioAverageLoudness = MyAvatar.audioAverageLoudness * FACTOR; + //print ("Audio Loudness = " + MyAvatar.audioLoudness + " -- Audio Average Loudness = " + MyAvatar.audioAverageLoudness); if (countParticles < 1) { var particleProperies = { position: particlePosition // the particle should stay in front of the user's avatar as he moves , color: { red: 0, green: 255, blue: 0 } - , radius: audioCardAverageLoudness + , radius: audioAverageLoudness , velocity: { x: 0.0, y: 0.0, z: 0.0 } , gravity: { x: 0.0, y: 0.0, z: 0.0 } , damping: 0.0 @@ -63,8 +64,8 @@ function updateParticle() // animates the particles radius and color in response to the changing audio intensity var newProperties = { position: particlePosition // the particle should stay in front of the user's avatar as he moves - , color: { red: 0, green: 255 * audioCardAverageLoudness, blue: 0 } - , radius: audioCardAverageLoudness + , color: { red: 0, green: 255 * audioAverageLoudness, blue: 0 } + , radius: audioAverageLoudness }; Particles.editParticle (particleID, newProperties); diff --git a/examples/audioBallLifetime.js b/examples/audioBallLifetime.js index 7df4a0cdad..da15ec7421 100644 --- a/examples/audioBallLifetime.js +++ b/examples/audioBallLifetime.js @@ -23,7 +23,7 @@ function vsMult(s, v) { } var sound = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Animals/mexicanWhipoorwill.raw"); -var FACTOR = 0.20; +var FACTOR = 0.75; function addParticle() { @@ -39,13 +39,14 @@ function addParticle() options.volume = 0.25; Audio.playSound(sound, options); - var audioCardAverageLoudness = MyAvatar.audioCardAverageLoudness * FACTOR; + var audioAverageLoudness = MyAvatar.audioAverageLoudness * FACTOR; + //print ("Audio Loudness = " + MyAvatar.audioLoudness + " -- Audio Average Loudness = " + MyAvatar.audioAverageLoudness); // animates the particles radius and color in response to the changing audio intensity var particleProperies = { position: particlePosition // the particle should stay in front of the user's avatar as he moves - , color: { red: 0, green: 255 * audioCardAverageLoudness, blue: 0 } - , radius: audioCardAverageLoudness + , color: { red: 0, green: 255 * audioAverageLoudness, blue: 0 } + , radius: audioAverageLoudness , velocity: { x: 0.0, y: 0.0, z: 0.0 } , gravity: { x: 0.0, y: 0.0, z: 0.0 } , damping: 0.0 diff --git a/interface/src/Audio.h b/interface/src/Audio.h index 3b54a02f4e..fd77cfb3b8 100644 --- a/interface/src/Audio.h +++ b/interface/src/Audio.h @@ -46,8 +46,7 @@ public: void render(int screenWidth, int screenHeight); float getLastInputLoudness() const { return glm::max(_lastInputLoudness - _noiseGateMeasuredFloor, 0.f); } - - float getAudioCardAverageInputLoudness() const { return _averageInputLoudness; } // saki + float getAudioAverageInputLoudness() const { return _lastInputLoudness; } void setNoiseGateEnabled(bool noiseGateEnabled) { _noiseGateEnabled = noiseGateEnabled; } diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 971d93ced8..b38d970011 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -143,7 +143,7 @@ void MyAvatar::update(float deltaTime) { // Get audio loudness data from audio input device Audio *audio = Application::getInstance()->getAudio(); _head.setAudioLoudness(audio->getLastInputLoudness()); - _head.setAudioCardAverageLoudness(audio->getAudioCardAverageInputLoudness()); // saki + _head.setAudioAverageLoudness(audio->getAudioAverageInputLoudness()); if (Menu::getInstance()->isOptionChecked(MenuOption::Gravity)) { setGravity(Application::getInstance()->getEnvironment()->getGravity(getPosition())); diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index a141929d44..796d60abd9 100755 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -77,7 +77,8 @@ class AvatarData : public NodeData { Q_PROPERTY(glm::quat orientation READ getOrientation WRITE setOrientation) Q_PROPERTY(float headPitch READ getHeadPitch WRITE setHeadPitch) - Q_PROPERTY(float audioCardAverageLoudness READ getAudioCardAverageLoudness WRITE setAudioCardAverageLoudness) // saki + Q_PROPERTY(float audioLoudness READ getAudioLoudness WRITE setAudioLoudness) + Q_PROPERTY(float audioAverageLoudness READ getAudioAverageLoudness WRITE setAudioAverageLoudness) Q_PROPERTY(QUrl faceModelURL READ getFaceModelURL WRITE setFaceModelURL) Q_PROPERTY(QUrl skeletonModelURL READ getSkeletonModelURL WRITE setSkeletonModelURL) @@ -110,8 +111,10 @@ public: void setHeadPitch(float value) { _headData->setPitch(value); }; // access to Head().set/getAverageLoudness - float getAudioCardAverageLoudness() const { return _headData->getAudioCardAverageLoudness(); } // saki - void setAudioCardAverageLoudness(float value) { _headData->setAudioCardAverageLoudness(value); }; // saki + float getAudioLoudness() const { return _headData->getAudioLoudness(); } + void setAudioLoudness(float value) { _headData->setAudioLoudness(value); } + float getAudioAverageLoudness() const { return _headData->getAudioAverageLoudness(); } + void setAudioAverageLoudness(float value) { _headData->setAudioAverageLoudness(value); } // Scale float getTargetScale() const { return _targetScale; } diff --git a/libraries/avatars/src/HeadData.h b/libraries/avatars/src/HeadData.h index 5c4ac4c067..5b95d84d7b 100644 --- a/libraries/avatars/src/HeadData.h +++ b/libraries/avatars/src/HeadData.h @@ -45,8 +45,8 @@ public: float getAudioLoudness() const { return _audioLoudness; } void setAudioLoudness(float audioLoudness) { _audioLoudness = audioLoudness; } - float getAudioCardAverageLoudness() const { return _audioCardAverageLoudness; } // saki - void setAudioCardAverageLoudness(float audioCardAverageLoudness) { _audioCardAverageLoudness = audioCardAverageLoudness; } // saki + float getAudioAverageLoudness() const { return _audioAverageLoudness; } + void setAudioAverageLoudness(float audioAverageLoudness) { _audioAverageLoudness = audioAverageLoudness; } const std::vector& getBlendshapeCoefficients() const { return _blendshapeCoefficients; } @@ -76,7 +76,7 @@ protected: float _rightEyeBlink; float _averageLoudness; float _browAudioLift; - float _audioCardAverageLoudness; // saki + float _audioAverageLoudness; std::vector _blendshapeCoefficients; float _pupilDilation; AvatarData* _owningAvatar;