From 6d9deffdaabb7f1eda3ac576aa45a481d0081158 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 23 Jan 2015 11:58:22 -0800 Subject: [PATCH] Remove avatars dependency to octree --- libraries/avatars/CMakeLists.txt | 2 +- libraries/avatars/src/HeadData.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/avatars/CMakeLists.txt b/libraries/avatars/CMakeLists.txt index 774653497d..a982aa8394 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 octree networking gpu model fbx) +link_hifi_libraries(audio shared networking gpu model fbx) # 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 5bf33d1153..bb53d67f03 100644 --- a/libraries/avatars/src/HeadData.cpp +++ b/libraries/avatars/src/HeadData.cpp @@ -13,7 +13,6 @@ #include #include -#include #include "AvatarData.h" #include "HeadData.h" @@ -44,7 +43,8 @@ glm::quat HeadData::getOrientation() const { void HeadData::setOrientation(const glm::quat& orientation) { // rotate body about vertical axis glm::quat bodyOrientation = _owningAvatar->getOrientation(); - glm::vec3 newFront = glm::inverse(bodyOrientation) * (orientation * IDENTITY_FRONT); + const glm::vec3 front = glm::vec3( 0.0f, 0.0f, -1.0f); + glm::vec3 newFront = glm::inverse(bodyOrientation) * (orientation * front); bodyOrientation = bodyOrientation * glm::angleAxis(atan2f(-newFront.x, -newFront.z), glm::vec3(0.0f, 1.0f, 0.0f)); _owningAvatar->setOrientation(bodyOrientation);