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

PR feedback

Browse source
This commit is contained in:
Brad Davis 2016-02-16 16:26:17 -08:00
parent 56fc9ea301
commit d61f4fbb25
2 changed files with 4 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
View file

@ -15,9 +15,7 @@
#include <GLMHelpers.h> #include <GLMHelpers.h>
#include <plugins/PluginContainer.h> #include <plugins/PluginContainer.h>
#include "../Logging.h"
Q_DECLARE_LOGGING_CATEGORY(displayplugins)
Q_LOGGING_CATEGORY(displayplugins, "hifi.displayplugins")
static const QString MONO_PREVIEW = "Mono Preview"; static const QString MONO_PREVIEW = "Mono Preview";
static const QString FRAMERATE = DisplayPlugin::MENU_PATH() + ">Framerate"; static const QString FRAMERATE = DisplayPlugin::MENU_PATH() + ">Framerate";
@ -87,34 +85,3 @@ void HmdDisplayPlugin::internalPresent() {
swapBuffers(); swapBuffers();
} }
} }
//// screen preview mirroring
//if (_enablePreview) {
// auto windowSize = toGlm(_window->size());
// if (_monoPreview) {
// // Find the aspect ratio for one eye
// auto eyeAspect = (float)(size.x / 2) / (float)size.y;
// auto windowAspect = (float)windowSize.x / (float)windowSize.y;
// if (eyeAspect < windowAspect) {
// Context::Viewport(windowSize.x * 2, windowSize.y);
// Context::Scissor(0, windowSize.y, windowSize.x, windowSize.y);
// } else {
//
// }
// } else {
// Context::Viewport(windowSize.x, windowSize.y);
// }
// glBindTexture(GL_TEXTURE_2D, _currentSceneTexture);
// GLenum err = glGetError();
// Q_ASSERT(0 == err);
// drawUnitQuad();
//}
///*
//The swapbuffer call here is only required if we want to mirror the content to the screen.
//However, it should only be done if we can reliably disable v-sync on the mirror surface,
//otherwise the swapbuffer delay will interefere with the framerate of the headset
//*/
//if (_enablePreview) {
// swapBuffers();
//}

3
plugins/openvr/src/OpenVrDisplayPlugin.cpp
View file

@ -59,6 +59,9 @@ void OpenVrDisplayPlugin::activate() {
_eyeOffsets[eye] = toGlm(_hmd->GetEyeToHeadTransform(eye)); _eyeOffsets[eye] = toGlm(_hmd->GetEyeToHeadTransform(eye));
_eyeProjections[eye] = toGlm(_hmd->GetProjectionMatrix(eye, DEFAULT_NEAR_CLIP, DEFAULT_FAR_CLIP, vr::API_OpenGL)); _eyeProjections[eye] = toGlm(_hmd->GetProjectionMatrix(eye, DEFAULT_NEAR_CLIP, DEFAULT_FAR_CLIP, vr::API_OpenGL));
}); });
// FIXME Calculate the proper combined projection by using GetProjectionRaw values from both eyes
_cullingProjection = _eyeProjections[0];
} }
_compositor = vr::VRCompositor(); _compositor = vr::VRCompositor();