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

another requested change made

Browse source
This commit is contained in:
Dante Ruiz 2017-07-05 19:22:19 +01:00
parent e567cf0196
commit 275f48b65a
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
plugins/openvr/src/ViveControllerManager.cpp
View file

@ -62,10 +62,10 @@ static const int SECOND_FOOT = 1;
static const int HIP = 2;
static const int CHEST = 3;
static float HEAD_PUCK_Y_OFFSET = -0.0254f;
static float HEAD_PUCK_Z_OFFSET = -0.152f;
static float HAND_PUCK_Y_OFFSET = -0.0508f;
static float HAND_PUCK_Z_OFFSET = 0.0254f;
static float HEAD_PUCK_Y_OFFSET = 0.0f;
static float HEAD_PUCK_Z_OFFSET = 0.0f;
static float HAND_PUCK_Y_OFFSET = 0.0f;
static float HAND_PUCK_Z_OFFSET = 0.0f;
const char* ViveControllerManager::NAME { "OpenVR" };
@ -763,8 +763,12 @@ glm::mat4 ViveControllerManager::InputDevice::calculateDefaultToReferenceForHead
glm::mat4 finalHeadPuck = newHeadPuck * headPuckOffset;
glm::mat4 defaultHeadOffset = glm::inverse(inputCalibration.defaultCenterEyeMat) * inputCalibration.defaultHeadMat;
glm::mat4 currentHead = finalHeadPuck * defaultHeadOffset;
// calculate the defaultToRefrenceXform
glm::mat4 defaultToReferenceMat = finalHeadPuck * glm::inverse(inputCalibration.defaultHeadMat);
glm::mat4 defaultToReferenceMat = currentHead * glm::inverse(inputCalibration.defaultHeadMat);
return defaultToReferenceMat;
}