OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- backend update from Raze.

Browse source
This commit is contained in:
Christoph Oelckers 2021-08-31 07:59:37 +02:00
commit b5294e9e90
6 changed files with 54 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/common/utility/i_time.cpp
View file

@ -67,22 +67,14 @@ static uint64_t NSToMS(uint64_t ns)
return static_cast<uint64_t>(ns / 1'000'000);
}
static int NSToTic(uint64_t ns)
static int NSToTic(uint64_t ns, double const ticrate)
{
return static_cast<int>(ns * GameTicRate / 1'000'000'000);
return static_cast<int>(ns * ticrate / 1'000'000'000);
}
static int NSToBuildTic(uint64_t ns)
static uint64_t TicToNS(double tic, double const ticrate)
{
return static_cast<int>(ns * 120 / 1'000'000'000);
}
static uint64_t TicToNS(int tic)
{
return static_cast<uint64_t>(tic) * 1'000'000'000 / GameTicRate;
}
static uint64_t BuildTicToNS(int tic)
{
return static_cast<uint64_t>(tic) * 1'000'000'000 / 120;
return static_cast<uint64_t>(tic * 1'000'000'000 / ticrate);
}
void I_SetFrameTime()
@ -111,18 +103,18 @@ void I_WaitVBL(int count)
I_SetFrameTime();
}
int I_WaitForTic(int prevtic)
int I_WaitForTic(int prevtic, double const ticrate)
{
// Waits until the current tic is greater than prevtic. Time must not be frozen.
int time;
while ((time = I_GetTime()) <= prevtic)
while ((time = I_GetTime(ticrate)) <= prevtic)
{
// Windows-specific note:
// The minimum amount of time a thread can sleep is controlled by timeBeginPeriod.
// We set this to 1 ms in DoMain.
const uint64_t next = FirstFrameStartTime + TicToNS(prevtic + 1);
const uint64_t next = FirstFrameStartTime + TicToNS(prevtic + 1, ticrate);
const uint64_t now = I_nsTime();
if (next > now)
@ -166,21 +158,16 @@ uint64_t I_GetTimeNS()
return CurrentFrameStartTime - FirstFrameStartTime;
}
int I_GetTime()
int I_GetTime(double const ticrate)
{
return NSToTic(CurrentFrameStartTime - FirstFrameStartTime);
return NSToTic(CurrentFrameStartTime - FirstFrameStartTime, ticrate);
}
int I_GetBuildTime()
double I_GetTimeFrac(double const ticrate)
{
return NSToBuildTic(CurrentFrameStartTime - FirstFrameStartTime);
}
double I_GetTimeFrac()
{
int currentTic = NSToTic(CurrentFrameStartTime - FirstFrameStartTime);
uint64_t ticStartTime = FirstFrameStartTime + TicToNS(currentTic);
uint64_t ticNextTime = FirstFrameStartTime + TicToNS(currentTic + 1);
int currentTic = NSToTic(CurrentFrameStartTime - FirstFrameStartTime, ticrate);
uint64_t ticStartTime = FirstFrameStartTime + TicToNS(currentTic, ticrate);
uint64_t ticNextTime = FirstFrameStartTime + TicToNS(currentTic + 1, ticrate);
return (CurrentFrameStartTime - ticStartTime) / (double)(ticNextTime - ticStartTime);
}