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

preserve preview aspect ratio, fix device pixel ratio scaling

Browse source
This commit is contained in:
SamGondelman 2016-06-29 11:02:43 -07:00
parent a741ae5069
commit af2a0ed924
2 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -97,6 +97,7 @@ void HmdDisplayPlugin::downloadFinished() {
Texture::MinFilter(TextureTarget::_2D, TextureMinFilter::Linear); Texture::MinFilter(TextureTarget::_2D, TextureMinFilter::Linear);
Texture::MagFilter(TextureTarget::_2D, TextureMagFilter::Linear); Texture::MagFilter(TextureTarget::_2D, TextureMagFilter::Linear);
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
_previewAspect = ((float)previewTexture.width())/((float)previewTexture.height());
_firstPreview = true; _firstPreview = true;
} }
} }
@ -396,30 +397,31 @@ void HmdDisplayPlugin::internalPresent() {
// screen preview mirroring // screen preview mirroring
auto window = _container->getPrimaryWidget(); auto window = _container->getPrimaryWidget();
auto windowSize = toGlm(window->size());
auto devicePixelRatio = window->devicePixelRatio(); auto devicePixelRatio = window->devicePixelRatio();
auto windowSize = toGlm(window->size());
windowSize *= devicePixelRatio;
float windowAspect = aspect(windowSize);
float sceneAspect = _enablePreview ? aspect(_renderTargetSize) : _previewAspect;
if (_enablePreview && _monoPreview) {
sceneAspect /= 2.0f;
}
float aspectRatio = sceneAspect / windowAspect;
uvec2 targetViewportSize = windowSize;
if (aspectRatio < 1.0f) {
targetViewportSize.x *= aspectRatio;
} else {
targetViewportSize.y /= aspectRatio;
}
uvec2 targetViewportPosition;
if (targetViewportSize.x < windowSize.x) {
targetViewportPosition.x = (windowSize.x - targetViewportSize.x) / 2;
} else if (targetViewportSize.y < windowSize.y) {
targetViewportPosition.y = (windowSize.y - targetViewportSize.y) / 2;
}
if (_enablePreview) { if (_enablePreview) {
float windowAspect = aspect(windowSize);
float sceneAspect = aspect(_renderTargetSize);
if (_monoPreview) {
sceneAspect /= 2.0f;
}
float aspectRatio = sceneAspect / windowAspect;
uvec2 targetViewportSize = windowSize;
if (aspectRatio < 1.0f) {
targetViewportSize.x *= aspectRatio;
} else {
targetViewportSize.y /= aspectRatio;
}
uvec2 targetViewportPosition;
if (targetViewportSize.x < windowSize.x) {
targetViewportPosition.x = (windowSize.x - targetViewportSize.x) / 2;
} else if (targetViewportSize.y < windowSize.y) {
targetViewportPosition.y = (windowSize.y - targetViewportSize.y) / 2;
}
using namespace oglplus; using namespace oglplus;
Context::Clear().ColorBuffer(); Context::Clear().ColorBuffer();
auto sourceSize = _compositeFramebuffer->size; auto sourceSize = _compositeFramebuffer->size;
@ -438,7 +440,7 @@ void HmdDisplayPlugin::internalPresent() {
useProgram(_previewProgram); useProgram(_previewProgram);
glClearColor(0, 0, 0, 1); glClearColor(0, 0, 0, 1);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
glViewport(0, 0, windowSize.x * devicePixelRatio, windowSize.y * devicePixelRatio); glViewport(targetViewportPosition.x, targetViewportPosition.y, targetViewportSize.x, targetViewportSize.y);
glUniform1i(PREVIEW_TEXTURE_LOCATION, 0); glUniform1i(PREVIEW_TEXTURE_LOCATION, 0);
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, _previewTextureID); glBindTexture(GL_TEXTURE_2D, _previewTextureID);

1
libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
View file

@ -101,6 +101,7 @@ private:
GLuint _previewTextureID { 0 }; GLuint _previewTextureID { 0 };
glm::uvec2 _prevWindowSize { 0, 0 }; glm::uvec2 _prevWindowSize { 0, 0 };
qreal _prevDevicePixelRatio { 0 }; qreal _prevDevicePixelRatio { 0 };
float _previewAspect { 0 };
ShapeWrapperPtr _sphereSection; ShapeWrapperPtr _sphereSection;
ProgramPtr _reprojectionProgram; ProgramPtr _reprojectionProgram;
ProgramPtr _laserProgram; ProgramPtr _laserProgram;