Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 18:38:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove avatars dependency on model,gpu,fbx (OpenGL)

Browse source
This commit is contained in:
Atlante45 2015-01-23 12:14:13 -08:00
parent bbf6ae7b01
commit a616edbb55
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/avatars/CMakeLists.txt
View file

@ -5,7 +5,7 @@ setup_hifi_library(Network Script)
include_glm() 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 # call macro to include our dependency includes and bubble them up via a property on our target
include_dependency_includes() include_dependency_includes()

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

@ -11,12 +11,17 @@
#include <glm/gtx/quaternion.hpp> #include <glm/gtx/quaternion.hpp>
#include <FBXReader.h> #include <FaceshiftConstants.h>
#include <GLMHelpers.h> #include <GLMHelpers.h>
#include "AvatarData.h" #include "AvatarData.h"
#include "HeadData.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) : HeadData::HeadData(AvatarData* owningAvatar) :
_baseYaw(0.0f), _baseYaw(0.0f),
_basePitch(0.0f), _basePitch(0.0f),