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

Application: Improve scoping.

Browse source
This commit is contained in:
Lubosz Sarnecki 2024-03-10 21:00:57 +01:00 committed by Ada
parent aecc5cd387
commit d084142866
1 changed files with 26 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
interface/src/Application.cpp
View file

@ -6993,44 +6993,40 @@ void Application::updateRenderArgs(float deltaTime) {
appRenderArgs._eyeToWorld = _myCamera.getTransform(); appRenderArgs._eyeToWorld = _myCamera.getTransform();
appRenderArgs._isStereo = false; appRenderArgs._isStereo = false;
{ if (getActiveDisplayPlugin()->isStereo()) {
auto hmdInterface = DependencyManager::get<HMDScriptingInterface>(); auto hmdInterface = DependencyManager::get<HMDScriptingInterface>();
float ipdScale = hmdInterface->getIPDScale();
// scale IPD by sensorToWorldScale, to make the world seem larger or smaller accordingly. // scale IPD by sensorToWorldScale, to make the world seem larger or smaller accordingly.
ipdScale *= sensorToWorldScale; float ipdScale = hmdInterface->getIPDScale() * sensorToWorldScale;
auto baseProjection = appRenderArgs._renderArgs.getViewFrustum().getProjection(); auto baseProjection = appRenderArgs._renderArgs.getViewFrustum().getProjection();
if (getActiveDisplayPlugin()->isStereo()) { // Stereo modes will typically have a larger projection matrix overall,
// Stereo modes will typically have a larger projection matrix overall, // so we ask for the 'mono' projection matrix, which for stereo and HMD
// so we ask for the 'mono' projection matrix, which for stereo and HMD // plugins will imply the combined projection for both eyes.
// plugins will imply the combined projection for both eyes. //
// // This is properly implemented for the Oculus plugins, but for OpenVR
// This is properly implemented for the Oculus plugins, but for OpenVR // and Stereo displays I'm not sure how to get / calculate it, so we're
// and Stereo displays I'm not sure how to get / calculate it, so we're // just relying on the left FOV in each case and hoping that the
// just relying on the left FOV in each case and hoping that the // overall culling margin of error doesn't cause popping in the
// overall culling margin of error doesn't cause popping in the // right eye. There are FIXMEs in the relevant plugins
// right eye. There are FIXMEs in the relevant plugins _myCamera.setProjection(getActiveDisplayPlugin()->getCullingProjection(baseProjection));
_myCamera.setProjection(getActiveDisplayPlugin()->getCullingProjection(baseProjection)); appRenderArgs._isStereo = true;
appRenderArgs._isStereo = true;
auto& eyeOffsets = appRenderArgs._eyeOffsets; auto& eyeOffsets = appRenderArgs._eyeOffsets;
auto& eyeProjections = appRenderArgs._eyeProjections; auto& eyeProjections = appRenderArgs._eyeProjections;
// FIXME we probably don't need to set the projection matrix every frame, // FIXME we probably don't need to set the projection matrix every frame,
// only when the display plugin changes (or in non-HMD modes when the user // only when the display plugin changes (or in non-HMD modes when the user
// changes the FOV manually, which right now I don't think they can. // changes the FOV manually, which right now I don't think they can.
for_each_eye([&](Eye eye) { for_each_eye([&](Eye eye) {
eyeOffsets[eye] = getActiveDisplayPlugin()->getEyeToHeadTransform(eye); eyeOffsets[eye] = getActiveDisplayPlugin()->getEyeToHeadTransform(eye);
// Apply IPD scaling // Apply IPD scaling
eyeOffsets[eye][3][0] *= ipdScale; eyeOffsets[eye][3][0] *= ipdScale;
eyeProjections[eye] = getActiveDisplayPlugin()->getEyeProjection(eye, baseProjection); eyeProjections[eye] = getActiveDisplayPlugin()->getEyeProjection(eye, baseProjection);
}); });
// Configure the type of display / stereo // Configure the type of display / stereo
appRenderArgs._renderArgs._displayMode = (isHMDMode() ? RenderArgs::STEREO_HMD : RenderArgs::STEREO_MONITOR); appRenderArgs._renderArgs._displayMode = (isHMDMode() ? RenderArgs::STEREO_HMD : RenderArgs::STEREO_MONITOR);
}
} }
appRenderArgs._renderArgs._stencilMaskMode = getActiveDisplayPlugin()->getStencilMaskMode(); appRenderArgs._renderArgs._stencilMaskMode = getActiveDisplayPlugin()->getStencilMaskMode();