From a616edbb55260a91b0e387ec900d14c29353b15d Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 23 Jan 2015 12:14:13 -0800 Subject: [PATCH] Remove avatars dependency on model,gpu,fbx (OpenGL) --- libraries/avatars/CMakeLists.txt | 2 +- libraries/avatars/src/HeadData.cpp | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libraries/avatars/CMakeLists.txt b/libraries/avatars/CMakeLists.txt index a982aa8394..ccb661376d 100644 --- a/libraries/avatars/CMakeLists.txt +++ b/libraries/avatars/CMakeLists.txt @@ -5,7 +5,7 @@ setup_hifi_library(Network Script) include_glm() -link_hifi_libraries(audio shared networking gpu model fbx) +link_hifi_libraries(audio shared networking) # call macro to include our dependency includes and bubble them up via a property on our target include_dependency_includes() diff --git a/libraries/avatars/src/HeadData.cpp b/libraries/avatars/src/HeadData.cpp index bb53d67f03..98d5524696 100644 --- a/libraries/avatars/src/HeadData.cpp +++ b/libraries/avatars/src/HeadData.cpp @@ -11,12 +11,17 @@ #include -#include +#include #include #include "AvatarData.h" #include "HeadData.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; + HeadData::HeadData(AvatarData* owningAvatar) : _baseYaw(0.0f), _basePitch(0.0f),