Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-07 23:53:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Rename FACESHIFT_BLENDSHAPES to BLENDSHAPE_NAMES

Browse source
This commit is contained in:
David Rowe 2020-08-29 11:21:56 +12:00
parent e0767e2f8c
commit 77dbe7a254
7 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/ModelPackager.cpp
View file

@ -296,7 +296,7 @@ void ModelPackager::populateBasicMapping(QVariantHash& mapping, QString filename
mapping.insert(JOINT_FIELD, joints);
// If there are no blendshape mappings, and we detect that this is likely a mixamo file,
// then we can add the default mixamo to "faceshift" mappings
// then we can add the default mixamo to blendshape mappings.
if (!mapping.contains(BLENDSHAPE_FIELD) && likelyMixamoFile) {
QVariantHash blendshapes;
blendshapes.insertMulti("BrowsD_L", QVariantList() << "BrowsDown_Left" << 1.0);

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

@ -157,7 +157,7 @@ void Head::simulate(float deltaTime) {
updateEyeLookAt();
}
// use data to update fake Faceshift blendshape coefficients
// Use data to update fake blendshape coefficients.
if (getProceduralAnimationFlag(HeadData::AudioProceduralBlendshapeAnimation) &&
!getSuppressProceduralAnimationFlag(HeadData::AudioProceduralBlendshapeAnimation)) {

2
libraries/fbx/src/FBXSerializer.cpp
View file

@ -421,7 +421,7 @@ HFMModel* FBXSerializer::extractHFMModel(const hifi::VariantHash& mapping, const
QMultiHash<hifi::ByteArray, WeightedIndex> blendshapeIndices;
for (int i = 0;; i++) {
hifi::ByteArray blendshapeName = FACESHIFT_BLENDSHAPES[i];
hifi::ByteArray blendshapeName = BLENDSHAPE_NAMES[i];
if (blendshapeName.isEmpty()) {
break;
}

2
libraries/fbx/src/FST.cpp
View file

@ -84,7 +84,7 @@ FST* FST::createFSTFromModel(const QString& fstPath, const QString& modelFilePat
// If there are no blendshape mappings, and we detect that this is likely a mixamo file,
// then we can add the default mixamo to "faceshift" mappings
// then we can add the default mixamo to blendshape mappings.
if (likelyMixamoFile) {
QVariantHash blendshapes;
blendshapes.insertMulti("BrowsD_L", QVariantList() << "BrowsDown_Left" << 1.0);

2
libraries/fbx/src/GLTFSerializer.cpp
View file

@ -1550,7 +1550,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash&
QMultiHash<QString, WeightedIndex> blendshapeIndices;
for (int i = 0;; ++i) {
hifi::ByteArray blendshapeName = FACESHIFT_BLENDSHAPES[i];
hifi::ByteArray blendshapeName = BLENDSHAPE_NAMES[i];
if (blendshapeName.isEmpty()) {
break;
}

4
libraries/shared/src/BlendshapeConstants.cpp
View file

@ -11,7 +11,7 @@
#include "BlendshapeConstants.h"
const char* FACESHIFT_BLENDSHAPES[] = {
const char* BLENDSHAPE_NAMES[] = {
"EyeBlink_L",
"EyeBlink_R",
"EyeSquint_L",
@ -80,7 +80,7 @@ const char* FACESHIFT_BLENDSHAPES[] = {
const QMap<QString, int> BLENDSHAPE_LOOKUP_MAP = [] {
QMap<QString, int> toReturn;
for (int i = 0; i < (int)Blendshapes::BlendshapeCount; i++) {
toReturn[FACESHIFT_BLENDSHAPES[i]] = i;
toReturn[BLENDSHAPE_NAMES[i]] = i;
}
return toReturn;
}();

6
libraries/shared/src/BlendshapeConstants.h
View file

@ -17,8 +17,8 @@
#include <glm/glm.hpp>
/// The names of the blendshapes expected by Faceshift, terminated with an empty string.
extern const char* FACESHIFT_BLENDSHAPES[];
/// The names of the supported blendshapes, terminated with an empty string.
extern const char* BLENDSHAPE_NAMES[];
extern const QMap<QString, int> BLENDSHAPE_LOOKUP_MAP;
enum class Blendshapes : int {
@ -97,6 +97,8 @@ enum class LegacyBlendshpaes : int {
LegacyBlendshapeCount
};
// Original blendshapes were per Faceshift.
// NEW in ARKit
// * MouthClose
// * MouthUpperUp_L