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

Added fadein and fadeout animations for display name

Browse source
This commit is contained in:
Jose Carlos 2014-02-18 00:49:26 +01:00
parent e7b54a9ef4
commit 0ec554ec82
4 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
interface/src/avatar/Avatar.cpp
View file

@ -56,8 +56,8 @@ const float HEAD_RATE_MAX = 50.f;
const int NUM_BODY_CONE_SIDES = 9;
const float CHAT_MESSAGE_SCALE = 0.0015f;
const float CHAT_MESSAGE_HEIGHT = 0.1f;
const float DISPLAYNAME_FADEOUT_TIME = 0.5f;
const float DISPLAYNAME_FADEOUT_FACTOR = pow(0.01f, 1.0f / DISPLAYNAME_FADEOUT_TIME);
const float DISPLAYNAME_FADE_TIME = 0.5f;
const float DISPLAYNAME_FADE_FACTOR = pow(0.01f, 1.0f / DISPLAYNAME_FADE_TIME);
const float DISPLAYNAME_ALPHA = 0.95f;
Avatar::Avatar() :
@ -142,12 +142,21 @@ void Avatar::simulate(float deltaTime) {
// Zero thrust out now that we've added it to velocity in this frame
_thrust = glm::vec3(0, 0, 0);
// update animation for display name fadeout
if (!_isShowDisplayName && _displayNameAlpha > 0.0) {
// the alpha function is alpha = coef ^ time(zero based)
// We can make this function recursive: alpha(t) = alpha(t-dt) * coef^(dt)
_displayNameAlpha *= pow(DISPLAYNAME_FADEOUT_FACTOR, deltaTime);
_displayNameAlpha = _displayNameAlpha > 0.01? _displayNameAlpha : 0.0f; // The function is asymptotic to zero. 0.01 is 0 to us
// update animation for display name fade in/out
if ( _displayNameTargetAlpha != _displayNameAlpha) {
// the alpha function is
// Fade out => alpha(t) = factor ^ t => alpha(t+dt) = alpha(t) * factor^(dt)
// Fade in => alpha(t) = 1 - factor^t => alpha(t+dt) = 1-(1-alpha(t))*coef^(dt)
// factor^(dt) = coef
float coef = pow(DISPLAYNAME_FADE_FACTOR, deltaTime);
if (_displayNameTargetAlpha < _displayNameAlpha) {
// Fading out
_displayNameAlpha *= coef;
} else {
// Fading in
_displayNameAlpha = 1 - (1 - _displayNameAlpha) * coef;
}
_displayNameAlpha = abs(_displayNameAlpha - _displayNameTargetAlpha) < 0.01? _displayNameTargetAlpha : _displayNameAlpha;
}
}
@ -628,9 +637,10 @@ float Avatar::getPelvisToHeadLength() const {
}
void Avatar::setShowDisplayName(bool showDisplayName) {
_isShowDisplayName = showDisplayName;
if (showDisplayName) {
_displayNameAlpha = DISPLAYNAME_ALPHA;
_displayNameTargetAlpha = DISPLAYNAME_ALPHA;
} else {
_displayNameTargetAlpha = 0.0f;
}
}

2
interface/src/avatar/Avatar.h
View file

@ -128,7 +128,7 @@ public:
/// \param collision a data structure for storing info about collisions against Models
void applyCollision(CollisionInfo& collision);
float getBoundingRadius() const { return 0.5f * getHeight(); }
float getBoundingRadius() const { return 0.5f * getSkeletonHeight(); }
public slots:
void updateCollisionFlags();

2
libraries/avatars/src/AvatarData.cpp
View file

@ -37,7 +37,7 @@ AvatarData::AvatarData() :
_headData(NULL),
_handData(NULL),
_displayNameWidth(0),
_isShowDisplayName(false),
_displayNameTargetAlpha(0.0f),
_displayNameAlpha(0.0f)
{

2
libraries/avatars/src/AvatarData.h
View file

@ -182,7 +182,7 @@ protected:
QString _displayName;
int _displayNameWidth;
bool _isShowDisplayName;
float _displayNameTargetAlpha;
float _displayNameAlpha;
private: