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

Fix for camera matrix position when in Vive HMD.

Browse source
This commit is contained in:
Anthony J. Thibault 2015-07-14 18:36:42 -07:00
parent aa66691a73
commit 9363ca2f97
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/src/Application.cpp
View file

@ -966,12 +966,14 @@ void Application::paintGL() {
// Always use the default eye position, not the actual head eye position. // Always use the default eye position, not the actual head eye position.
// Using the latter will cause the camera to wobble with idle animations, // Using the latter will cause the camera to wobble with idle animations,
// or with changes from the face tracker // or with changes from the face tracker
_myCamera.setPosition(_myAvatar->getDefaultEyePosition());
if (!getActiveDisplayPlugin()->isHmd()) { if (!getActiveDisplayPlugin()->isHmd()) {
// If not using an HMD, grab the camera orientation directly _myCamera.setPosition(_myAvatar->getDefaultEyePosition());
_myCamera.setRotation(_myAvatar->getHead()->getCameraOrientation()); _myCamera.setRotation(_myAvatar->getHead()->getCameraOrientation());
} else { } else {
_myCamera.setRotation(glm::quat_cast(_myAvatar->getSensorToWorldMatrix() * getHMDSensorPose())); auto camMat = _myAvatar->getSensorToWorldMatrix() * getHMDSensorPose();
_myCamera.setPosition(extractTranslation(camMat));
_myCamera.setRotation(glm::quat_cast(camMat));
} }
} else if (_myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) { } else if (_myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) {
if (isHMDMode()) { if (isHMDMode()) {
@ -3729,7 +3731,7 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
} }
renderArgs->_debugFlags = renderDebugFlags; renderArgs->_debugFlags = renderDebugFlags;
_entities.render(renderArgs); _entities.render(renderArgs);
ViveControllerManager::getInstance().render(renderArgs); ViveControllerManager::getInstance().updateRendering(renderArgs, _main3DScene, pendingChanges);
} }
// render the ambient occlusion effect if enabled // render the ambient occlusion effect if enabled