From 04edcd03f2a17b54bf3a1a8ba24c005927ce9d40 Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Tue, 26 Sep 2023 22:42:39 +0200 Subject: [PATCH 1/6] refactor weather switching --- src/p_mobj.c | 15 ++------- src/p_spec.c | 93 ++++++++++------------------------------------------ 2 files changed, 20 insertions(+), 88 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 204532ea2..d5f281edd 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -10359,7 +10359,7 @@ void P_SpawnPrecipitation(void) subsector_t *precipsector = NULL; precipmobj_t *rainmo = NULL; - if (dedicated || /*!cv_precipdensity*/!cv_drawdist_precip.value || curWeather == PRECIP_NONE) // SRB2Kart + if (dedicated || !(cv_drawdist_precip.value) || curWeather == PRECIP_NONE || curWeather == PRECIP_STORM_NORAIN) // SRB2Kart return; // Use the blockmap to narrow down our placing patterns @@ -10402,22 +10402,13 @@ void P_SpawnPrecipitation(void) } else // everything else. rainmo = P_SpawnRainMobj(x, y, height, MT_RAIN); + if (curWeather == PRECIP_BLANK) + rainmo->precipflags |= PCF_INVISIBLE; // Randomly assign a height, now that floorz is set. rainmo->z = M_RandomRange(rainmo->floorz>>FRACBITS, rainmo->ceilingz>>FRACBITS)<flags = mobjinfo[MT_RAIN].flags; st = &states[mobjinfo[MT_RAIN].spawnstate]; @@ -2096,7 +2057,7 @@ void P_SwitchWeather(INT32 weathernum) precipmobj->precipflags |= PCF_RAIN; //think->function.acp1 = (actionf_p1)P_RainThinker; } - else if (swap == PRECIP_SNOW) // Rain To Snow + else if (weathernum == PRECIP_SNOW) // Rain To Snow { INT32 z; @@ -2121,7 +2082,7 @@ void P_SwitchWeather(INT32 weathernum) //think->function.acp1 = (actionf_p1)P_SnowThinker; } - else if (swap == PRECIP_BLANK || swap == PRECIP_STORM_NORAIN) // Remove precip, but keep it around for reuse. + else // Remove precip, but keep it around for reuse. { //think->function.acp1 = (actionf_p1)P_NullPrecipThinker; @@ -2135,48 +2096,31 @@ void P_SwitchWeather(INT32 weathernum) case PRECIP_SNOW: // snow curWeather = PRECIP_SNOW; - if (!swap) + if (purge) P_SpawnPrecipitation(); break; case PRECIP_RAIN: // rain { - boolean dontspawn = false; - - if (curWeather == PRECIP_RAIN || curWeather == PRECIP_STORM || curWeather == PRECIP_STORM_NOSTRIKES) - dontspawn = true; - curWeather = PRECIP_RAIN; - if (!dontspawn && !swap) + if (purge) P_SpawnPrecipitation(); break; } case PRECIP_STORM: // storm { - boolean dontspawn = false; - - if (curWeather == PRECIP_RAIN || curWeather == PRECIP_STORM || curWeather == PRECIP_STORM_NOSTRIKES) - dontspawn = true; - curWeather = PRECIP_STORM; - if (!dontspawn && !swap) + if (purge) P_SpawnPrecipitation(); break; } case PRECIP_STORM_NOSTRIKES: // storm w/o lightning { - boolean dontspawn = false; - - if (curWeather == PRECIP_RAIN || curWeather == PRECIP_STORM || curWeather == PRECIP_STORM_NOSTRIKES) - dontspawn = true; - - curWeather = PRECIP_STORM_NOSTRIKES; - - if (!dontspawn && !swap) + if (purge) P_SpawnPrecipitation(); break; @@ -2184,14 +2128,11 @@ void P_SwitchWeather(INT32 weathernum) case PRECIP_STORM_NORAIN: // storm w/o rain curWeather = PRECIP_STORM_NORAIN; - if (!swap) - P_SpawnPrecipitation(); - break; - case PRECIP_BLANK: + case PRECIP_BLANK: //preloaded curWeather = PRECIP_BLANK; - if (!swap) + if (purge) P_SpawnPrecipitation(); break; From 50526d2728904b2e57391650b4df2396dc69b6f8 Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Tue, 26 Sep 2023 22:44:52 +0200 Subject: [PATCH 2/6] remove parts of precip interpolation it looks exactly the same, but improves performance on maps with weather a bit --- src/r_fps.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/r_fps.c b/src/r_fps.c index 9c08f2af9..8ae69e435 100644 --- a/src/r_fps.c +++ b/src/r_fps.c @@ -330,18 +330,18 @@ void R_InterpolatePrecipMobjState(precipmobj_t *mobj, fixed_t frac, interpmobjst return; } - out->x = R_LerpFixed(mobj->old_x, mobj->x, frac); - out->y = R_LerpFixed(mobj->old_y, mobj->y, frac); - out->z = R_LerpFixed(mobj->old_z, mobj->z, frac); + out->x = mobj->x; + out->y = mobj->y; + out->z = mobj->z; out->scale = FRACUNIT; out->spritexscale = mobj->spritexscale; out->spriteyscale = mobj->spriteyscale; out->spritexoffset = mobj->spritexoffset; out->spriteyoffset = mobj->spriteyoffset; - out->subsector = R_PointInSubsector(out->x, out->y); + out->subsector = mobj->subsector; - out->angle = R_LerpAngle(mobj->old_angle, mobj->angle, frac); + out->angle = mobj->angle; } static void AddInterpolator(levelinterpolator_t* interpolator) From c444d4180ecc8fe6a2303140e506b8e578d6cced Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Wed, 27 Sep 2023 00:46:48 +0200 Subject: [PATCH 3/6] completely remove precip interpolation DIE! --- src/hardware/hw_main.c | 18 +++++++++--------- src/p_mobj.c | 8 ++++---- src/r_fps.c | 8 ++++---- src/r_things.c | 20 ++++++++++---------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index feebc7bb7..a8c7c9301 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -3911,7 +3911,7 @@ static void HWR_RotateSpritePolyToAim(gr_vissprite_t *spr, FOutVector *wallVerts { if (spr->precip) { - R_InterpolatePrecipMobjState((precipmobj_t *)spr->mobj, rendertimefrac, &interp); + //R_InterpolatePrecipMobjState((precipmobj_t *)spr->mobj, rendertimefrac, &interp); } else { @@ -3922,7 +3922,7 @@ static void HWR_RotateSpritePolyToAim(gr_vissprite_t *spr, FOutVector *wallVerts { if (spr->precip) { - R_InterpolatePrecipMobjState((precipmobj_t *)spr->mobj, FRACUNIT, &interp); + //R_InterpolatePrecipMobjState((precipmobj_t *)spr->mobj, FRACUNIT, &interp); } else { @@ -5408,21 +5408,21 @@ void HWR_ProjectPrecipitationSprite(precipmobj_t *thing) return; // uncapped/interpolation - interpmobjstate_t interp = {0}; + //interpmobjstate_t interp = {0}; // do interpolation - if (R_UsingFrameInterpolation() && !paused) + /*if (R_UsingFrameInterpolation() && !paused) { R_InterpolatePrecipMobjState(thing, rendertimefrac, &interp); } else { R_InterpolatePrecipMobjState(thing, FRACUNIT, &interp); - } + }*/ // transform the origin point - tr_x = FIXED_TO_FLOAT(interp.x) - gr_viewx; - tr_y = FIXED_TO_FLOAT(interp.y) - gr_viewy; + tr_x = FIXED_TO_FLOAT(thing->x) - gr_viewx; + tr_y = FIXED_TO_FLOAT(thing->y) - gr_viewy; // rotation around vertical axis tz = (tr_x * gr_viewcos) + (tr_y * gr_viewsin); @@ -5431,8 +5431,8 @@ void HWR_ProjectPrecipitationSprite(precipmobj_t *thing) if (tz < ZCLIP_PLANE) return; - tr_x = FIXED_TO_FLOAT(interp.x); - tr_y = FIXED_TO_FLOAT(interp.y); + tr_x = FIXED_TO_FLOAT(thing->x); + tr_y = FIXED_TO_FLOAT(thing->y); // decide which patch to use for sprite relative to player if ((unsigned)thing->sprite >= numsprites) diff --git a/src/p_mobj.c b/src/p_mobj.c index d5f281edd..b1b9dde6b 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -3792,7 +3792,7 @@ void P_NullPrecipThinker(precipmobj_t *mobj) { //(void)mobj; mobj->precipflags &= ~PCF_THUNK; - R_ResetPrecipitationMobjInterpolationState(mobj); + //R_ResetPrecipitationMobjInterpolationState(mobj); } void P_SnowThinker(precipmobj_t *mobj) @@ -3803,7 +3803,7 @@ void P_SnowThinker(precipmobj_t *mobj) if ((mobj->z += mobj->momz) <= mobj->floorz) { mobj->z = mobj->ceilingz; - R_ResetPrecipitationMobjInterpolationState(mobj); + //R_ResetPrecipitationMobjInterpolationState(mobj); } } @@ -3828,7 +3828,7 @@ void P_RainThinker(precipmobj_t *mobj) return; mobj->z = mobj->ceilingz; - R_ResetPrecipitationMobjInterpolationState(mobj); + //R_ResetPrecipitationMobjInterpolationState(mobj); P_SetPrecipMobjState(mobj, S_RAIN1); return; @@ -10123,7 +10123,7 @@ static precipmobj_t *P_SpawnPrecipMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype || mobj->subsector->sector->floorpic == skyflatnum) mobj->precipflags |= PCF_PIT; - R_ResetPrecipitationMobjInterpolationState(mobj); + //R_ResetPrecipitationMobjInterpolationState(mobj); return mobj; } diff --git a/src/r_fps.c b/src/r_fps.c index 8ae69e435..0c5d569e3 100644 --- a/src/r_fps.c +++ b/src/r_fps.c @@ -313,7 +313,7 @@ void R_InterpolateMobjState(mobj_t *mobj, fixed_t frac, interpmobjstate_t *out) } } -void R_InterpolatePrecipMobjState(precipmobj_t *mobj, fixed_t frac, interpmobjstate_t *out) +/*void R_InterpolatePrecipMobjState(precipmobj_t *mobj, fixed_t frac, interpmobjstate_t *out) { if (frac == FRACUNIT) { @@ -342,7 +342,7 @@ void R_InterpolatePrecipMobjState(precipmobj_t *mobj, fixed_t frac, interpmobjst out->subsector = mobj->subsector; out->angle = mobj->angle; -} +}*/ static void AddInterpolator(levelinterpolator_t* interpolator) { @@ -782,7 +782,7 @@ void R_ResetMobjInterpolationState(mobj_t *mobj) // // Reset the rendering interpolation state of the precipmobj. // -void R_ResetPrecipitationMobjInterpolationState(precipmobj_t *mobj) +/*void R_ResetPrecipitationMobjInterpolationState(precipmobj_t *mobj) { mobj->old_x2 = mobj->old_x; mobj->old_y2 = mobj->old_y; @@ -796,4 +796,4 @@ void R_ResetPrecipitationMobjInterpolationState(precipmobj_t *mobj) mobj->old_spriteyscale = mobj->spriteyscale; mobj->old_spritexoffset = mobj->spritexoffset; mobj->old_spriteyoffset = mobj->spriteyoffset; -} +}*/ diff --git a/src/r_things.c b/src/r_things.c index 8db590597..e93fd9834 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -1716,7 +1716,7 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) fixed_t gz ,gzt; // uncapped/interpolation - interpmobjstate_t interp = {0}; + /*interpmobjstate_t interp = {0}; // do interpolation if (R_UsingFrameInterpolation() && !paused) @@ -1726,11 +1726,11 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) else { R_InterpolatePrecipMobjState(thing, FRACUNIT, &interp); - } + }*/ // transform the origin point - tr_x = interp.x - viewx; - tr_y = interp.y - viewy; + tr_x = thing->x - viewx; + tr_y = thing->y - viewy; gxt = FixedMul(tr_x, viewcos); gyt = -FixedMul(tr_y, viewsin); @@ -1799,12 +1799,12 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) if (x2 < portalclipstart || x1 > portalclipend) return; - if (P_PointOnLineSide(interp.x, interp.y, portalclipline) != 0) + if (P_PointOnLineSide(thing->x, thing->y, portalclipline) != 0) return; } //SoM: 3/17/2000: Disregard sprites that are out of view.. - gzt = interp.z + spritecachedinfo[lump].topoffset; + gzt = thing->z + spritecachedinfo[lump].topoffset; gz = gzt - spritecachedinfo[lump].height; if (thing->subsector->sector->cullheight) @@ -1817,12 +1817,12 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) vis = R_NewVisSprite(); vis->scale = vis->sortscale = yscale; //<dispoffset = 0; // Monster Iestyn: 23/11/15 - vis->gx = interp.x; - vis->gy = interp.y; + vis->gx = thing->x; + vis->gy = thing->y; vis->gz = gz; vis->gzt = gzt; vis->thingheight = 4*FRACUNIT; - vis->pz = interp.z; + vis->pz = thing->z; vis->pzt = vis->pz + vis->thingheight; vis->texturemid = vis->gzt - viewz; vis->scalestep = 0; @@ -1849,7 +1849,7 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) vis->startfrac = 0; vis->xiscale = iscale; - vis->thingscale = interp.scale; + //vis->thingscale = interp.scale; if (vis->x1 > x1) vis->startfrac += vis->xiscale*(vis->x1-x1); From 689f5add6013115ef64d5d7b7ba218756d17783e Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Tue, 26 Sep 2023 22:54:34 +0200 Subject: [PATCH 4/6] smooooth console uncap console opening/closing animation --- src/console.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/src/console.c b/src/console.c index 99d032b7f..3c2230935 100644 --- a/src/console.c +++ b/src/console.c @@ -23,6 +23,7 @@ #include "g_input.h" #include "hu_stuff.h" #include "keys.h" +#include "r_main.h" #include "r_defs.h" #include "sounds.h" #include "st_stuff.h" @@ -602,32 +603,38 @@ static void CON_ChangeHeight(void) // static void CON_MoveConsole(void) { - fixed_t conspeed; + static fixed_t fracmovement = 0; Lock_state(); - conspeed = FixedDiv(cons_speed.value*vid.fdupy, FRACUNIT); - // instant if (!cons_speed.value) { con_curlines = con_destlines; + Unlock_state(); return; } - // up/down move to dest - if (con_curlines < con_destlines) + // Not instant - Increment fracmovement fractionally + fracmovement += FixedMul(cons_speed.value*vid.fdupy, renderdeltatics); + + if (con_curlines < con_destlines) // Move the console downwards { - con_curlines += FixedInt(conspeed); - if (con_curlines > con_destlines) - con_curlines = con_destlines; + con_curlines += FixedInt(fracmovement); // Move by fracmovement's integer value + if (con_curlines > con_destlines) // If we surpassed the destination... + con_curlines = con_destlines; // ...clamp to it! } - else if (con_curlines > con_destlines) + else // Move the console upwards { - con_curlines -= FixedInt(conspeed); + con_curlines -= FixedInt(fracmovement); if (con_curlines < con_destlines) con_curlines = con_destlines; + + if (con_destlines == 0) // If the console is being closed, not just moved up... + con_tick = 0; // ...don't show the blinking cursor } + + fracmovement %= FRACUNIT; // Reset fracmovement's integer value, but keep the fraction Unlock_state(); } @@ -724,10 +731,6 @@ void CON_Ticker(void) CON_ChangeHeight(); } - // console movement - if (con_destlines != con_curlines) - CON_MoveConsole(); - // clip the view, so that the part under the console is not drawn con_clipviewtop = -1; if (cons_backpic.value) // clip only when using an opaque background @@ -1774,6 +1777,10 @@ void CON_Drawer(void) if (con_curlines <= 0) CON_ClearHUD(); } + + // console movement + if (con_curlines != con_destlines) + CON_MoveConsole(); if (con_curlines > 0) CON_DrawConsole(); From b9d6d510be51e14aef1850893c3c8d7cfdf59e83 Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Wed, 27 Sep 2023 00:46:48 +0200 Subject: [PATCH 5/6] Revert "completely remove precip interpolation" This reverts commit c444d4180ecc8fe6a2303140e506b8e578d6cced. --- src/hardware/hw_main.c | 18 +++++++++--------- src/p_mobj.c | 8 ++++---- src/r_fps.c | 8 ++++---- src/r_things.c | 20 ++++++++++---------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index d9f04ccea..df2a4d82c 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -3911,7 +3911,7 @@ static void HWR_RotateSpritePolyToAim(gr_vissprite_t *spr, FOutVector *wallVerts { if (spr->precip) { - //R_InterpolatePrecipMobjState((precipmobj_t *)spr->mobj, rendertimefrac, &interp); + R_InterpolatePrecipMobjState((precipmobj_t *)spr->mobj, rendertimefrac, &interp); } else { @@ -3922,7 +3922,7 @@ static void HWR_RotateSpritePolyToAim(gr_vissprite_t *spr, FOutVector *wallVerts { if (spr->precip) { - //R_InterpolatePrecipMobjState((precipmobj_t *)spr->mobj, FRACUNIT, &interp); + R_InterpolatePrecipMobjState((precipmobj_t *)spr->mobj, FRACUNIT, &interp); } else { @@ -5408,21 +5408,21 @@ void HWR_ProjectPrecipitationSprite(precipmobj_t *thing) return; // uncapped/interpolation - //interpmobjstate_t interp = {0}; + interpmobjstate_t interp = {0}; // do interpolation - /*if (R_UsingFrameInterpolation() && !paused) + if (R_UsingFrameInterpolation() && !paused) { R_InterpolatePrecipMobjState(thing, rendertimefrac, &interp); } else { R_InterpolatePrecipMobjState(thing, FRACUNIT, &interp); - }*/ + } // transform the origin point - tr_x = FIXED_TO_FLOAT(thing->x) - gr_viewx; - tr_y = FIXED_TO_FLOAT(thing->y) - gr_viewy; + tr_x = FIXED_TO_FLOAT(interp.x) - gr_viewx; + tr_y = FIXED_TO_FLOAT(interp.y) - gr_viewy; // rotation around vertical axis tz = (tr_x * gr_viewcos) + (tr_y * gr_viewsin); @@ -5431,8 +5431,8 @@ void HWR_ProjectPrecipitationSprite(precipmobj_t *thing) if (tz < ZCLIP_PLANE) return; - tr_x = FIXED_TO_FLOAT(thing->x); - tr_y = FIXED_TO_FLOAT(thing->y); + tr_x = FIXED_TO_FLOAT(interp.x); + tr_y = FIXED_TO_FLOAT(interp.y); // decide which patch to use for sprite relative to player if ((unsigned)thing->sprite >= numsprites) diff --git a/src/p_mobj.c b/src/p_mobj.c index b1b9dde6b..d5f281edd 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -3792,7 +3792,7 @@ void P_NullPrecipThinker(precipmobj_t *mobj) { //(void)mobj; mobj->precipflags &= ~PCF_THUNK; - //R_ResetPrecipitationMobjInterpolationState(mobj); + R_ResetPrecipitationMobjInterpolationState(mobj); } void P_SnowThinker(precipmobj_t *mobj) @@ -3803,7 +3803,7 @@ void P_SnowThinker(precipmobj_t *mobj) if ((mobj->z += mobj->momz) <= mobj->floorz) { mobj->z = mobj->ceilingz; - //R_ResetPrecipitationMobjInterpolationState(mobj); + R_ResetPrecipitationMobjInterpolationState(mobj); } } @@ -3828,7 +3828,7 @@ void P_RainThinker(precipmobj_t *mobj) return; mobj->z = mobj->ceilingz; - //R_ResetPrecipitationMobjInterpolationState(mobj); + R_ResetPrecipitationMobjInterpolationState(mobj); P_SetPrecipMobjState(mobj, S_RAIN1); return; @@ -10123,7 +10123,7 @@ static precipmobj_t *P_SpawnPrecipMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype || mobj->subsector->sector->floorpic == skyflatnum) mobj->precipflags |= PCF_PIT; - //R_ResetPrecipitationMobjInterpolationState(mobj); + R_ResetPrecipitationMobjInterpolationState(mobj); return mobj; } diff --git a/src/r_fps.c b/src/r_fps.c index 0c5d569e3..8ae69e435 100644 --- a/src/r_fps.c +++ b/src/r_fps.c @@ -313,7 +313,7 @@ void R_InterpolateMobjState(mobj_t *mobj, fixed_t frac, interpmobjstate_t *out) } } -/*void R_InterpolatePrecipMobjState(precipmobj_t *mobj, fixed_t frac, interpmobjstate_t *out) +void R_InterpolatePrecipMobjState(precipmobj_t *mobj, fixed_t frac, interpmobjstate_t *out) { if (frac == FRACUNIT) { @@ -342,7 +342,7 @@ void R_InterpolateMobjState(mobj_t *mobj, fixed_t frac, interpmobjstate_t *out) out->subsector = mobj->subsector; out->angle = mobj->angle; -}*/ +} static void AddInterpolator(levelinterpolator_t* interpolator) { @@ -782,7 +782,7 @@ void R_ResetMobjInterpolationState(mobj_t *mobj) // // Reset the rendering interpolation state of the precipmobj. // -/*void R_ResetPrecipitationMobjInterpolationState(precipmobj_t *mobj) +void R_ResetPrecipitationMobjInterpolationState(precipmobj_t *mobj) { mobj->old_x2 = mobj->old_x; mobj->old_y2 = mobj->old_y; @@ -796,4 +796,4 @@ void R_ResetMobjInterpolationState(mobj_t *mobj) mobj->old_spriteyscale = mobj->spriteyscale; mobj->old_spritexoffset = mobj->spritexoffset; mobj->old_spriteyoffset = mobj->spriteyoffset; -}*/ +} diff --git a/src/r_things.c b/src/r_things.c index d6c6235ba..602dd3545 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -1711,7 +1711,7 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) fixed_t gz ,gzt; // uncapped/interpolation - /*interpmobjstate_t interp = {0}; + interpmobjstate_t interp = {0}; // do interpolation if (R_UsingFrameInterpolation() && !paused) @@ -1721,11 +1721,11 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) else { R_InterpolatePrecipMobjState(thing, FRACUNIT, &interp); - }*/ + } // transform the origin point - tr_x = thing->x - viewx; - tr_y = thing->y - viewy; + tr_x = interp.x - viewx; + tr_y = interp.y - viewy; gxt = FixedMul(tr_x, viewcos); gyt = -FixedMul(tr_y, viewsin); @@ -1794,12 +1794,12 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) if (x2 < portalclipstart || x1 > portalclipend) return; - if (P_PointOnLineSide(thing->x, thing->y, portalclipline) != 0) + if (P_PointOnLineSide(interp.x, interp.y, portalclipline) != 0) return; } //SoM: 3/17/2000: Disregard sprites that are out of view.. - gzt = thing->z + spritecachedinfo[lump].topoffset; + gzt = interp.z + spritecachedinfo[lump].topoffset; gz = gzt - spritecachedinfo[lump].height; if (thing->subsector->sector->cullheight) @@ -1812,12 +1812,12 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) vis = R_NewVisSprite(); vis->scale = vis->sortscale = yscale; //<dispoffset = 0; // Monster Iestyn: 23/11/15 - vis->gx = thing->x; - vis->gy = thing->y; + vis->gx = interp.x; + vis->gy = interp.y; vis->gz = gz; vis->gzt = gzt; vis->thingheight = 4*FRACUNIT; - vis->pz = thing->z; + vis->pz = interp.z; vis->pzt = vis->pz + vis->thingheight; vis->texturemid = vis->gzt - viewz; vis->scalestep = 0; @@ -1844,7 +1844,7 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) vis->startfrac = 0; vis->xiscale = iscale; - //vis->thingscale = interp.scale; + vis->thingscale = interp.scale; if (vis->x1 > x1) vis->startfrac += vis->xiscale*(vis->x1-x1); From 7a780bf898bad4e7eff5c7993f0ada40c72a4204 Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 29 Sep 2023 21:07:58 +0200 Subject: [PATCH 6/6] make precip interpolation toggable saves a few frames while looking basically the same --- src/r_fps.c | 24 +++++++++++++----------- src/r_fps.h | 1 + src/r_main.c | 1 + 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/r_fps.c b/src/r_fps.c index 8ae69e435..dd211a015 100644 --- a/src/r_fps.c +++ b/src/r_fps.c @@ -37,6 +37,8 @@ static CV_PossibleValue_t fpscap_cons_t[] = { }; consvar_t cv_fpscap = {"fpscap", "Match refresh rate", CV_SAVE, fpscap_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_precipinterp = {"precipinterpolation", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; + UINT32 R_GetFramerateCap(void) { if (rendermode == render_none) @@ -315,7 +317,7 @@ void R_InterpolateMobjState(mobj_t *mobj, fixed_t frac, interpmobjstate_t *out) void R_InterpolatePrecipMobjState(precipmobj_t *mobj, fixed_t frac, interpmobjstate_t *out) { - if (frac == FRACUNIT) + if (frac == FRACUNIT || !cv_precipinterp.value) { out->x = mobj->x; out->y = mobj->y; @@ -330,18 +332,18 @@ void R_InterpolatePrecipMobjState(precipmobj_t *mobj, fixed_t frac, interpmobjst return; } - out->x = mobj->x; - out->y = mobj->y; - out->z = mobj->z; - out->scale = FRACUNIT; - out->spritexscale = mobj->spritexscale; - out->spriteyscale = mobj->spriteyscale; - out->spritexoffset = mobj->spritexoffset; - out->spriteyoffset = mobj->spriteyoffset; + out->x = R_LerpFixed(mobj->old_x, mobj->x, frac); + out->y = R_LerpFixed(mobj->old_y, mobj->y, frac); + out->z = R_LerpFixed(mobj->old_z, mobj->z, frac); + out->scale = FRACUNIT; + out->spritexscale = mobj->spritexscale; + out->spriteyscale = mobj->spriteyscale; + out->spritexoffset = mobj->spritexoffset; + out->spriteyoffset = mobj->spriteyoffset; - out->subsector = mobj->subsector; + out->subsector = R_PointInSubsector(out->x, out->y); - out->angle = mobj->angle; + out->angle = R_LerpAngle(mobj->old_angle, mobj->angle, frac); } static void AddInterpolator(levelinterpolator_t* interpolator) diff --git a/src/r_fps.h b/src/r_fps.h index 625a23b49..520843fd2 100644 --- a/src/r_fps.h +++ b/src/r_fps.h @@ -20,6 +20,7 @@ #include "r_state.h" extern consvar_t cv_fpscap; +extern consvar_t cv_precipinterp; UINT32 R_GetFramerateCap(void); boolean R_UsingFrameInterpolation(void); diff --git a/src/r_main.c b/src/r_main.c index 0e8fc9361..0afb4b16f 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -2010,4 +2010,5 @@ void R_RegisterEngineStuff(void) // Frame interpolation/uncapped CV_RegisterVar(&cv_fpscap); + CV_RegisterVar(&cv_precipinterp); }