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

don't look backwards for fbx header from avatars library

Browse source
This commit is contained in:
Stephen Birarda 2014-08-08 10:04:34 -07:00
parent 1a71d655b9
commit c63e886444
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmake/macros/IncludeHifiLibraryHeaders.cmake
View file

@ -10,7 +10,5 @@
# #
macro(include_hifi_library_headers LIBRARY) macro(include_hifi_library_headers LIBRARY)
include_directories("${HIFI_LIBRARY_DIR}/${LIBRARY}/src")
include_directories("${HIFI_LIBRARY_DIR}/libraries/${LIBRARY}/src")
endmacro(include_hifi_library_headers _library _root_dir) endmacro(include_hifi_library_headers _library _root_dir)

1
libraries/avatars/CMakeLists.txt
View file

@ -5,6 +5,7 @@ setup_hifi_library(${TARGET_NAME})
include_glm(${TARGET_NAME} "${ROOT_DIR}") include_glm(${TARGET_NAME} "${ROOT_DIR}")
link_hifi_libraries(${TARGET_NAME} shared octree voxels networking) link_hifi_libraries(${TARGET_NAME} shared octree voxels networking)
include_hifi_library_headers(fbx)
find_package(Qt5 COMPONENTS Network Script) find_package(Qt5 COMPONENTS Network Script)

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

@ -11,14 +11,13 @@
#include <glm/gtx/quaternion.hpp> #include <glm/gtx/quaternion.hpp>
#include <FBXReader.h>
#include <GLMHelpers.h> #include <GLMHelpers.h>
#include <OctreeConstants.h> #include <OctreeConstants.h>
#include "AvatarData.h" #include "AvatarData.h"
#include "HeadData.h" #include "HeadData.h"
#include "../fbx/src/FBXReader.h"
HeadData::HeadData(AvatarData* owningAvatar) : HeadData::HeadData(AvatarData* owningAvatar) :
_baseYaw(0.0f), _baseYaw(0.0f),
_basePitch(0.0f), _basePitch(0.0f),