From bbf6ae7b0185fca17d551dc4ae483efa11ff1284 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 23 Jan 2015 12:11:08 -0800 Subject: [PATCH] Move Faceshift constants to their own file in shared --- libraries/fbx/src/FBXReader.cpp | 69 +++------------------ libraries/fbx/src/FBXReader.h | 5 -- libraries/shared/src/FaceshiftConstants.cpp | 66 ++++++++++++++++++++ libraries/shared/src/FaceshiftConstants.h | 20 ++++++ 4 files changed, 94 insertions(+), 66 deletions(-) create mode 100644 libraries/shared/src/FaceshiftConstants.cpp create mode 100644 libraries/shared/src/FaceshiftConstants.h diff --git a/libraries/fbx/src/FBXReader.cpp b/libraries/fbx/src/FBXReader.cpp index 3015de52ff..4895fb4ce9 100644 --- a/libraries/fbx/src/FBXReader.cpp +++ b/libraries/fbx/src/FBXReader.cpp @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -610,60 +611,6 @@ QString getID(const QVariantList& properties, int index = 0) { return processID(properties.at(index).toString()); } -const char* FACESHIFT_BLENDSHAPES[] = { - "EyeBlink_L", - "EyeBlink_R", - "EyeSquint_L", - "EyeSquint_R", - "EyeDown_L", - "EyeDown_R", - "EyeIn_L", - "EyeIn_R", - "EyeOpen_L", - "EyeOpen_R", - "EyeOut_L", - "EyeOut_R", - "EyeUp_L", - "EyeUp_R", - "BrowsD_L", - "BrowsD_R", - "BrowsU_C", - "BrowsU_L", - "BrowsU_R", - "JawFwd", - "JawLeft", - "JawOpen", - "JawChew", - "JawRight", - "MouthLeft", - "MouthRight", - "MouthFrown_L", - "MouthFrown_R", - "MouthSmile_L", - "MouthSmile_R", - "MouthDimple_L", - "MouthDimple_R", - "LipsStretch_L", - "LipsStretch_R", - "LipsUpperClose", - "LipsLowerClose", - "LipsUpperUp", - "LipsLowerDown", - "LipsUpperOpen", - "LipsLowerOpen", - "LipsFunnel", - "LipsPucker", - "ChinLowerRaise", - "ChinUpperRaise", - "Sneer", - "Puff", - "CheekSquint_L", - "CheekSquint_R", - "" -}; - -const int NUM_FACESHIFT_BLENDSHAPES = sizeof(FACESHIFT_BLENDSHAPES) / sizeof(char*); - const char* HUMANIK_JOINTS[] = { "RightHand", "RightForeArm", @@ -1716,13 +1663,13 @@ FBXGeometry extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping, #endif } material.id = getID(object.properties); - - material._material = model::MaterialPointer(new model::Material()); - material._material->setEmissive(material.emissive); - material._material->setDiffuse(material.diffuse); - material._material->setSpecular(material.specular); - material._material->setShininess(material.shininess); - material._material->setOpacity(material.opacity); + + material._material = model::MaterialPointer(new model::Material()); + material._material->setEmissive(material.emissive); + material._material->setDiffuse(material.diffuse); + material._material->setSpecular(material.specular); + material._material->setShininess(material.shininess); + material._material->setOpacity(material.opacity); materials.insert(material.id, material); diff --git a/libraries/fbx/src/FBXReader.h b/libraries/fbx/src/FBXReader.h index 98e4d60826..eeff746e0b 100644 --- a/libraries/fbx/src/FBXReader.h +++ b/libraries/fbx/src/FBXReader.h @@ -32,11 +32,6 @@ class FBXNode; typedef QList FBXNodeList; -/// The names of the blendshapes expected by Faceshift, terminated with an empty string. -extern const char* FACESHIFT_BLENDSHAPES[]; -/// The size of FACESHIFT_BLENDSHAPES -extern const int NUM_FACESHIFT_BLENDSHAPES; - /// The names of the joints in the Maya HumanIK rig, terminated with an empty string. extern const char* HUMANIK_JOINTS[]; diff --git a/libraries/shared/src/FaceshiftConstants.cpp b/libraries/shared/src/FaceshiftConstants.cpp new file mode 100644 index 0000000000..e6c929409a --- /dev/null +++ b/libraries/shared/src/FaceshiftConstants.cpp @@ -0,0 +1,66 @@ +// +// FaceshiftConstants.cpp +// +// +// Created by Clement on 1/23/15. +// Copyright 2015 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +#include "FaceshiftConstants.h" + +const char* FACESHIFT_BLENDSHAPES[] = { + "EyeBlink_L", + "EyeBlink_R", + "EyeSquint_L", + "EyeSquint_R", + "EyeDown_L", + "EyeDown_R", + "EyeIn_L", + "EyeIn_R", + "EyeOpen_L", + "EyeOpen_R", + "EyeOut_L", + "EyeOut_R", + "EyeUp_L", + "EyeUp_R", + "BrowsD_L", + "BrowsD_R", + "BrowsU_C", + "BrowsU_L", + "BrowsU_R", + "JawFwd", + "JawLeft", + "JawOpen", + "JawChew", + "JawRight", + "MouthLeft", + "MouthRight", + "MouthFrown_L", + "MouthFrown_R", + "MouthSmile_L", + "MouthSmile_R", + "MouthDimple_L", + "MouthDimple_R", + "LipsStretch_L", + "LipsStretch_R", + "LipsUpperClose", + "LipsLowerClose", + "LipsUpperUp", + "LipsLowerDown", + "LipsUpperOpen", + "LipsLowerOpen", + "LipsFunnel", + "LipsPucker", + "ChinLowerRaise", + "ChinUpperRaise", + "Sneer", + "Puff", + "CheekSquint_L", + "CheekSquint_R", + "" +}; + +const int NUM_FACESHIFT_BLENDSHAPES = sizeof(FACESHIFT_BLENDSHAPES) / sizeof(char*); diff --git a/libraries/shared/src/FaceshiftConstants.h b/libraries/shared/src/FaceshiftConstants.h new file mode 100644 index 0000000000..ee6e43fdbc --- /dev/null +++ b/libraries/shared/src/FaceshiftConstants.h @@ -0,0 +1,20 @@ +// +// FaceshiftConstants.h +// +// +// Created by Clement on 1/23/15. +// Copyright 2015 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +#ifndef hifi_FaceshiftConstants_h +#define hifi_FaceshiftConstants_h + +/// The names of the blendshapes expected by Faceshift, terminated with an empty string. +extern const char* FACESHIFT_BLENDSHAPES[]; +/// The size of FACESHIFT_BLENDSHAPES +extern const int NUM_FACESHIFT_BLENDSHAPES; + +#endif // hifi_FaceshiftConstants_h \ No newline at end of file