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

Const ajustments

Browse source
This commit is contained in:
luiscuenca 2019-08-29 16:27:54 -07:00
parent 265b6f57a1
commit 3da2a6038d
No known key found for this signature in database
GPG key ID: 2387ECD129A6961D
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -176,7 +176,7 @@ void Head::simulate(float deltaTime) {
} }
void Head::calculateMouthShapes(float deltaTime) { void Head::calculateMouthShapes(float deltaTime) {
const float JAW_OPEN_SCALE = 0.25f; const float JAW_OPEN_SCALE = 0.35f;
const float JAW_OPEN_RATE = 0.9f; const float JAW_OPEN_RATE = 0.9f;
const float JAW_CLOSE_RATE = 0.90f; const float JAW_CLOSE_RATE = 0.90f;
const float TIMESTEP_CONSTANT = 0.0032f; const float TIMESTEP_CONSTANT = 0.0032f;
@ -188,11 +188,11 @@ void Head::calculateMouthShapes(float deltaTime) {
const float FUNNEL_SPEED = 2.335f; const float FUNNEL_SPEED = 2.335f;
const float STOP_GAIN = 5.0f; const float STOP_GAIN = 5.0f;
const float NORMAL_HZ = 60.0f; // the update rate the constant values were tuned for const float NORMAL_HZ = 60.0f; // the update rate the constant values were tuned for
const float MAX_DELTA_LOUDNESS = 100.0f;
float deltaTimeRatio = deltaTime / (1.0f / NORMAL_HZ); float deltaTimeRatio = deltaTime / (1.0f / NORMAL_HZ);
// From the change in loudness, decide how much to open or close the jaw // From the change in loudness, decide how much to open or close the jaw
float MAX_DELTA_LOUDNESS = 300.0f;
float deltaLoudness = glm::max(glm::min(_averageLoudness - _longTermAverageLoudness, MAX_DELTA_LOUDNESS), 0.0f) / MAX_DELTA_LOUDNESS; float deltaLoudness = glm::max(glm::min(_averageLoudness - _longTermAverageLoudness, MAX_DELTA_LOUDNESS), 0.0f) / MAX_DELTA_LOUDNESS;
float audioDelta = powf(deltaLoudness, 2.0f) * JAW_OPEN_SCALE; float audioDelta = powf(deltaLoudness, 2.0f) * JAW_OPEN_SCALE;
if (audioDelta > _audioJawOpen) { if (audioDelta > _audioJawOpen) {