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

using glm::degrees() instead of DEGREES_PER_RADIAN

Browse source
This commit is contained in:
Andrew Meadows 2014-03-12 12:08:27 -07:00
parent c3e8d51694
commit e68241d2a9
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/avatar/MyAvatar.cpp
View file

@ -334,12 +334,12 @@ void MyAvatar::updateFromGyros(float deltaTime) {
bool trackerActive = false; bool trackerActive = false;
if (faceshift->isActive()) { if (faceshift->isActive()) {
estimatedPosition = faceshift->getHeadTranslation(); estimatedPosition = faceshift->getHeadTranslation();
estimatedRotation = DEGREES_PER_RADIAN * safeEulerAngles(faceshift->getHeadRotation()); estimatedRotation = glm::degrees(safeEulerAngles(faceshift->getHeadRotation()));
trackerActive = true; trackerActive = true;
} else if (visage->isActive()) { } else if (visage->isActive()) {
estimatedPosition = visage->getHeadTranslation(); estimatedPosition = visage->getHeadTranslation();
estimatedRotation = DEGREES_PER_RADIAN * safeEulerAngles(visage->getHeadRotation()); estimatedRotation = glm::degrees(safeEulerAngles(visage->getHeadRotation()));
trackerActive = true; trackerActive = true;
} }

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

@ -43,7 +43,7 @@ void HeadData::setOrientation(const glm::quat& orientation) {
_owningAvatar->setOrientation(bodyOrientation); _owningAvatar->setOrientation(bodyOrientation);
// the rest goes to the head // the rest goes to the head
glm::vec3 eulers = DEGREES_PER_RADIAN * safeEulerAngles(glm::inverse(bodyOrientation) * orientation); glm::vec3 eulers = glm::degrees(safeEulerAngles(glm::inverse(bodyOrientation) * orientation));
_pitch = eulers.x; _pitch = eulers.x;
_yaw = eulers.y; _yaw = eulers.y;
_roll = eulers.z; _roll = eulers.z;