Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-06-01 11:50:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tidying

Browse source
This commit is contained in:
David Rowe 2017-05-20 12:43:47 +12:00
parent eef707e4e9
commit 768415695d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -3976,7 +3976,7 @@ void Application::updateMyAvatarLookAtPosition() {
if (faceAngle < MAXIMUM_FACE_ANGLE) { if (faceAngle < MAXIMUM_FACE_ANGLE) {
// Randomly look back and forth between look targets // Randomly look back and forth between look targets
eyeContactTarget target = Menu::getInstance()->isOptionChecked(MenuOption::FixGaze) ? eyeContactTarget target = Menu::getInstance()->isOptionChecked(MenuOption::FixGaze) ?
LEFT_EYE : myAvatar->getEyeContactTarget(); LEFT_EYE : myAvatar->getEyeContactTarget();
switch (target) { switch (target) {
case LEFT_EYE: case LEFT_EYE:
lookAtSpot = lookingAtHead->getLeftEyePosition(); lookAtSpot = lookingAtHead->getLeftEyePosition();

2
libraries/avatars-renderer/src/avatars-renderer/Head.cpp
View file

@ -59,6 +59,7 @@ void Head::computeAudioLoudness(float deltaTime) {
} }
if (!_isFaceTrackerConnected) { if (!_isFaceTrackerConnected) {
// Update audio attack data for facial animation (eyebrows and mouth)
float audioAttackAveragingRate = (10.0f - deltaTime * NORMAL_HZ) / 10.0f; // --> 0.9 at 60 Hz float audioAttackAveragingRate = (10.0f - deltaTime * NORMAL_HZ) / 10.0f; // --> 0.9 at 60 Hz
_audioAttack = audioAttackAveragingRate * _audioAttack + _audioAttack = audioAttackAveragingRate * _audioAttack +
(1.0f - audioAttackAveragingRate) * fabs((audioLoudness - _longTermAverageLoudness) - _lastLoudness); (1.0f - audioAttackAveragingRate) * fabs((audioLoudness - _longTermAverageLoudness) - _lastLoudness);
@ -142,7 +143,6 @@ void Head::computeEyeMovement(float deltaTime) {
void Head::computeFaceMovement(float deltaTime) { void Head::computeFaceMovement(float deltaTime) {
if (!_isFaceTrackerConnected) { if (!_isFaceTrackerConnected) {
// Update audio attack data for facial animation (eyebrows and mouth)
const float BROW_LIFT_THRESHOLD = 100.0f; const float BROW_LIFT_THRESHOLD = 100.0f;
if (_audioAttack > BROW_LIFT_THRESHOLD) { if (_audioAttack > BROW_LIFT_THRESHOLD) {
_browAudioLift += sqrtf(_audioAttack) * 0.01f; _browAudioLift += sqrtf(_audioAttack) * 0.01f;