Merge branch 'reduce-vfx-ripple' into 'master'

Turn off water ripples when reducevfx is on

See merge request KartKrew/Kart!2331
This commit is contained in:
Oni 2024-05-01 06:41:56 +00:00
commit 712f15719a
2 changed files with 6 additions and 2 deletions

View file

@ -106,6 +106,10 @@ void R_InitPlanes(void)
// ripples da water texture
static fixed_t R_CalculateRippleOffset(drawspandata_t* ds, INT32 y)
{
if (cv_reducevfx.value)
{
return 0;
}
fixed_t distance = FixedMul(ds->planeheight, yslope[y]);
const INT32 yay = (ds->planeripple.offset + (distance>>9)) & 8191;
return FixedDiv(FINESINE(yay), (1<<12) + (distance>>11));

View file

@ -3460,8 +3460,8 @@ void VID_DisplaySoftwareScreen()
uv_offset,
uv_size,
{
postimgtype[i] == postimg_water,
postimgtype[i] == postimg_heat,
postimgtype[i] == postimg_water && !cv_reducevfx.value,
postimgtype[i] == postimg_heat && !cv_reducevfx.value,
postimgtype[i] == postimg_flip,
postimgtype[i] == postimg_mirror
}