From c4312e3f2f3a9dc5d0a179b738ec4a6d7c54774e Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Tue, 26 Sep 2023 22:54:34 +0200 Subject: [PATCH 1/8] 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 26b28f9b4d9c9a861cd68a35623cb3747bfaa5ab Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 27 Sep 2023 01:49:54 +0200 Subject: [PATCH 2/8] why are these here?? --- src/r_things.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/r_things.c b/src/r_things.c index 8db590597..97e35c77e 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -1638,8 +1638,6 @@ static void R_ProjectSprite(mobj_t *thing) vis->scale += FixedMul(scalestep, spriteyscale) * (vis->x1 - x1); } - vis->thingscale = interp.scale; - //Fab: lumppat is the lump number of the patch to use, this is different // than lumpid for sprites-in-pwad : the graphics are patched #ifdef ROTSPRITE @@ -1849,8 +1847,6 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) vis->startfrac = 0; vis->xiscale = iscale; - vis->thingscale = interp.scale; - if (vis->x1 > x1) vis->startfrac += vis->xiscale*(vis->x1-x1); From 82fe3e5362256576905c87f4fc1c81436b711cd2 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 27 Sep 2023 02:00:40 +0200 Subject: [PATCH 3/8] ughuguha --- src/r_things.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/r_things.c b/src/r_things.c index 97e35c77e..0163b301b 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -1847,6 +1847,8 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing) vis->startfrac = 0; vis->xiscale = iscale; + vis->thingscale = interp.scale; + if (vis->x1 > x1) vis->startfrac += vis->xiscale*(vis->x1-x1); From acb139a8c65e5aaf39c50aea946d166da0bdd6a9 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 27 Sep 2023 02:02:03 +0200 Subject: [PATCH 4/8] die --- src/r_things.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/r_things.c b/src/r_things.c index 0163b301b..ff9e2395a 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -951,7 +951,6 @@ static void R_DrawVisSprite(vissprite_t *vis) if (!(vis->scalestep)) { sprtopscreen = centeryfrac - FixedMul(dc_texturemid, spryscale); - //sprtopscreen += vis->shear.tan * vis->shear.offset; dc_iscale = FixedDiv(FRACUNIT, vis->scale); } From 02fab76406fa26dd2cd2a85132774ad67f92215a Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 27 Sep 2023 02:17:23 +0200 Subject: [PATCH 5/8] remove all that crap nothing uses it, leftovers from cep port --- src/r_things.c | 8 +++----- src/r_things.h | 3 --- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/r_things.c b/src/r_things.c index ff9e2395a..602dd3545 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -130,7 +130,7 @@ static void R_InstallSpriteLump(UINT16 wad, // graphics patch { char cn = R_Frame2Char(frame); // for debugging - INT32 r, ang; + INT32 r; lumpnum_t lumppat = wad; lumppat <<= 16; lumppat += lump; @@ -828,9 +828,9 @@ static void R_DrawFlippedMaskedColumn(column_t *column, INT32 texheight) static void R_DrawVisSprite(vissprite_t *vis) { column_t *column; - void (*localcolfunc)(column_t *); +#ifdef RANGECHECK INT32 texturecolumn; - INT32 pwidth; +#endif fixed_t frac; patch_t *patch = vis->patch; fixed_t this_scale = vis->thingscale; @@ -1205,8 +1205,6 @@ static void R_ProjectSprite(mobj_t *thing) fixed_t scalestep; // toast '16 fixed_t offset, offset2; boolean papersprite = (thing->frame & FF_PAPERSPRITE); - fixed_t paperoffset = 0, paperdistance = 0; - angle_t centerangle = 0; //SoM: 3/17/2000 fixed_t gz, gzt; diff --git a/src/r_things.h b/src/r_things.h index 4d246e7d8..39be3c3f1 100644 --- a/src/r_things.h +++ b/src/r_things.h @@ -136,10 +136,7 @@ typedef struct vissprite_s fixed_t thingscale; // the object's scale fixed_t sortscale; // sortscale only differs from scale for flat sprites fixed_t scalestep; // only for flat sprites, 0 otherwise - fixed_t paperoffset, paperdistance; // for paper sprites, offset/dist relative to the angle fixed_t xiscale; // negative if flipped - - angle_t centerangle; // for paper sprites fixed_t texturemid; patch_t *patch; From 6544851ba503162f5ee27896a40acaf8b0f672ac Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Wed, 27 Sep 2023 05:45:29 +0200 Subject: [PATCH 6/8] c90 shit --- src/r_main.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/r_main.c b/src/r_main.c index 2205c4dc4..1e50aeb3c 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -441,18 +441,19 @@ fixed_t R_PointToDist2(fixed_t px2, fixed_t py2, fixed_t px1, fixed_t py1) angle_t R_PlayerSliptideAngle(player_t *player) { - mobj_t *mo = player->mo; + mobj_t *mo; + spritedef_t *sprdef; + spriteframe_t *sprframe; + angle_t ang = 0; + interpmobjstate_t interp = {0}; - if (!cv_sliptideroll.value || !mo || P_MobjWasRemoved(mo)) return 0; + if (!cv_sliptideroll.value || !player || P_MobjWasRemoved(player->mo)) + return 0; - size_t rot = mo->frame&FF_FRAMEMASK; - boolean papersprite = (mo->frame & FF_PAPERSPRITE); + mo = player->mo; - spritedef_t *sprdef; - spriteframe_t *sprframe; - angle_t ang = 0; - - interpmobjstate_t interp = {0}; + size_t rot = mo->frame & FF_FRAMEMASK; + boolean papersprite = (mo->frame & FF_PAPERSPRITE); // Yes. if (R_UsingFrameInterpolation() && !paused) From dc0e67515bc617500801da04d8f32e3864e855aa Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Wed, 27 Sep 2023 06:00:27 +0200 Subject: [PATCH 7/8] compiler complains --- src/hardware/hw_main.c | 2 +- src/st_stuff.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index feebc7bb7..df2a4d82c 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -6210,7 +6210,7 @@ void HWR_DoPostProcessor(player_t *player) // Armageddon Blast Flash! // Could this even be considered postprocessor? - if (player->flashcount && !cv_grpaletteshader.value || player->flashcount && cv_grpaletteshader.value && !cv_grflashpal.value) + if ((player->flashcount && !cv_grpaletteshader.value) || (player->flashcount && cv_grpaletteshader.value && !cv_grflashpal.value)) { FOutVector v[4]; FSurfaceInfo Surf; diff --git a/src/st_stuff.c b/src/st_stuff.c index 1c7ba5190..266b554e1 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -247,7 +247,7 @@ void ST_doPaletteStuff(void) palette = min(max(palette, 0), 13); #ifdef HWRENDER - if (rendermode == render_opengl && !cv_grpaletteshader.value || rendermode == render_opengl && cv_grpaletteshader.value && !cv_grflashpal.value) + if ((rendermode == render_opengl && !cv_grpaletteshader.value) || (rendermode == render_opengl && cv_grpaletteshader.value && !cv_grflashpal.value)) palette = 0; // No flashpals here in OpenGL #endif From e10ed14a3cbf8e99be18f2725bc6d6cfc795a059 Mon Sep 17 00:00:00 2001 From: Indev Date: Wed, 27 Sep 2023 12:36:10 +0300 Subject: [PATCH 8/8] Remove unneeded interpolation from R_PlayerSliptideAngle (this function is only used from lua, and lua is always running at 35 fps anyway) --- src/r_main.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/r_main.c b/src/r_main.c index 1e50aeb3c..0e8fc9361 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -445,7 +445,6 @@ angle_t R_PlayerSliptideAngle(player_t *player) spritedef_t *sprdef; spriteframe_t *sprframe; angle_t ang = 0; - interpmobjstate_t interp = {0}; if (!cv_sliptideroll.value || !player || P_MobjWasRemoved(player->mo)) return 0; @@ -455,16 +454,6 @@ angle_t R_PlayerSliptideAngle(player_t *player) size_t rot = mo->frame & FF_FRAMEMASK; boolean papersprite = (mo->frame & FF_PAPERSPRITE); - // Yes. - if (R_UsingFrameInterpolation() && !paused) - { - R_InterpolateMobjState(mo, rendertimefrac, &interp); - } - else - { - R_InterpolateMobjState(mo, FRACUNIT, &interp); - } - if (mo->skin && mo->sprite == SPR_PLAY) { sprdef = &((skin_t *)mo->skin)->spritedef; @@ -489,7 +478,7 @@ angle_t R_PlayerSliptideAngle(player_t *player) if (!sprframe) return 0; if (sprframe->rotate != SRF_SINGLE || papersprite) - ang = R_PointToAngle(interp.x, interp.y) - interp.angle; + ang = R_PointToAngle(mo->x, mo->y) - mo->angle; return FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), mo->player->sliproll*(mo->player->sliptidemem)); }