Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 06:29:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tabs -> spaces.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-05-14 13:48:03 -07:00
parent 4cbe8a41db
commit 95c05a720d
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -239,8 +239,8 @@ void MyAvatar::updateFromTrackers(float deltaTime) {
if (Application::getInstance()->getPrioVR()->isActive()) { if (Application::getInstance()->getPrioVR()->isActive()) {
estimatedRotation = glm::degrees(safeEulerAngles(Application::getInstance()->getPrioVR()->getHeadRotation())); estimatedRotation = glm::degrees(safeEulerAngles(Application::getInstance()->getPrioVR()->getHeadRotation()));
estimatedRotation.x *= -1.0f; estimatedRotation.x *= -1.0f;
estimatedRotation.z *= -1.0f; estimatedRotation.z *= -1.0f;
} else { } else {
FaceTracker* tracker = Application::getInstance()->getActiveFaceTracker(); FaceTracker* tracker = Application::getInstance()->getActiveFaceTracker();

12
interface/src/devices/PrioVR.cpp
View file

@ -80,12 +80,12 @@ void PrioVR::update() {
unsigned int timestamp; unsigned int timestamp;
yei_getLastStreamDataAll(_skeletalDevice, (char*)_jointRotations.data(), yei_getLastStreamDataAll(_skeletalDevice, (char*)_jointRotations.data(),
_jointRotations.size() * sizeof(glm::quat), &timestamp); _jointRotations.size() * sizeof(glm::quat), &timestamp);
// convert to our expected coordinate system // convert to our expected coordinate system
for (int i = 0; i < _jointRotations.size(); i++) { for (int i = 0; i < _jointRotations.size(); i++) {
_jointRotations[i].y *= -1.0f; _jointRotations[i].y *= -1.0f;
_jointRotations[i].z *= -1.0f; _jointRotations[i].z *= -1.0f;
} }
#endif #endif
} }

2
interface/src/devices/Visage.cpp
View file

@ -56,7 +56,7 @@ Visage::~Visage() {
#ifdef HAVE_VISAGE #ifdef HAVE_VISAGE
_tracker->stop(); _tracker->stop();
// deleting the tracker crashes windows; disable for now // deleting the tracker crashes windows; disable for now
//delete _tracker; //delete _tracker;
delete _data; delete _data;
#endif #endif
} }