Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 19:21:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

beter center image around center of eye

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-09-20 14:04:51 -07:00
parent 73a7d1b63b
commit 6c68d9abb3
2 changed files with 32 additions and 5 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

@ -88,6 +88,7 @@ bool HmdDisplayPlugin::internalActivate() {
_monoPreview = clicked; _monoPreview = clicked;
_container->setBoolSetting("monoPreview", _monoPreview); _container->setBoolSetting("monoPreview", _monoPreview);
}, true, _monoPreview); }, true, _monoPreview);
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
_disablePreview = true; _disablePreview = true;
#else #else
@ -153,6 +154,23 @@ ivec4 HmdDisplayPlugin::getViewportForSourceSize(const uvec2& size) const {
return ivec4(targetViewportPosition, targetViewportSize); return ivec4(targetViewportPosition, targetViewportSize);
} }
float HmdDisplayPlugin::getLeftCenterPixel() const {
glm::mat4 eyeProjection = _eyeProjections[Left];
glm::mat4 inverseEyeProjection = glm::inverse(eyeProjection);
vec2 eyeRenderTargetSize = { _renderTargetSize.x / 2, _renderTargetSize.y };
vec4 left = vec4(-1, 0, -1, 1);
vec4 right = vec4(1, 0, -1, 1);
vec4 right2 = inverseEyeProjection * right;
vec4 left2 = inverseEyeProjection * left;
left2 /= left2.w;
right2 /= right2.w;
float width = -left2.x + right2.x;
float leftBias = -left2.x / width;
float leftCenterPixel = eyeRenderTargetSize.x * leftBias;
return leftCenterPixel;
}
void HmdDisplayPlugin::internalPresent() { void HmdDisplayPlugin::internalPresent() {
PROFILE_RANGE_EX(__FUNCTION__, 0xff00ff00, (uint64_t)presentCount()) PROFILE_RANGE_EX(__FUNCTION__, 0xff00ff00, (uint64_t)presentCount())
@ -166,9 +184,13 @@ void HmdDisplayPlugin::internalPresent() {
sourceSize.x >>= 1; sourceSize.x >>= 1;
} }
float originalCenter = (sourceSize.x / 2);
float shiftLeftBy = getLeftCenterPixel() - (sourceSize.x / 2);
float newWidth = sourceSize.x - shiftLeftBy;
const unsigned int RATIO_Y = 9; const unsigned int RATIO_Y = 9;
const unsigned int RATIO_X = 16; const unsigned int RATIO_X = 16;
glm::uvec2 originalClippedSize { sourceSize.x, sourceSize.x * RATIO_Y / RATIO_X }; glm::uvec2 originalClippedSize { newWidth, newWidth * RATIO_Y / RATIO_X };
glm::ivec4 viewport = getViewportForSourceSize(sourceSize); glm::ivec4 viewport = getViewportForSourceSize(sourceSize);
glm::ivec4 scissor = viewport; glm::ivec4 scissor = viewport;
@ -184,17 +206,22 @@ void HmdDisplayPlugin::internalPresent() {
float windowAspect = aspect(windowSize); // example: 1920 x 1080 = 1.78 float windowAspect = aspect(windowSize); // example: 1920 x 1080 = 1.78
float sceneAspect = aspect(originalClippedSize); // usually: 1512 x 850 = 1.78 float sceneAspect = aspect(originalClippedSize); // usually: 1512 x 850 = 1.78
bool scaleToWidth = windowAspect < sceneAspect; bool scaleToWidth = windowAspect < sceneAspect;
float ratio; float ratio;
int scissorOffset; int scissorOffset;
if (scaleToWidth) { if (scaleToWidth) {
ratio = (float)windowSize.x / (float)sourceSize.x; ratio = (float)windowSize.x / (float)newWidth;
} else { } else {
ratio = (float)windowSize.y / (float)originalClippedSize.y; ratio = (float)windowSize.y / (float)originalClippedSize.y;
} }
float scaledWidth = newWidth * ratio;
float scaledShiftLeftBy = shiftLeftBy * ratio;
int scissorSizeX = originalClippedSize.x * ratio; int scissorSizeX = originalClippedSize.x * ratio;
int scissorSizeY = originalClippedSize.y * ratio; int scissorSizeY = originalClippedSize.y * ratio;
@ -205,11 +232,11 @@ void HmdDisplayPlugin::internalPresent() {
if (scaleToWidth) { if (scaleToWidth) {
scissorOffset = ((int)windowSize.y - scissorSizeY) / 2; scissorOffset = ((int)windowSize.y - scissorSizeY) / 2;
scissor = ivec4(0, scissorOffset, scissorSizeX, scissorSizeY); scissor = ivec4(0, scissorOffset, scissorSizeX, scissorSizeY);
viewport = ivec4(0, viewportOffset, viewportSizeX, viewportSizeY); viewport = ivec4(-scaledShiftLeftBy, viewportOffset, viewportSizeX, viewportSizeY);
} else { } else {
scissorOffset = ((int)windowSize.x - scissorSizeX) / 2; scissorOffset = ((int)windowSize.x - scissorSizeX) / 2;
scissor = ivec4(scissorOffset, 0, scissorSizeX, scissorSizeY); scissor = ivec4(scissorOffset, 0, scissorSizeX, scissorSizeY);
viewport = ivec4(scissorOffset, viewportOffset, viewportSizeX, viewportSizeY); viewport = ivec4(scissorOffset - scaledShiftLeftBy, viewportOffset, viewportSizeX, viewportSizeY);
} }
viewport.z *= 2; viewport.z *= 2;

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

@ -102,7 +102,7 @@ protected:
bool _disablePreview{ true }; bool _disablePreview{ true };
private: private:
ivec4 getViewportForSourceSize(const uvec2& size) const; ivec4 getViewportForSourceSize(const uvec2& size) const;
float HmdDisplayPlugin::getLeftCenterPixel() const;
bool _disablePreviewItemAdded { false }; bool _disablePreviewItemAdded { false };
bool _monoPreview { true }; bool _monoPreview { true };