mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 23:53:52 +00:00
Code Issues Releases Wiki Activity

Configuration option for oculus prediction time workaround

Browse source
This commit is contained in:
Mads Buvik Sandvei 2020-07-21 14:36:11 +02:00
parent c9e761eb88
commit b5675b7525
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
apps/openmw/mwvr/vrsession.cpp
View file

@ -19,6 +19,7 @@
#include <osg/Camera>
#include <algorithm>
#include <vector>
#include <array>
#include <iostream>
@ -56,6 +57,10 @@ namespace MWVR
return;
}
Log(Debug::Verbose) << "Using openxr sync phase " << syncPhase;
mUseSteadyClock = Settings::Manager::getBool("use steady clock", "VR");
if (mUseSteadyClock)
Log(Debug::Verbose) << "Using chrono::steady_clock instead of openxr predicted display times.";
}
VRSession::~VRSession()
@ -236,32 +241,22 @@ namespace MWVR
auto* xr = Environment::get().getManager();
xr->handleEvents();
//auto frameState = xr->impl().frameState();
// auto predictedDisplayTime = frameState.predictedDisplayTime;
// if (predictedDisplayTime == 0)
// {
// // First time, need to invent a frame time since openxr won't help us without a call to waitframe.
// predictedDisplayTime = std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::steady_clock::now().time_since_epoch()).count();
// }
// else
// {
// // Predict display time based on real framerate
// float intervalsf = static_cast<double>(mLastFrameInterval.count()) / static_cast<double>(mLastPredictedDisplayPeriod);
// int intervals = std::max((int)std::roundf(intervalsf), 1);
// predictedDisplayTime = mLastPredictedDisplayTime + intervals * (mFrames - mLastRenderedFrame) * mLastPredictedDisplayPeriod;
// }
auto epochTime = std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::steady_clock::now().time_since_epoch()).count();
auto predictedDisplayTime = std::max(xr->getLastPredictedDisplayTime(), epochTime);
auto predictedDisplayPeriod = std::max(xr->getLastPredictedDisplayPeriod(), (long long)1000000);
float intervalsf = static_cast<double>(mLastFrameInterval.count()) / static_cast<double>(predictedDisplayPeriod);
//////////////////////// OCULUS BUG
//////////////////// Oculus will suddenly start monotonically increasing their predicted display time by precisely 1 second
//////////////////// Oculus will suddenly start increasing their predicted display time by precisely 1 second per frame
//////////////////// regardless of real time passed, causing predictions to go crazy due to the time difference.
//////////////////// Therefore, for the time being, i ignore oculus' predicted display time altogether.
long long predictedDisplayTime = std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::steady_clock::now().time_since_epoch()).count();
if(mUseSteadyClock)
predictedDisplayTime = epochTime;
if (mFrames > 1)
{
auto framePeriod = xr->getLastPredictedDisplayPeriod();
float intervalsf = static_cast<double>(mLastFrameInterval.count()) / static_cast<double>(framePeriod);
int intervals = std::max((int)std::roundf(intervalsf), 1);
predictedDisplayTime = predictedDisplayTime + intervals * (mFrames - mLastRenderedFrame) * framePeriod;
predictedDisplayTime = predictedDisplayTime + intervals * (mFrames - mLastRenderedFrame) * predictedDisplayPeriod;
}

1
apps/openmw/mwvr/vrsession.hpp
View file

@ -84,6 +84,7 @@ namespace MWVR
std::condition_variable mCondition{};
FramePhase mXrSyncPhase{ FramePhase::Cull };
bool mUseSteadyClock{ false };
long long mFrames{ 0 };
long long mLastRenderedFrame{ 0 };
long long mLastPredictedDisplayTime{ 0 };

4
files/settings-default.cfg
View file

@ -917,3 +917,7 @@ haptics enabled = true
# Flip the order of eyes in the mirror texture (to allow cross eyed view)
flip mirror texture order = false
# Work around for some preview openxr runtimes whose display time predictions do not work
# Use this if tracking seems crazy.
use steady clock = true