Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

DeferredFrameTransform: Hack to get lighting working properly in VR

Browse source 
Somewhere, the eye view transform is being applied twice. For now,
this hack with applying an inverse view transform corrects the bugged
lighting in the XR branch.
This commit is contained in:
Ada 2025-01-26 00:35:17 +10:00
parent 9bdc389556
commit dd3ec18204
3 changed files with 3 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/render-utils/src/DeferredFrameTransform.cpp
View file

@ -67,7 +67,9 @@ void DeferredFrameTransform::update(RenderArgs* args, glm::vec2 jitter) {
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
// Compose the mono Eye space to Stereo clip space Projection Matrix // Compose the mono Eye space to Stereo clip space Projection Matrix
auto sideViewMat = projMats[i] * eyeViews[i]; // FIXME: eyeViews is being applied twice somewhere,
// this glm::inverse call undoes the bugged transform
auto sideViewMat = projMats[i] * glm::inverse(eyeViews[i]);
frameTransformBuffer.projectionUnjittered[i] = sideViewMat; frameTransformBuffer.projectionUnjittered[i] = sideViewMat;
frameTransformBuffer.invProjectionUnjittered[i] = glm::inverse(sideViewMat); frameTransformBuffer.invProjectionUnjittered[i] = glm::inverse(sideViewMat);

20
plugins/openxr/src/OpenXrContext.cpp
View file

@ -89,7 +89,6 @@ bool OpenXrContext::initInstance() {
return false; return false;
bool openglSupported = false; bool openglSupported = false;
bool bindingModificationSupported = false;
qCInfo(xr_context_cat, "Runtime supports %d extensions:", count); qCInfo(xr_context_cat, "Runtime supports %d extensions:", count);
for (uint32_t i = 0; i < count; i++) { for (uint32_t i = 0; i < count; i++) {
@ -97,18 +96,6 @@ bool OpenXrContext::initInstance() {
if (strcmp(XR_KHR_OPENGL_ENABLE_EXTENSION_NAME, properties[i].extensionName) == 0) { if (strcmp(XR_KHR_OPENGL_ENABLE_EXTENSION_NAME, properties[i].extensionName) == 0) {
openglSupported = true; openglSupported = true;
} }
if (strcmp(XR_KHR_BINDING_MODIFICATION_EXTENSION_NAME, properties[i].extensionName) == 0) {
bindingModificationSupported = true;
}
if (strcmp(XR_EXT_DPAD_BINDING_EXTENSION_NAME, properties[i].extensionName) == 0) {
_dpadBindingSupported = true;
}
if (strcmp(XR_EXT_PALM_POSE_EXTENSION_NAME, properties[i].extensionName) == 0) {
_palmPoseSupported = true;
}
} }
if (!openglSupported) { if (!openglSupported) {
@ -117,13 +104,6 @@ bool OpenXrContext::initInstance() {
} }
std::vector<const char*> enabled = {XR_KHR_OPENGL_ENABLE_EXTENSION_NAME}; std::vector<const char*> enabled = {XR_KHR_OPENGL_ENABLE_EXTENSION_NAME};
if (bindingModificationSupported && _dpadBindingSupported) {
enabled.emplace(enabled.end(), XR_KHR_BINDING_MODIFICATION_EXTENSION_NAME);
enabled.emplace(enabled.end(), XR_EXT_DPAD_BINDING_EXTENSION_NAME);
}
if (_palmPoseSupported) {
enabled.emplace(enabled.end(), XR_EXT_PALM_POSE_EXTENSION_NAME);
}
XrInstanceCreateInfo info = { XrInstanceCreateInfo info = {
.type = XR_TYPE_INSTANCE_CREATE_INFO, .type = XR_TYPE_INSTANCE_CREATE_INFO,

2
plugins/openxr/src/OpenXrContext.h
View file

@ -69,8 +69,6 @@ public:
QString _systemName; QString _systemName;
bool _isSessionRunning = false; bool _isSessionRunning = false;
bool _dpadBindingSupported = false;
bool _palmPoseSupported = false;
bool _dpadNeedsClick = false; bool _dpadNeedsClick = false;
private: private: