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

cleanup to blendshapes

Browse source
This commit is contained in:
kunalgosar 2017-04-14 13:59:09 -07:00
parent 0a295fc258
commit d215856b23
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/avatar/SkeletonModel.cpp
View file

@ -242,7 +242,7 @@ void SkeletonModel::updateAttitude() {
void SkeletonModel::simulate(float deltaTime, bool fullUpdate) { void SkeletonModel::simulate(float deltaTime, bool fullUpdate) {
updateAttitude(); updateAttitude();
if (fullUpdate) { if (fullUpdate) {
setBlendshapeCoefficients(_owningAvatar->getHead()->getSummedBlendshapeCoefficients()); setBlendshapeCoefficients(_owningAvatar->getHead()->getSummedBlendshapeCoefficients());
Model::simulate(deltaTime, fullUpdate); Model::simulate(deltaTime, fullUpdate);

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

@ -438,12 +438,6 @@ public:
_headData->setBlendshapeCoefficients(blendshapeCoefficients); _headData->setBlendshapeCoefficients(blendshapeCoefficients);
} }
} }
void setSummedBlendshapeCoefficients(QVector<float>& blendshapeCoefficients) {
if (_headData) {
_headData->setSummedBlendshapeCoefficients(blendshapeCoefficients);
}
}
// access to Head().set/getMousePitch (degrees) // access to Head().set/getMousePitch (degrees)
float getHeadPitch() const { return _headData->getBasePitch(); } float getHeadPitch() const { return _headData->getBasePitch(); }

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

@ -39,7 +39,7 @@ HeadData::HeadData(AvatarData* owningAvatar) :
_averageLoudness(0.0f), _averageLoudness(0.0f),
_browAudioLift(0.0f), _browAudioLift(0.0f),
_owningAvatar(owningAvatar), _owningAvatar(owningAvatar),
_baseBlendshapeCoefficients(0, 0), _baseBlendshapeCoefficients(0, 0)
{ {
} }
@ -96,6 +96,7 @@ const QVector<float>& HeadData::getSummedBlendshapeCoefficients() {
void HeadData::setBlendshape(QString name, float val) { void HeadData::setBlendshape(QString name, float val) {
const auto& blendshapeLookupMap = getBlendshapesLookupMap(); const auto& blendshapeLookupMap = getBlendshapesLookupMap();
//Check to see if the named blendshape exists, and then set its value if it does //Check to see if the named blendshape exists, and then set its value if it does
auto it = blendshapeLookupMap.find(name); auto it = blendshapeLookupMap.find(name);
if (it != blendshapeLookupMap.end()) { if (it != blendshapeLookupMap.end()) {