Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve variable name

Browse source
This commit is contained in:
David Rowe 2017-05-11 18:37:23 +12:00
parent 98b943269b
commit e426d70437
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/avatars/src/HeadData.cpp
View file

@ -36,7 +36,7 @@ HeadData::HeadData(AvatarData* owningAvatar) :
_browAudioLift(0.0f),
_blendshapeCoefficients(QVector<float>(0, 0.0f)),
_transientBlendshapeCoefficients(QVector<float>(0, 0.0f)),
_currentBlendshapeCoefficients(QVector<float>(0, 0.0f)),
_summedBlendshapeCoefficients(QVector<float>(0, 0.0f)),
_owningAvatar(owningAvatar)
{
@ -87,21 +87,21 @@ static const QMap<QString, int>& getBlendshapesLookupMap() {
const QVector<float>& HeadData::getSummedBlendshapeCoefficients() {
int maxSize = std::max(_blendshapeCoefficients.size(), _transientBlendshapeCoefficients.size());
if (_currentBlendshapeCoefficients.size() != maxSize) {
_currentBlendshapeCoefficients.resize(maxSize);
if (_summedBlendshapeCoefficients.size() != maxSize) {
_summedBlendshapeCoefficients.resize(maxSize);
}
for (int i = 0; i < maxSize; i++) {
if (i >= _blendshapeCoefficients.size()) {
_currentBlendshapeCoefficients[i] = _transientBlendshapeCoefficients[i];
_summedBlendshapeCoefficients[i] = _transientBlendshapeCoefficients[i];
} else if (i >= _transientBlendshapeCoefficients.size()) {
_currentBlendshapeCoefficients[i] = _blendshapeCoefficients[i];
_summedBlendshapeCoefficients[i] = _blendshapeCoefficients[i];
} else {
_currentBlendshapeCoefficients[i] = _blendshapeCoefficients[i] + _transientBlendshapeCoefficients[i];
_summedBlendshapeCoefficients[i] = _blendshapeCoefficients[i] + _transientBlendshapeCoefficients[i];
}
}
return _currentBlendshapeCoefficients;
return _summedBlendshapeCoefficients;
}
void HeadData::setBlendshape(QString name, float val) {

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

@ -94,7 +94,7 @@ protected:
QVector<float> _blendshapeCoefficients;
QVector<float> _transientBlendshapeCoefficients;
QVector<float> _currentBlendshapeCoefficients;
QVector<float> _summedBlendshapeCoefficients;
AvatarData* _owningAvatar;
private: