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

Mege with master the culling scale

Browse source
This commit is contained in:
Sam Gateau 2019-02-24 15:08:23 -08:00
commit f4a79a1e92
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.cpp
View file

@ -122,6 +122,7 @@ QRectF OculusMobileDisplayPlugin::getPlayAreaRect() {
glm::mat4 OculusMobileDisplayPlugin::getEyeProjection(Eye eye, const glm::mat4& baseProjection) const {
glm::mat4 result = baseProjection;
VrHandler::withOvrMobile([&](ovrMobile* session){
auto trackingState = vrapi_GetPredictedTracking2(session, 0.0);
result = ovr::Fov{ trackingState.Eye[eye].ProjectionMatrix }.withZ(baseProjection);
@ -138,16 +139,12 @@ glm::mat4 OculusMobileDisplayPlugin::getCullingProjection(const glm::mat4& baseP
for (size_t i = 0; i < 2; ++i) {
fovs[i].extract(trackingState.Eye[i].ProjectionMatrix);
}
fovs[0].extend(fovs[1]);
float horizontalMargin = 1.1f;
float verticalMargin = 1.5f;
fovs[0].leftRightUpDown[0] *= horizontalMargin;
fovs[0].leftRightUpDown[1] *= horizontalMargin;
fovs[0].leftRightUpDown[2] *= verticalMargin;
fovs[0].leftRightUpDown[3] *= verticalMargin;
return fovs[0].withZ(baseProjection);
fovs[0].extend(fovs[1]);
result= glm::scale( fovs[0].withZ(baseProjection),glm::vec3(1.5f));
return result;
});
return result;
}