vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

env_fade: Worked a lot on how fades are meant to run.

Browse source
This commit is contained in:
Marco Cawthorne 2020-04-23 04:32:44 +02:00
parent a31b3b0e47
commit 8b57b74637
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/client/fade.c
View file

@ -52,14 +52,15 @@ Fade_Update (int x, int y, int w, int h)
return;
}
if (pSeat->m_flFadeStyle & EVF_FADEDROM) {
if (pSeat->m_flFadeTime > pSeat->m_flFadeHold) {
pSeat->m_flFadeAlpha -= (clframetime * (1.0f / pSeat->m_flFadeDuration)) * pSeat->m_flFadeMaxAlpha;
pSeat->m_flFadeAlpha = 1.0f;
if (pSeat->m_flFadeTime > pSeat->m_flFadeDuration) {
pSeat->m_flFadeAlpha -= (pSeat->m_flFadeTime - pSeat->m_flFadeDuration) * (1.0 / pSeat->m_flFadeHold);
}
} else {
if (pSeat->m_flFadeTime < pSeat->m_flFadeDuration) {
pSeat->m_flFadeAlpha += (clframetime * (1.0f / pSeat->m_flFadeDuration)) * pSeat->m_flFadeMaxAlpha;
pSeat->m_flFadeAlpha = pSeat->m_flFadeTime * (1.0 / pSeat->m_flFadeDuration);
} else {
pSeat->m_flFadeAlpha -= (clframetime * (1.0f / pSeat->m_flFadeHold)) * pSeat->m_flFadeMaxAlpha;
pSeat->m_flFadeAlpha = (pSeat->m_flFadeTime - pSeat->m_flFadeDuration) * (1.0 / pSeat->m_flFadeHold);
}
}
@ -69,15 +70,18 @@ Fade_Update (int x, int y, int w, int h)
pSeat->m_flFadeAlpha = 0.0f;
}
if (pSeat->m_flFadeAlpha <= 0) {
/* time's up */
if (pSeat->m_flFadeTime >= (pSeat->m_flFadeDuration + pSeat->m_flFadeHold)) {
pSeat->m_iFadeActive = FALSE;
return;
}
print(sprintf("FADE: %f\n", pSeat->m_flFadeAlpha));
if (pSeat->m_flFadeStyle & EVF_MODULATE) {
drawpic([x, y], "fade_modulate", [w, h], pSeat->m_vecFadeColor, pSeat->m_flFadeAlpha, 0);
drawpic([x, y], "fade_modulate", [w, h], pSeat->m_vecFadeColor, pSeat->m_flFadeAlpha * pSeat->m_flFadeMaxAlpha, 0);
} else {
drawfill([x, y], [w, h], pSeat->m_vecFadeColor, pSeat->m_flFadeAlpha, 0);
drawfill([x, y], [w, h], pSeat->m_vecFadeColor, pSeat->m_flFadeAlpha * pSeat->m_flFadeMaxAlpha, 0);
}
pSeat->m_flFadeTime += clframetime;