diff --git a/.gitignore b/.gitignore index eb2f3ec303..c296a918af 100644 --- a/.gitignore +++ b/.gitignore @@ -42,5 +42,9 @@ interface/external/visage/* interface/resources/visage/* !interface/resources/visage/tracker.cfg +# Ignore Faceplus +interface/external/faceplus/* +!interface/external/faceplus/readme.txt + # Ignore interfaceCache for Linux users interface/interfaceCache/ diff --git a/interface/external/faceplus/readme.txt b/interface/external/faceplus/readme.txt index 322ea846bb..e98f8becdc 100644 --- a/interface/external/faceplus/readme.txt +++ b/interface/external/faceplus/readme.txt @@ -5,5 +5,7 @@ Andrzej Kapolka, April 8, 2014 1. Copy the Faceplus sdk folders (include, win32) into the interface/external/faceplus folder. This readme.txt should be there as well. -2. Delete your build directory, run cmake and build, and you should be all set. +2. Copy the Faceplus DLLs from the win32 folder into your path. + +3. Delete your build directory, run cmake and build, and you should be all set. diff --git a/interface/src/devices/Faceplus.cpp b/interface/src/devices/Faceplus.cpp index 2e02126240..89197a5acf 100644 --- a/interface/src/devices/Faceplus.cpp +++ b/interface/src/devices/Faceplus.cpp @@ -33,6 +33,55 @@ void Faceplus::init() { updateEnabled(); } +/* +[2014-04-09T11:42:11] "Mix::Blink_Left" +[2014-04-09T11:42:11] "Mix::Blink_Right" +[2014-04-09T11:42:11] "Mix::BrowsDown_Left" +[2014-04-09T11:42:11] "Mix::BrowsDown_Right" +[2014-04-09T11:42:11] "Mix::BrowsIn_Left" +[2014-04-09T11:42:11] "Mix::BrowsIn_Right" +[2014-04-09T11:42:11] "Mix::BrowsOuterLower_Left" +[2014-04-09T11:42:11] "Mix::BrowsOuterLower_Right" +[2014-04-09T11:42:11] "Mix::BrowsUp_Left" +[2014-04-09T11:42:11] "Mix::BrowsUp_Right" +[2014-04-09T11:42:11] "Mix::EyesWide_Left" +[2014-04-09T11:42:11] "Mix::EyesWide_Right" +[2014-04-09T11:42:11] "Mix::Frown_Left" +[2014-04-09T11:42:11] "Mix::Frown_Right" +[2014-04-09T11:42:11] "Mix::Jaw_RotateY_Left" +[2014-04-09T11:42:11] "Mix::Jaw_RotateY_Right" +[2014-04-09T11:42:11] "Mix::LowerLipDown_Left" +[2014-04-09T11:42:11] "Mix::LowerLipDown_Right" +[2014-04-09T11:42:11] "Mix::LowerLipIn" +[2014-04-09T11:42:11] "Mix::LowerLipOut" +[2014-04-09T11:42:11] "Mix::Midmouth_Left" +[2014-04-09T11:42:11] "Mix::Midmouth_Right" +[2014-04-09T11:42:11] "Mix::MouthDown" +[2014-04-09T11:42:11] "Mix::MouthNarrow_Left" +[2014-04-09T11:42:11] "Mix::MouthNarrow_Right" +[2014-04-09T11:42:11] "Mix::MouthOpen" +[2014-04-09T11:42:11] "Mix::MouthUp" +[2014-04-09T11:42:11] "Mix::MouthWhistle_NarrowAdjust_Left" +[2014-04-09T11:42:11] "Mix::MouthWhistle_NarrowAdjust_Right" +[2014-04-09T11:42:11] "Mix::NoseScrunch_Left" +[2014-04-09T11:42:11] "Mix::NoseScrunch_Right" +[2014-04-09T11:42:11] "Mix::Smile_Left" +[2014-04-09T11:42:11] "Mix::Smile_Right" +[2014-04-09T11:42:11] "Mix::Squint_Left" +[2014-04-09T11:42:11] "Mix::Squint_Right" +[2014-04-09T11:42:11] "Mix::UpperLipIn" +[2014-04-09T11:42:11] "Mix::UpperLipOut" +[2014-04-09T11:42:11] "Mix::UpperLipUp_Left" +[2014-04-09T11:42:11] "Mix::UpperLipUp_Right" +[2014-04-09T11:42:11] "Head_Joint::Rotation_X" +[2014-04-09T11:42:11] "Head_Joint::Rotation_Y" +[2014-04-09T11:42:11] "Head_Joint::Rotation_Z" +[2014-04-09T11:42:11] "Left_Eye_Joint::Rotation_X" +[2014-04-09T11:42:11] "Left_Eye_Joint::Rotation_Y" +[2014-04-09T11:42:11] "Right_Eye_Joint::Rotation_X" +[2014-04-09T11:42:11] "Right_Eye_Joint::Rotation_Y" +*/ + #ifdef HAVE_FACEPLUS static QMultiHash > createChannelNameMap() { QMultiHash > blendshapeMap; @@ -121,9 +170,9 @@ void Faceplus::setEnabled(bool enabled) { int maxIndex = -1; _channelIndexMap.clear(); for (int i = 0; i < channelCount; i++) { - QByteArray channelName = faceplus_output_channel_name(i); + QByteArray name = faceplus_output_channel_name(i); - qDebug() << channelName; + qDebug() << name; for (QMultiHash >::const_iterator it = getChannelNameMap().constFind(name); it != getChannelNameMap().constEnd() && it.key() == name; it++) { diff --git a/interface/src/devices/Faceplus.h b/interface/src/devices/Faceplus.h index a511313d0c..1e3272906c 100644 --- a/interface/src/devices/Faceplus.h +++ b/interface/src/devices/Faceplus.h @@ -42,7 +42,7 @@ private: bool _enabled; bool _active; -#ifdef HAVE_VISAGE +#ifdef HAVE_FACEPLUS QMultiHash > _channelIndexMap; QVector _outputVector; #endif