zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-28 12:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- do not fade screen jobs in when in the menu.

Browse source 
This doesn't work properly because the timer is stopped, leading to visual artifacts with the fading.
This commit is contained in:
Christoph Oelckers 2020-09-16 19:11:36 +02:00
parent 6776508239
commit b0090b07fc
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/core/screenjob.cpp
View file

@ -772,14 +772,18 @@ public:
} }
lastTime = now; lastTime = now;
if (screenfade < 1.f) if (screenfade < 1.f && !M_Active())
{ {
float ms = (clock / 1'000'000) / job.job->fadetime; float ms = (clock / 1'000'000) / job.job->fadetime;
screenfade = clamp(ms, 0.f, 1.f); screenfade = clamp(ms, 0.f, 1.f);
if (!M_Active()) twod->SetScreenFade(screenfade); twod->SetScreenFade(screenfade);
job.job->fadestate = DScreenJob::fadein; job.job->fadestate = DScreenJob::fadein;
} }
else job.job->fadestate = DScreenJob::visible; else
{
job.job->fadestate = DScreenJob::visible;
screenfade = 1.f;
}
job.job->SetClock(clock); job.job->SetClock(clock);
int state = job.job->Frame(clock, skiprequest); int state = job.job->Frame(clock, skiprequest);
clock = job.job->GetClock(); clock = job.job->GetClock();