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

removed dead code

Browse source
This commit is contained in:
Dante Ruiz 2017-05-06 00:21:52 +01:00
parent 8813306857
commit a744db56aa
1 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,29 +48,18 @@ const quint64 CALIBRATION_TIMELAPSE = 3000000;
const char* ViveControllerManager::NAME { "OpenVR" }; const char* ViveControllerManager::NAME { "OpenVR" };
/*glm::mat4 computeDefualtHead(glm::mat4 centerOfEye, glm::mat4 jointHead) {
headOffset = glm::muliply(glm::inverse(centerOfEye), jointHead);
return glm::
}*/
glm::mat4 computeOffset(glm::mat4 defaultToRefrenceMat, glm::mat4 defaultJointMat, controller::Pose puckPose) { glm::mat4 computeOffset(glm::mat4 defaultToRefrenceMat, glm::mat4 defaultJointMat, controller::Pose puckPose) {
///qDebug() << "-------------> computing offset <-------------";
glm::mat4 poseMat = createMatFromQuatAndPos(puckPose.rotation, puckPose.translation); glm::mat4 poseMat = createMatFromQuatAndPos(puckPose.rotation, puckPose.translation);
glm::mat4 refrenceJointMat = defaultToRefrenceMat * defaultJointMat; glm::mat4 refrenceJointMat = defaultToRefrenceMat * defaultJointMat;
return ( glm::inverse(poseMat) * refrenceJointMat); return ( glm::inverse(poseMat) * refrenceJointMat);
} }
bool sortPucksYPosition(std::pair<uint32_t, controller::Pose> firstPuck, std::pair<uint32_t, controller::Pose> secondPuck) { bool sortPucksYPosition(std::pair<uint32_t, controller::Pose> firstPuck, std::pair<uint32_t, controller::Pose> secondPuck) {
controller::Pose firstPose = firstPuck.second; controller::Pose firstPose = firstPuck.second;
controller::Pose secondPose = secondPuck.second; controller::Pose secondPose = secondPuck.second;
return (firstPose.translation.y < secondPose.translation.y); return (firstPose.translation.y < secondPose.translation.y);
} }
void printPose(controller::Pose pose) {
qDebug() << "-------------> printing out controller::Pose <--------------";
qDebug() << QString::fromStdString(glm::to_string(pose.translation));
qDebug() << QString::fromStdString(glm::to_string(pose.rotation));
}
bool ViveControllerManager::isSupported() const { bool ViveControllerManager::isSupported() const {
return openVrSupported(); return openVrSupported();
} }
@ -276,8 +265,6 @@ void ViveControllerManager::InputDevice::calibrate(const controller::InputCalibr
} }
if (_config == Config::Feet) { if (_config == Config::Feet) {
controller::Pose leftPose = addOffsetToPuckPose(controller::LEFT_FOOT);
printPose(leftPose);
// done // done
} else if (_config == Config::FeetAndHips) { } else if (_config == Config::FeetAndHips) {
_jointToPuckMap[controller::HIPS] = _validTrackedObjects[2].first; _jointToPuckMap[controller::HIPS] = _validTrackedObjects[2].first;