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

Merge pull request #14999 from amerhifi/quest-demo

Browse source 
case 21395: Adjust culling matrix
This commit is contained in:
Sam Gateau 2019-02-24 14:51:13 -08:00 committed by GitHub
commit ff5e9ee5d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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