Merge pull request from dooglifeSF/idles_talks_locomotion_improvements

Idles talks locomotion improvements
This commit is contained in:
Jamil Akram 2019-07-08 13:30:51 -07:00 committed by GitHub
commit aa82c4e971
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
78 changed files with 306 additions and 181 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load diff

View file

@ -132,7 +132,7 @@ void AnimStats::updateStats(bool force) {
if (type == AnimNodeType::Clip) {
// figure out the grayScale color of this line.
const float LIT_TIME = 2.0f;
const float LIT_TIME = 20.0f;
const float FADE_OUT_TIME = 1.0f;
float grayScale = 0.0f;
float secondsElapsed = (float)(now - _animAlphaValueChangedTimers[key]) / (float)USECS_PER_SECOND;
@ -176,7 +176,7 @@ void AnimStats::updateStats(bool force) {
}
// figure out the grayScale color of this line.
const float LIT_TIME = 2.0f;
const float LIT_TIME = 20.0f;
const float FADE_OUT_TIME = 0.5f;
float grayScale = 0.0f;
float secondsElapsed = (float)(now - _animVarChangedTimers[key]) / (float)USECS_PER_SECOND;

View file

@ -159,15 +159,15 @@ std::map<QString, QString> AnimVariantMap::toDebugMap() const {
arg(QString::number(value.y, 'f', 3)).
arg(QString::number(value.z, 'f', 3)).
arg(QString::number(value.w, 'f', 3));
break;
*/
break;
}
case AnimVariant::Type::String:
// To prevent filling up anim stats, don't show string values
/*
result[pair.first] = pair.second.getString();
break;
*/
break;
default:
// invalid AnimVariant::Type
assert(false);