From eefcca6259e4ecac9738c70833a0623f547aabd1 Mon Sep 17 00:00:00 2001
From: kaldrum1 <116390251+kaldrum1@users.noreply.github.com>
Date: Mon, 8 Jul 2024 15:27:42 -0700
Subject: [PATCH] adjust interpolation duration based on speed, allow
anim_duration to be used as a lua override to hardcoded values
---
src/hardware/hw_md2.c | 90 +++++++++++++++++++++++++++++++++++++++++--
src/p_mobj.c | 4 ++
2 files changed, 91 insertions(+), 3 deletions(-)
diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index 2616d4085c..fc8047c6ca 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -1193,6 +1193,90 @@ static void adjustTextureCoords(model_t *model, patch_t *patch)
model->max_t = gpatch->max_t;
}
+static INT32 GetAnimDuration(mobj_t *mobj) //part of p_mobj's setplayermobjstate logic, used to make sure that anim durations are actually correct when the speed gets adjusted on players
+{
+ player_t *player = mobj->player;
+ INT32 tics = mobj->state->tics;
+
+ if (!(mobj->frame & FF_ANIMATE) && mobj->anim_duration) //set manually by something through lua
+ return mobj->anim_duration;
+
+ if (!player && mobj->type == MT_TAILSOVERLAY) //so tails overlays interpolate properly
+ player = mobj->tracer->player;
+ if (player)
+ {
+ if (player->panim == PA_EDGE && (player->charflags & SF_FASTEDGE))
+ tics = 2;
+ else if (player->powers[pw_tailsfly] && (!(player->mo->eflags & MFE_UNDERWATER) || (mobj->type == MT_PLAYER))) //tailsoverlay does not get adjusted from these rules when underwater
+ {
+ if (player->fly1 > 0)
+ tics = 1;
+ else if (!(player->mo->eflags & MFE_UNDERWATER))
+ tics = 2;
+ else
+ tics = 4;
+ }
+ else if (!(disableSpeedAdjust || player->charflags & SF_NOSPEEDADJUST))
+ {
+ fixed_t speed;// = FixedDiv(player->speed, FixedMul(mobj->scale, player->mo->movefactor));
+ if (player->panim == PA_FALL)
+ {
+ speed = FixedDiv(abs(mobj->momz), mobj->scale);
+ if (speed < 10<<FRACBITS)
+ tics = 4;
+ else if (speed < 20<<FRACBITS)
+ tics = 3;
+ else if (speed < 30<<FRACBITS)
+ tics = 2;
+ else
+ tics = 1;
+ }
+ else if (player->panim == PA_ABILITY2 && player->charability2 == CA2_SPINDASH)
+ {
+ fixed_t step = (player->maxdash - player->mindash)/4;
+ speed = (player->dashspeed - player->mindash);
+ if (speed > 3*step)
+ tics = 1;
+ else if (speed > step)
+ tics = 2;
+ else
+ tics = 3;
+ }
+ else
+ {
+ speed = FixedDiv(player->speed, FixedMul(mobj->scale, player->mo->movefactor));
+ if (player->panim == PA_ROLL || player->panim == PA_JUMP)
+ {
+ if (speed > 16<<FRACBITS)
+ tics = 1;
+ else
+ tics = 2;
+ }
+ else if (P_IsObjectOnGround(mobj) || ((player->charability == CA_FLOAT || player->charability == CA_SLOWFALL) && player->secondjump == 1) || player->powers[pw_super]) // Only if on the ground or superflying.
+ {
+ if (player->panim == PA_WALK)
+ {
+ if (speed > 12<<FRACBITS)
+ tics = 2;
+ else if (speed > 6<<FRACBITS)
+ tics = 3;
+ else
+ tics = 4;
+ }
+ else if ((player->panim == PA_RUN) || (player->panim == PA_DASH))
+ {
+ if (speed > 52<<FRACBITS)
+ tics = 1;
+ else
+ tics = 2;
+ }
+ }
+ }
+ }
+ }
+ return tics;
+}
+
//
// HWR_DrawModel
//
@@ -1266,7 +1350,7 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
{
patch_t *gpatch, *blendgpatch;
GLPatch_t *hwrPatch = NULL, *hwrBlendPatch = NULL;
- float durs = (float)spr->mobj->state->tics;
+ float durs = GetAnimDuration(spr->mobj);
float tics = (float)spr->mobj->tics;
const boolean papersprite = (R_ThingIsPaperSprite(spr->mobj) && !R_ThingIsFloorSprite(spr->mobj));
const UINT8 flip = (UINT8)(!(spr->mobj->eflags & MFE_VERTICALFLIP) != !R_ThingVerticallyFlipped(spr->mobj));
@@ -1287,8 +1371,8 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
}
// Apparently people don't like jump frames like that, so back it goes
- //if (tics > durs)
- //durs = tics;
+ if (tics > durs)
+ durs = tics;
// Make linkdraw objects use their tracer's alpha value
fixed_t newalpha = spr->mobj->alpha;
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 1ec09ab858..92133c1dca 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -96,11 +96,15 @@ static void P_SetupStateAnimation(mobj_t *mobj, state_t *st)
animlength = st->var1;
if (!(st->frame & FF_ANIMATE))
+ {
+ mobj->anim_duration = 0;
return;
+ }
if (animlength <= 0 || st->var2 == 0)
{
mobj->frame &= ~FF_ANIMATE;
+ mobj->anim_duration = 0;
return; // Crash/stupidity prevention
}
--
GitLab