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

delete-trailing-whitespace

Browse source
This commit is contained in:
Anthony J. Thibault 2017-07-05 15:50:47 -07:00
parent e384f6d1b7
commit 8c15d1bab9
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -124,7 +124,7 @@ static glm::mat4 calculateResetMat() {
float const UI_RADIUS = 1.0f; float const UI_RADIUS = 1.0f;
float const UI_HEIGHT = 1.6f; float const UI_HEIGHT = 1.6f;
float const UI_Z_OFFSET = 0.5; float const UI_Z_OFFSET = 0.5;
float xSize, zSize; float xSize, zSize;
chaperone->GetPlayAreaSize(&xSize, &zSize); chaperone->GetPlayAreaSize(&xSize, &zSize);
glm::vec3 uiPos(0.0f, UI_HEIGHT, UI_RADIUS - (0.5f * zSize) - UI_Z_OFFSET); glm::vec3 uiPos(0.0f, UI_HEIGHT, UI_RADIUS - (0.5f * zSize) - UI_Z_OFFSET);
@ -251,7 +251,7 @@ void ViveControllerManager::pluginUpdate(float deltaTime, const controller::Inpu
_resetMat = calculateResetMat(); _resetMat = calculateResetMat();
_resetMatCalculated = true; _resetMatCalculated = true;
} }
_system->GetDeviceToAbsoluteTrackingPose(vr::TrackingUniverseStanding, 0, _nextSimPoseData.vrPoses, vr::k_unMaxTrackedDeviceCount); _system->GetDeviceToAbsoluteTrackingPose(vr::TrackingUniverseStanding, 0, _nextSimPoseData.vrPoses, vr::k_unMaxTrackedDeviceCount);
_nextSimPoseData.update(_resetMat); _nextSimPoseData.update(_resetMat);
} else if (isDesktopMode()) { } else if (isDesktopMode()) {
@ -429,7 +429,7 @@ void ViveControllerManager::InputDevice::emitCalibrationStatus() {
status["hand_pucks"] = (_handConfig == HandConfig::Pucks); status["hand_pucks"] = (_handConfig == HandConfig::Pucks);
status["puckCount"] = (int)_validTrackedObjects.size(); status["puckCount"] = (int)_validTrackedObjects.size();
status["UI"] = _calibrate; status["UI"] = _calibrate;
emit inputConfiguration->calibrationStatus(status); emit inputConfiguration->calibrationStatus(status);
} }
@ -480,7 +480,7 @@ void ViveControllerManager::InputDevice::sendUserActivityData(QString activity)
{"head_puck", (_headConfig == HeadConfig::Puck) ? true : false}, {"head_puck", (_headConfig == HeadConfig::Puck) ? true : false},
{"hand_pucks", (_handConfig == HandConfig::Pucks) ? true : false} {"hand_pucks", (_handConfig == HandConfig::Pucks) ? true : false}
}; };
UserActivityLogger::getInstance().logAction(activity, jsonData); UserActivityLogger::getInstance().logAction(activity, jsonData);
} }
@ -513,12 +513,12 @@ void ViveControllerManager::InputDevice::calibrate(const controller::InputCalibr
glm::mat4 defaultToReferenceMat = glm::mat4(); glm::mat4 defaultToReferenceMat = glm::mat4();
if (_headConfig == HeadConfig::HMD) { if (_headConfig == HeadConfig::HMD) {
defaultToReferenceMat = calculateDefaultToReferenceForHmd(inputCalibration); defaultToReferenceMat = calculateDefaultToReferenceForHmd(inputCalibration);
} else if (_headConfig == HeadConfig::Puck) { } else if (_headConfig == HeadConfig::Puck) {
defaultToReferenceMat = calculateDefaultToReferenceForHeadPuck(inputCalibration); defaultToReferenceMat = calculateDefaultToReferenceForHeadPuck(inputCalibration);
} }
_config = _preferedConfig; _config = _preferedConfig;
bool headConfigured = configureHead(defaultToReferenceMat, inputCalibration); bool headConfigured = configureHead(defaultToReferenceMat, inputCalibration);
bool handsConfigured = configureHands(defaultToReferenceMat, inputCalibration); bool handsConfigured = configureHands(defaultToReferenceMat, inputCalibration);
bool bodyConfigured = configureBody(defaultToReferenceMat, inputCalibration); bool bodyConfigured = configureBody(defaultToReferenceMat, inputCalibration);
@ -952,12 +952,12 @@ void ViveControllerManager::InputDevice::calibrateLeftHand(glm::mat4& defaultToR
glm::mat4 newHandMat = glm::mat4(glm::vec4(xPrime, 0.0f), glm::vec4(yPrime, 0.0f), glm::mat4 newHandMat = glm::mat4(glm::vec4(xPrime, 0.0f), glm::vec4(yPrime, 0.0f),
glm::vec4(zPrime, 0.0f), glm::vec4(0.0f, 0.0f, 0.0f, 1.0f)); glm::vec4(zPrime, 0.0f), glm::vec4(0.0f, 0.0f, 0.0f, 1.0f));
glm::vec3 translationOffset = glm::vec3(0.0f, _handPuckYOffset, _handPuckZOffset); glm::vec3 translationOffset = glm::vec3(0.0f, _handPuckYOffset, _handPuckZOffset);
glm::quat initialRotation = glmExtractRotation(handPoseAvatarMat); glm::quat initialRotation = glmExtractRotation(handPoseAvatarMat);
glm::quat finalRotation = glmExtractRotation(newHandMat); glm::quat finalRotation = glmExtractRotation(newHandMat);
glm::quat rotationOffset = glm::inverse(initialRotation) * finalRotation; glm::quat rotationOffset = glm::inverse(initialRotation) * finalRotation;
glm::mat4 offsetMat = createMatFromQuatAndPos(rotationOffset, translationOffset); glm::mat4 offsetMat = createMatFromQuatAndPos(rotationOffset, translationOffset);
@ -982,13 +982,13 @@ void ViveControllerManager::InputDevice::calibrateRightHand(glm::mat4& defaultTo
glm::vec3 yPrime = glm::normalize(glm::cross(zPrime, xPrime)); glm::vec3 yPrime = glm::normalize(glm::cross(zPrime, xPrime));
glm::mat4 newHandMat = glm::mat4(glm::vec4(xPrime, 0.0f), glm::vec4(yPrime, 0.0f), glm::mat4 newHandMat = glm::mat4(glm::vec4(xPrime, 0.0f), glm::vec4(yPrime, 0.0f),
glm::vec4(zPrime, 0.0f), glm::vec4(0.0f, 0.0f, 0.0f, 1.0f)); glm::vec4(zPrime, 0.0f), glm::vec4(0.0f, 0.0f, 0.0f, 1.0f));
glm::vec3 translationOffset = glm::vec3(0.0f, _handPuckYOffset, _handPuckZOffset); glm::vec3 translationOffset = glm::vec3(0.0f, _handPuckYOffset, _handPuckZOffset);
glm::quat initialRotation = glmExtractRotation(handPoseAvatarMat); glm::quat initialRotation = glmExtractRotation(handPoseAvatarMat);
glm::quat finalRotation = glmExtractRotation(newHandMat); glm::quat finalRotation = glmExtractRotation(newHandMat);
glm::quat rotationOffset = glm::inverse(initialRotation) * finalRotation; glm::quat rotationOffset = glm::inverse(initialRotation) * finalRotation;
glm::mat4 offsetMat = createMatFromQuatAndPos(rotationOffset, translationOffset); glm::mat4 offsetMat = createMatFromQuatAndPos(rotationOffset, translationOffset);
@ -1005,7 +1005,7 @@ void ViveControllerManager::InputDevice::calibrateFeet(glm::mat4& defaultToRefer
auto& secondFoot = _validTrackedObjects[SECOND_FOOT]; auto& secondFoot = _validTrackedObjects[SECOND_FOOT];
controller::Pose& firstFootPose = firstFoot.second; controller::Pose& firstFootPose = firstFoot.second;
controller::Pose& secondFootPose = secondFoot.second; controller::Pose& secondFootPose = secondFoot.second;
if (determineLimbOrdering(firstFootPose, secondFootPose, headXAxis, headPosition)) { if (determineLimbOrdering(firstFootPose, secondFootPose, headXAxis, headPosition)) {
calibrateFoot(defaultToReferenceMat, inputCalibration, firstFoot, true); calibrateFoot(defaultToReferenceMat, inputCalibration, firstFoot, true);
calibrateFoot(defaultToReferenceMat, inputCalibration, secondFoot, false); calibrateFoot(defaultToReferenceMat, inputCalibration, secondFoot, false);

2
plugins/openvr/src/ViveControllerManager.h
View file

@ -152,7 +152,7 @@ private:
HandController, HandController,
Pucks Pucks
}; };
Config _config { Config::None }; Config _config { Config::None };
Config _preferedConfig { Config::None }; Config _preferedConfig { Config::None };
HeadConfig _headConfig { HeadConfig::HMD }; HeadConfig _headConfig { HeadConfig::HMD };